From: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
Date: Sun, 21 Aug 2016 15:01:33 +0000 (+0200)
Subject: lantiq: fix building AVM/EVA sysupgrade images on NOR devices
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=c6164d961037ceb722b03ccfe1725be6b9a6d533;p=openwrt%2Fopenwrt.git

lantiq: fix building AVM/EVA sysupgrade images on NOR devices

Device/AVM unconditionally inherits Device/NAND, which changes the
sysupgrade image to sysupgrade-tar (instead of a "raw" sysupgrade image
as used in the Device/Default template).
This moves the Device/NAND call to the FRITZ3370 device definition, as
this is the only AVM/EVA device that uses NAND.
Additionally we have to define the IMAGE_SIZE for the AVM/EVA NOR
devices to ensure that the images are not discarded.

Signed-off-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
---

diff --git a/target/linux/lantiq/image/Makefile b/target/linux/lantiq/image/Makefile
index 3c3318d520..3c7391808d 100644
--- a/target/linux/lantiq/image/Makefile
+++ b/target/linux/lantiq/image/Makefile
@@ -219,7 +219,6 @@ define Device/lantiqFullImage
 endef
 
 define Device/AVM
-  $(Device/NAND)
   KERNEL := kernel-bin | append-dtb | lzma | eva-image
 endef
 
@@ -523,6 +522,7 @@ TARGET_DEVICES += WBMRB
 
 define Device/FRITZ7320
   $(Device/AVM)
+  IMAGE_SIZE := 15744k
   DEVICE_TITLE := 1&1 HomeServer - FRITZ7320
   DEVICE_PACKAGES := kmod-ath9k wpad-mini \
 	kmod-ltq-adsl-ar9-mei kmod-ltq-adsl-ar9 \
@@ -611,6 +611,7 @@ TARGET_DEVICES += EASY80920NOR
 
 define Device/FRITZ3370
   $(Device/AVM)
+  $(Device/NAND)
   DEVICE_TITLE := Fritz!Box WLan - FRITZ3370
   DEVICE_PACKAGES := kmod-ath9k wpad-mini kmod-usb-dwc2
 endef
@@ -618,6 +619,7 @@ TARGET_DEVICES += FRITZ3370
 
 define Device/FRITZ7360SL
   $(Device/AVM)
+  IMAGE_SIZE := 15744k
   DEVICE_TITLE := 1&1 HomeServer - FRITZ7360SL
   DEVICE_PACKAGES := kmod-ath9k wpad-mini kmod-usb-dwc2
 endef