From 74a0d8cd92c7e753c6a342a7b90151ec042a03c5 Mon Sep 17 00:00:00 2001 From: Mathias Kresin Date: Fri, 20 Apr 2018 06:30:46 +0200 Subject: build: consolidate fake uImage header build commands Merge the two existing functions and use a parameter for the type header field. It updates the syntax of the former mpc85xx fake ramdisk header command to be compatible with mkimage from u-boot 2018.03 and fixes the build error spotted by the build bot. Signed-off-by: Mathias Kresin --- target/linux/ipq806x/image/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'target/linux/ipq806x/image') diff --git a/target/linux/ipq806x/image/Makefile b/target/linux/ipq806x/image/Makefile index 73b6ca8c34..a737e165b0 100644 --- a/target/linux/ipq806x/image/Makefile +++ b/target/linux/ipq806x/image/Makefile @@ -47,8 +47,8 @@ define Device/DniImage NETGEAR_HW_ID := UBINIZE_OPTS := -E 5 IMAGES := factory.img sysupgrade.bin - IMAGE/factory.img := append-kernel | pad-offset $$$$(BLOCKSIZE) 64 | append-uImage-fakeroot-hdr | pad-to $$$$(KERNEL_SIZE) | append-ubi | netgear-dni - IMAGE/sysupgrade.bin := append-kernel | pad-offset $$$$(BLOCKSIZE) 64 | append-uImage-fakeroot-hdr | sysupgrade-tar kernel=$$$$@ | append-metadata + IMAGE/factory.img := append-kernel | pad-offset $$$$(BLOCKSIZE) 64 | append-uImage-fakehdr filesystem | pad-to $$$$(KERNEL_SIZE) | append-ubi | netgear-dni + IMAGE/sysupgrade.bin := append-kernel | pad-offset $$$$(BLOCKSIZE) 64 | append-uImage-fakehdr filesystem | sysupgrade-tar kernel=$$$$@ | append-metadata endef DEVICE_VARS += NETGEAR_BOARD_ID NETGEAR_HW_ID @@ -90,7 +90,7 @@ define Device/linksys_ea8500 PAGESIZE := 2048 BLOCKSIZE := 128k KERNEL_SIZE := 3072k - KERNEL = kernel-bin | append-dtb | uImage none | append-uImage-fakeroot-hdr + KERNEL = kernel-bin | append-dtb | uImage none | append-uImage-fakehdr filesystem BOARD_NAME := ea8500 SUPPORTED_DEVICES += ea8500 UBINIZE_OPTS := -E 5 -- cgit v1.2.3