ramips: fix Airlink AR670W factory image

Move the mkwrgimg build step to the makefile. It will be required by
other boards as well.

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

diff --git a/target/linux/ramips/image/Makefile b/target/linux/ramips/image/Makefile
index 42cd63b7d7136406c7fdb5b46b677a1637ef58b7..25396f5984453a8bfa44d413b2ae4baa08504ef6 100644 (file)
--- a/target/linux/ramips/image/Makefile
+++ b/target/linux/ramips/image/Makefile
@@ -99,6 +99,11 @@ define Build/seama-seal
        $(call Build/seama,-s $@.seama $(1))
 endef
 
        $(call Build/seama,-s $@.seama $(1))
 endef
 

+define Build/wrg-header
+       mkwrgimg -i $@ -d "/dev/mtdblock/2" -s $(1) -o $@.new
+       mv $@.new $@
+endef
+

 #
 # The real magic happens inside these templates
 #
 #
 # The real magic happens inside these templates
 #

diff --git a/target/linux/ramips/image/rt288x.mk b/target/linux/ramips/image/rt288x.mk
index d9dd3aea1ead629404162cafea2d5fff914e669e..ab56fcc44fbf3bbcf876ec648813228583499d2a 100644 (file)
--- a/target/linux/ramips/image/rt288x.mk
+++ b/target/linux/ramips/image/rt288x.mk
@@ -6,13 +6,6 @@ define Build/gemtek-header
        mkheader_gemtek $@ $@.new $(1) && mv $@.new $@
 endef
 
        mkheader_gemtek $@ $@.new $(1) && mv $@.new $@
 endef
 

-define Build/airlink-header
-       mkwrgimg -i $@ \
-               -d "/dev/mtdblock/2" \
-               -s "wrgn16a_airlink_ar670w" \
-               -o $@.new && mv $@.new $@
-endef
-

 define Device/ar670w
   DTS := AR670W
   BLOCKSIZE := 64k
 define Device/ar670w
   DTS := AR670W
   BLOCKSIZE := 64k


@@ -20,7 +13,8 @@ define Device/ar670w
   IMAGE_SIZE := $(ralink_default_fw_size_4M)
   KERNEL := $(KERNEL_DTB)
   IMAGES += factory.bin
   IMAGE_SIZE := $(ralink_default_fw_size_4M)
   KERNEL := $(KERNEL_DTB)
   IMAGES += factory.bin

-  IMAGE/factory.bin := $$(sysupgrade_bin) | gemtek-header ar725w
+  IMAGE/factory.bin := $$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | \
+       wrg-header wrgn16a_airlink_ar670w

 endef
 TARGET_DEVICES += ar670w
 
 endef
 TARGET_DEVICES += ar670w