From be296745f82665272771e1cfeb2c19438cf3cb5a Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Thu, 17 Nov 2016 11:41:08 +0100 Subject: [PATCH] lantiq: append metadata to images Signed-off-by: Felix Fietkau --- .../linux/lantiq/base-files/lib/upgrade/platform.sh | 1 + target/linux/lantiq/image/Makefile | 11 ++++++----- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/target/linux/lantiq/base-files/lib/upgrade/platform.sh b/target/linux/lantiq/base-files/lib/upgrade/platform.sh index c8fc617035..75a41c9242 100755 --- a/target/linux/lantiq/base-files/lib/upgrade/platform.sh +++ b/target/linux/lantiq/base-files/lib/upgrade/platform.sh @@ -1,6 +1,7 @@ . /lib/functions/lantiq.sh PART_NAME=firmware +REQUIRE_IMAGE_METADATA=1 platform_check_image() { [ "$#" -gt 1 ] && return 1 diff --git a/target/linux/lantiq/image/Makefile b/target/linux/lantiq/image/Makefile index 3064e2b25c..83b57be7e8 100644 --- a/target/linux/lantiq/image/Makefile +++ b/target/linux/lantiq/image/Makefile @@ -64,8 +64,9 @@ define Device/Default DEVICE_DTS := $(1) DEVICE_DTS_DIR := ../dts IMAGE_SIZE := + SUPPORTED_DEVICES = $$(DEVICE_DTS) IMAGES := sysupgrade.bin - IMAGE/sysupgrade.bin := append-kernel | append-rootfs | pad-rootfs | check-size $$$$(IMAGE_SIZE) + IMAGE/sysupgrade.bin := append-kernel | append-rootfs | pad-rootfs | check-size $$$$(IMAGE_SIZE) | append-metadata endef DEVICE_VARS += IMAGE_SIZE @@ -85,7 +86,7 @@ endef define Device/NAND $(Device/NAND/$(SUBTARGET)) - IMAGE/sysupgrade.bin := sysupgrade-tar + IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata endef define Device/lantiqBrnImage @@ -358,10 +359,10 @@ define Device/DGN3500 factory-NA.bin factory-WW.bin IMAGE/sysupgrade-NA.bin := \ append-kernel | append-rootfs | dgn3500-sercom-footer 0x0 "NA" | \ - pad-rootfs | check-size $$$$(IMAGE_SIZE) + pad-rootfs | check-size $$$$(IMAGE_SIZE) | append-metadata IMAGE/sysupgrade-WW.bin := \ append-kernel | append-rootfs | dgn3500-sercom-footer 0x0 "WW" | \ - pad-rootfs | check-size $$$$(IMAGE_SIZE) + pad-rootfs | check-size $$$$(IMAGE_SIZE) | append-metadata IMAGE/factory-NA.bin := \ pad-extra $(DGN3500_KERNEL_OFFSET_DEC) | append-kernel | append-rootfs | \ dgn3500-sercom-footer $(DGN3500_KERNEL_OFFSET_HEX) "NA" | pad-rootfs | \ @@ -385,7 +386,7 @@ define Device/DGN3500B IMAGES += factory.bin IMAGE/sysupgrade.bin := \ append-kernel | append-rootfs | dgn3500-sercom-footer 0x0 "DE" | \ - pad-rootfs | check-size $$$$(IMAGE_SIZE) + pad-rootfs | check-size $$$$(IMAGE_SIZE) | append-metadata IMAGE/factory.bin := \ pad-extra $(DGN3500_KERNEL_OFFSET_DEC) | append-kernel | append-rootfs | \ dgn3500-sercom-footer $(DGN3500_KERNEL_OFFSET_HEX) "DE" | pad-rootfs | \