build: move lzma2eva build step to image-commands.mk

Move it to image-commands.mk so that it can used by other targets with
eva based boards as well.

Signed-off-by: Mathias Kresin <dev@kresin.me>

diff --git a/include/image-commands.mk b/include/image-commands.mk
index c1d89825a3bc383ac9200af2093867ba05f0960c..093b93d0e96b0729babb7c117adb701c36966a6a 100644 (file)
--- a/include/image-commands.mk
+++ b/include/image-commands.mk
@@ -44,6 +44,11 @@ define Build/buffalo-dhp-image
        mv $@.new $@
 endef
 
        mv $@.new $@
 endef
 

+define Build/eva-image
+       $(STAGING_DIR_HOST)/bin/lzma2eva $(KERNEL_LOADADDR) $(KERNEL_LOADADDR) $@ $@.new
+       mv $@.new $@
+endef
+

 define Build/netgear-chk
        $(STAGING_DIR_HOST)/bin/mkchkimg \
                -o $@.new \
 define Build/netgear-chk
        $(STAGING_DIR_HOST)/bin/mkchkimg \
                -o $@.new \

diff --git a/target/linux/lantiq/image/Makefile b/target/linux/lantiq/image/Makefile
index 1b194b3e7b39e63adc71eeb75e3c8d7f89026bbf..e0f58af3e2a16e173edbb1b76db0ab79819863bf 100644 (file)
--- a/target/linux/lantiq/image/Makefile
+++ b/target/linux/lantiq/image/Makefile
@@ -20,9 +20,8 @@ else
   UBIFS_OPTS := -m 2048 -e 126KiB -c 4096
 endif
 
   UBIFS_OPTS := -m 2048 -e 126KiB -c 4096
 endif
 

-define Build/eva-image
-       lzma2eva $(KERNEL_LOADADDR) $(KERNEL_LOADADDR) $@ $@.new
-       ( dd if=$@.new bs=64k conv=sync; cat ./eva.dummy.squashfs; ) > $@
+define Build/append-avm-fakeroot
+       cat ./eva.dummy.squashfs >> $@

 endef
 
 define Build/dgn3500-sercom-footer
 endef
 
 define Build/dgn3500-sercom-footer


@@ -104,6 +103,8 @@ endef
 
 define Device/AVM
   KERNEL := kernel-bin | append-dtb | lzma | eva-image
 
 define Device/AVM
   KERNEL := kernel-bin | append-dtb | lzma | eva-image

+  IMAGE/sysupgrade.bin := append-kernel | pad-to 64k | append-avm-fakeroot | \
+       append-rootfs | pad-rootfs | append-metadata | check-size $$$$(IMAGE_SIZE)

 endef
 
 ifeq ($(SUBTARGET),ase)
 endef
 
 ifeq ($(SUBTARGET),ase)