ath79: fix factory image generation for Netgear and Zyxel boards

The factory images need to embed specific IDs to pass verification with
the OEM firmware (including TFTP recovery), so they need to be
per-device variables.

Fixes: ab1584a797 ("ath79: netgear: trim down uImage customisations")
Fixes: 459c8c9ef8 ("ath79: add support for ZyXEL NBG6616")
Reported-by: Marcin Juszkiewicz <marcin-openwrt@juszkiewicz.com.pl>
Signed-off-by: Paul Fertser <fercerpav@gmail.com>
[minor commit message adjustments, sort DEVICE_VARS]
Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
This commit is contained in:
Paul Fertser 2021-02-14 12:16:33 +03:00 committed by Adrian Schmutzler
parent ce4cb8e51d
commit 25d6af98d0
3 changed files with 2 additions and 4 deletions

View File

@ -4,6 +4,8 @@ include $(INCLUDE_DIR)/image.mk
KERNEL_LOADADDR = 0x80060000 KERNEL_LOADADDR = 0x80060000
DEVICE_VARS += LOADER_FLASH_OFFS LOADER_TYPE DEVICE_VARS += LOADER_FLASH_OFFS LOADER_TYPE
DEVICE_VARS += NETGEAR_BOARD_ID NETGEAR_HW_ID
DEVICE_VARS += RAS_BOARD RAS_ROOTFS_SIZE RAS_VERSION
define Build/combined-image define Build/combined-image
sh $(TOPDIR)/scripts/combined-image.sh \ sh $(TOPDIR)/scripts/combined-image.sh \

View File

@ -1,5 +1,3 @@
DEVICE_VARS += NETGEAR_BOARD_ID NETGEAR_HW_ID
define Build/netgear-rootfs define Build/netgear-rootfs
mkimage \ mkimage \
-A mips -O linux -T filesystem -C none \ -A mips -O linux -T filesystem -C none \

View File

@ -1,5 +1,3 @@
DEVICE_VARS += RAS_ROOTFS_SIZE RAS_BOARD RAS_VERSION
# attention: only zlib compression is allowed for the boot fs # attention: only zlib compression is allowed for the boot fs
define Build/zyxel-buildkerneljffs define Build/zyxel-buildkerneljffs
rm -rf $(KDIR_TMP)/zyxelnbg6716 rm -rf $(KDIR_TMP)/zyxelnbg6716