ipq806x: sanitize Dni image generation

The more straight forward approach for generating the pure and unpadded
kernel file which then can be used for initramfs straight.
Build options for factory.img and sysupgrade.tar are handeled
seperately.

Signed-off-by: Thomas Reifferscheid <thomas@reifferscheid.org>

diff --git a/target/linux/ipq806x/image/Makefile b/target/linux/ipq806x/image/Makefile
index cec26c2142bbd323f8cb996296e924bf99fea4f4..70c8056d906bc89372cd978994866ef1cddfd38a 100644 (file)
--- a/target/linux/ipq806x/image/Makefile
+++ b/target/linux/ipq806x/image/Makefile
@@ -57,15 +57,14 @@ define Device/DniImage
        PROFILES += $$(DEVICE_NAME)
        FILESYSTEMS := squashfs
        KERNEL_SUFFIX := -uImage
-       KERNEL_INITRAMFS := kernel-bin | append-dtb | uImage none
-       KERNEL = kernel-bin | append-dtb | uImage none | pad-offset $$(BLOCKSIZE) 64 | append-uImage-fakeroot-hdr | \
-               pad-to $$(KERNEL_SIZE)
+       KERNEL = kernel-bin | append-dtb | uImage none
        KERNEL_NAME := zImage
        NETGEAR_BOARD_ID :=
        NETGEAR_HW_ID :=
        UBINIZE_OPTS := -E 5
        IMAGES := factory.img sysupgrade.tar
-       IMAGE/factory.img := append-kernel | append-ubi | netgear-dni
+       IMAGE/factory.img := append-kernel | pad-offset $$$$(BLOCKSIZE) 64 | append-uImage-fakeroot-hdr | pad-to $$$$(KERNEL_SIZE) | append-ubi | netgear-dni
+       IMAGE/sysupgrade.tar := append-kernel | pad-offset $$$$(BLOCKSIZE) 64 | append-uImage-fakeroot-hdr | sysupgrade-tar kernel=$$$$@ | append-metadata
 endef
 DEVICE_VARS += NETGEAR_BOARD_ID NETGEAR_HW_ID