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>
Martin Blumenstingl 8 years ago committed by John Crispin
parent 00516611bd
commit c6164d9610
  1. 4
      target/linux/lantiq/image/Makefile

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

Loading…
Cancel
Save