[PATCH v2] ath79/nand: fix factory image generation for Netgear and Zyxel boards

[Paul Fertser]

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")
Reported-by: Marcin Juszkiewicz <marcin-openwrt at juszkiewicz.com.pl>
Signed-off-by: Paul Fertser <fercerpav at gmail.com>
---

v2: move device variables common to generic and NAND targets to
    Makefile (Adrian Schmutzler)

 target/linux/ath79/image/Makefile          | 2 ++
 target/linux/ath79/image/common-netgear.mk | 2 --
 target/linux/ath79/image/nand.mk           | 2 --
 3 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/target/linux/ath79/image/Makefile b/target/linux/ath79/image/Makefile
index 4a51cf1fbf..6583ae46d4 100644
--- a/target/linux/ath79/image/Makefile
+++ b/target/linux/ath79/image/Makefile
@@ -4,6 +4,8 @@ include $(INCLUDE_DIR)/image.mk
 KERNEL_LOADADDR = 0x80060000
 
 DEVICE_VARS += LOADER_FLASH_OFFS LOADER_TYPE
+DEVICE_VARS += RAS_ROOTFS_SIZE RAS_BOARD RAS_VERSION
+DEVICE_VARS += NETGEAR_BOARD_ID NETGEAR_HW_ID
 
 define Build/combined-image
 	sh $(TOPDIR)/scripts/combined-image.sh \
diff --git a/target/linux/ath79/image/common-netgear.mk b/target/linux/ath79/image/common-netgear.mk
index d4f43bbaca..8a74fdc0c9 100644
--- a/target/linux/ath79/image/common-netgear.mk
+++ b/target/linux/ath79/image/common-netgear.mk
@@ -1,5 +1,3 @@
-DEVICE_VARS += NETGEAR_BOARD_ID NETGEAR_HW_ID
-
 define Build/netgear-rootfs
 	mkimage \
 		-A mips -O linux -T filesystem -C none \
diff --git a/target/linux/ath79/image/nand.mk b/target/linux/ath79/image/nand.mk
index 37fcb36937..abf269a8ce 100644
--- a/target/linux/ath79/image/nand.mk
+++ b/target/linux/ath79/image/nand.mk
@@ -1,5 +1,3 @@
-DEVICE_VARS += RAS_ROOTFS_SIZE RAS_BOARD RAS_VERSION
-
 # attention: only zlib compression is allowed for the boot fs
 define Build/zyxel-buildkerneljffs
 	rm -rf  $(KDIR_TMP)/zyxelnbg6716
-- 
2.20.1