From: Gabor Juhos <juhosg@openwrt.org>
Date: Tue, 24 Sep 2013 09:36:25 +0000 (+0000)
Subject: ar71xx: image: use a common macro for Buffalo WZRHP devices
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=d0ba5d1584720a75a7f5841c4c9787c3b68f2031;p=openwrt%2Fstaging%2Fjow.git

ar71xx: image: use a common macro for Buffalo WZRHP devices

The Image/Build/WZRHP64K and the Image/Build/WZRHP128K macros
are similar. Move the common stuff into the Image/Build/WZRHP
macro and update the orignal macros to use that.

Signed-off-by: Gabor Juhos <juhosg@openwrt.org>

SVN-Revision: 38152
---

diff --git a/target/linux/ar71xx/image/Makefile b/target/linux/ar71xx/image/Makefile
index c3ec7d776f..ef0ac3beca 100644
--- a/target/linux/ar71xx/image/Makefile
+++ b/target/linux/ar71xx/image/Makefile
@@ -267,47 +267,30 @@ define Image/Build/CameoAP94
 	fi
 endef
 
-
-Image/Build/WZRHP64K/buildkernel=$(call MkuImageLzma,$(2),$(3))
-Image/Build/WZRHP64K/initramfs=$(call MkuImageLzma/initramfs,$(2),$(3) $(4))
-
-define Image/Build/WZRHP64K
-	$(call Sysupgrade/KRuImage,$(1),$(2),65536,31850496)
+define Image/Build/WZRHP
+	$(call Sysupgrade/KRuImage,$(1),$(2),$(3),$(4))
 	if [ -e "$(call sysupname,$(1),$(2))" ]; then \
 		( \
 			echo -n -e "# Airstation Public Fmt1\x00\x00\x00\x00\x00\x00\x00\x00"; \
 			dd if=$(call sysupname,$(1),$(2)); \
 		) > $(call imgname,$(1),$(2))-tftp.bin; \
-		buffalo-enc -p $(4) -v 1.99 \
+		buffalo-enc -p $(5) -v 1.99 \
 			-i $(call sysupname,$(1),$(2)) \
 			-o $(KDIR_TMP)/$(2).enc; \
-		buffalo-tag -b $(4) -p $(4) -a ath -v 1.99 -m 1.01 -l mlang8 \
+		buffalo-tag -b $(5) -p $(5) -a ath -v 1.99 -m 1.01 -l mlang8 \
 			-w 3 -c 0x80041000 -d 0x801e8000 -f 1 -r M_ \
 			-i $(KDIR_TMP)/$(2).enc \
 			-o $(call factoryname,$(1),$(2)); \
 	fi
 endef
 
+Image/Build/WZRHP64K/buildkernel=$(call MkuImageLzma,$(2),$(3))
+Image/Build/WZRHP64K/initramfs=$(call MkuImageLzma/initramfs,$(2),$(3) $(4))
+Image/Build/WZRHP64K=$(call Image/Build/WZRHP,$(1),$(2),65536,31850496,$(4))
 
 Image/Build/WZRHP128K/buildkernel=$(call MkuImageLzma,$(2),$(3))
 Image/Build/WZRHP128K/initramfs=$(call MkuImageLzma/initramfs,$(2),$(3) $(4))
-
-define Image/Build/WZRHP128K
-	$(call Sysupgrade/KRuImage,$(1),$(2),131072,31850496)
-	if [ -e "$(call sysupname,$(1),$(2))" ]; then \
-		( \
-			echo -n -e "# Airstation Public Fmt1\x00\x00\x00\x00\x00\x00\x00\x00"; \
-			dd if=$(call sysupname,$(1),$(2)); \
-		) > $(call imgname,$(1),$(2))-tftp.bin; \
-		buffalo-enc -p $(4) -v 1.99 \
-			-i $(call sysupname,$(1),$(2)) \
-			-o $(KDIR_TMP)/$(2).enc; \
-		buffalo-tag -b $(4) -p $(4) -a ath -v 1.99 -m 1.01 -l mlang8 \
-			-w 3 -c 0x80041000 -d 0x801e8000 -f 1 -r M_ \
-			-i $(KDIR_TMP)/$(2).enc \
-			-o $(call factoryname,$(1),$(2)); \
-	fi
-endef
+Image/Build/WZRHP128K=$(call Image/Build/WZRHP,$(1),$(2),131072,31850496,$(4))
 
 
 Image/Build/WHRHPG300N/buildkernel=$(call MkuImageLzma,$(2),$(3) $(4))