ar71xx: image: reorder Image/Build/* macros

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

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@37889 3c298f89-4303-0410-b956-a3cf2f4a3e73

1 files changed, 35 insertions, 18 deletions

diff --git a/target/linux/ar71xx/image/Makefile b/target/linux/ar71xx/image/Makefile
index aa5544bff5..a5477668ce 100644
--- a/target/linux/ar71xx/image/Makefile
+++ b/target/linux/ar71xx/image/Makefile
@@ -205,6 +205,7 @@ define Image/Build/WRT400N
 	fi
 endef
 
+
 define Image/Build/DIR825B1/buildkernel
 	$(call MkuImageLzma,$(2),$(3) $(dir825b1_mtdlayout))
 	$(call MkuImageLzma,$(2)-fat,$(3) $(dir825b1_mtdlayout_fat))
@@ -236,6 +237,7 @@ define Image/Build/DIR825B1
 	fi
 endef
 
+
 define Image/Build/DLRTDEV/buildkernel
 	$(call MkuImageLzma,$(2),$(3) $(dlrtdev_mtdlayout))
 	$(call MkuImageLzma,$(2)-fat,$(3) $(dlrtdev_mtdlayout_fat))
@@ -267,7 +269,9 @@ define Image/Build/DLRTDEV
 	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)
@@ -286,9 +290,9 @@ define Image/Build/WZRHP64K
 	fi
 endef
 
-Image/Build/WZRHP64K/initramfs=$(call MkuImageLzma/initramfs,$(2),$(3) $(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)
@@ -307,9 +311,9 @@ define Image/Build/WZRHP128K
 	fi
 endef
 
-Image/Build/WZRHP128K/initramfs=$(call MkuImageLzma/initramfs,$(2),$(3) $(4))
 
 Image/Build/WHRHPG300N/buildkernel=$(call MkuImageLzma,$(2),$(3) $(4))
+Image/Build/WHRHPG300N/initramfs=$(call MkuImageLzma/initramfs,$(2),$(3) $(4))
 
 define Image/Build/WHRHPG300N
 	$(call Sysupgrade/KRuImage,$(1),$(2),65536,2818048)
@@ -328,7 +332,6 @@ define Image/Build/WHRHPG300N
 	fi
 endef
 
-Image/Build/WHRHPG300N/initramfs=$(call MkuImageLzma/initramfs,$(2),$(3) $(4))
 
 define Image/Build/Cameo
 	$(call Sysupgrade/KRuImage,$(1),$(2),$(5),$(6))
@@ -341,6 +344,19 @@ define Image/Build/Cameo
 	fi
 endef
 
+Image/Build/Cameo913x/buildkernel=$(call MkuImageLzma,$(2),$(3) $(cameo913x_mtdlayout))
+Image/Build/Cameo913x=$(call Image/Build/Cameo,$(1),$(2),$(3),$(cameo913x_mtdlayout),65536,2883584,$(4))
+Image/Build/Cameo913x/initramfs=$(call MkuImageLzma/initramfs,$(2),$(3) $(cameo913x_mtdlayout))
+
+Image/Build/Cameo7240/buildkernel=$(call MkuImageLzma,$(2),$(3) $(cameo7240_mtdlayout))
+Image/Build/Cameo7240=$(call Image/Build/Cameo,$(1),$(2),$(3),$(cameo7240_mtdlayout),65536,2752512,$(4))
+Image/Build/Cameo7240/initramfs=$(call MkuImageLzma/initramfs,$(2),$(3) $(cameo7240_mtdlayout))
+
+Image/Build/Cameo934x/buildkernel=$(call MkuImageLzma,$(2),$(3) $(cameo934x_mtdlayout))
+Image/Build/Cameo934x=$(call Image/Build/Cameo,$(1),$(2),$(3),$(cameo934x_mtdlayout),65536,15007718,$(4))
+Image/Build/Cameo934x/initramfs=$(call Image/Build/Cameo,$(1),$(2),$(3) $(cameo934x_mtdlayout))
+
+
 define Image/Build/CameoHornet
 	$(call Sysupgrade/KRuImage,$(1),$(2),$(5),$(6))
 	if [ -e "$(call sysupname,$(1),$(2))" ]; then \
@@ -355,14 +371,6 @@ define Image/Build/CameoHornet
 	fi
 endef
 
-Image/Build/Cameo913x/buildkernel=$(call MkuImageLzma,$(2),$(3) $(cameo913x_mtdlayout))
-Image/Build/Cameo913x=$(call Image/Build/Cameo,$(1),$(2),$(3),$(cameo913x_mtdlayout),65536,2883584,$(4))
-Image/Build/Cameo913x/initramfs=$(call MkuImageLzma/initramfs,$(2),$(3) $(cameo913x_mtdlayout))
-
-Image/Build/Cameo7240/buildkernel=$(call MkuImageLzma,$(2),$(3) $(cameo7240_mtdlayout))
-Image/Build/Cameo7240=$(call Image/Build/Cameo,$(1),$(2),$(3),$(cameo7240_mtdlayout),65536,2752512,$(4))
-Image/Build/Cameo7240/initramfs=$(call MkuImageLzma/initramfs,$(2),$(3) $(cameo7240_mtdlayout))
-
 Image/Build/Cameo933x/buildkernel=$(call MkuImageLzma,$(2),$(3) $(cameo933x_mtdlayout))
 Image/Build/Cameo933x=$(call Image/Build/CameoHornet,$(1),$(2),$(3),$(cameo933x_mtdlayout),65536,2686976,$(4),$(5),$(6),0xe0000,3735552)
 Image/Build/Cameo933x/initramfs=$(call MkuImageLzma/initramfs,$(2),$(3) $(cameo933x_mtdlayout))
@@ -371,9 +379,6 @@ Image/Build/Cameo933x_8M/buildkernel=$(call MkuImageLzma,$(2),$(3) $(cameo933x_m
 Image/Build/Cameo933x_8M=$(call Image/Build/CameoHornet,$(1),$(2),$(3),$(cameo933x_mtdlayout_8M),65536,6422528,$(4),$(5),$(6),0x100000,7864320)
 Image/Build/Cameo933x_8M/initramfs=$(call MkuImageLzma/initramfs,$(2),$(3) $(cameo933x_mtdlayout_8M))
 
-Image/Build/Cameo934x/buildkernel=$(call MkuImageLzma,$(2),$(3) $(cameo934x_mtdlayout))
-Image/Build/Cameo934x=$(call Image/Build/Cameo,$(1),$(2),$(3),$(cameo934x_mtdlayout),65536,15007718,$(4))
-Image/Build/Cameo934x/initramfs=$(call Image/Build/Cameo,$(1),$(2),$(3) $(cameo934x_mtdlayout))
 
 define Image/Build/Ath
 	$(call Sysupgrade/$(7),$(1),$(2),$(5),$(6))
@@ -393,6 +398,7 @@ Image/Build/AthLzma/buildkernel=$(call MkuImageLzma,$(2),$(3) $(4))
 Image/Build/AthLzma=$(call Image/Build/Ath,$(1),$(2),$(3),$(4),$(5),$(6),$(7))
 Image/Build/AthLzma/initramfs=$(call MkuImageLzma/initramfs,$(2),$(3) $(4))
 
+
 Image/Build/PB4X/buildkernel=$(call PatchKernelLzma,$(2),$(3))
 
 define Image/Build/PB4X
@@ -406,6 +412,7 @@ define Image/Build/PB4X
 		$(call sysupname,$(1),$(2))
 endef
 
+
 Image/Build/MyLoader/buildkernel=$(call PatchKernelLzma,$(2),$(3))
 
 define Image/Build/MyLoader
@@ -415,6 +422,9 @@ define Image/Build/MyLoader
 		$(call imgname,$(1),$(2))-$(5)-factory.img
 endef
 
+
+Image/Build/UAPPRO/initramfs=$(call MkuImageLzma/initramfs,$(2),$(3) $(uap_pro_mtdlayout))
+
 define Image/Build/UAPPRO/buildkernel
 	$(call MkuImageLzma,$(2),$(3) $(uap_pro_mtdlayout))
 	-rm -rf $(KDIR_TMP)/$(2)
@@ -437,7 +447,6 @@ define Image/Build/UAPPRO
 		-o $(call factoryname,$(1),$(2))
 endef
 
-Image/Build/UAPPRO/initramfs=$(call MkuImageLzma/initramfs,$(2),$(3) $(uap_pro_mtdlayout))
 
 Image/Build/UBNTXM/buildkernel=$(call MkuImageLzma,$(2),$(3) $(ubntxm_mtdlayout))
 
@@ -451,6 +460,7 @@ define Image/Build/UBNTXM
 		-o $(call factoryname,$(1),$(2))
 endef
 
+
 Image/Build/UBDEV/buildkernel=$(call MkuImageLzma,$(2),$(3) $(ubdev_mtdlayout))
 
 define Image/Build/UBDEV
@@ -463,6 +473,7 @@ define Image/Build/UBDEV
 		-o $(call factoryname,$(1),$(2))
 endef
 
+
 Image/Build/UBNT/buildkernel=$(call PatchKernelLzma,$(2),$(3))
 
 define Image/Build/UBNT
@@ -478,6 +489,7 @@ define Image/Build/UBNT
   $(call sysupname,$(1),$(2))
 endef
 
+
 Image/Build/Planex/loader=$(call Image/BuildLoaderAlone,$(1),gz,$(2) $(planex_mtdlayout),0x52000,0)
 
 define Image/Build/Planex
@@ -498,7 +510,9 @@ define Image/Build/Planex
 	fi
 endef
 
+
 Image/Build/ALFA/buildkernel=$(call MkuImageLzma,$(2),$(3) $(4))
+Image/Build/ALFA/initramfs=$(call MkuImageLzma/initramfs,$(2),$(3) $(4))
 
 define Image/Build/ALFA
 	$(call Sysupgrade/RKuImage,$(1),$(2),$(5),$(6))
@@ -516,7 +530,6 @@ define Image/Build/ALFA
 	fi
 endef
 
-Image/Build/ALFA/initramfs=$(call MkuImageLzma/initramfs,$(2),$(3) $(4))
 
 Image/Build/TPLINKOLD/loader=$(call Image/BuildLoaderAlone,$(1),gz,$(2),0x22000,0)
 
@@ -547,6 +560,7 @@ define Image/Build/TPLINKOLD/initramfs
 		-o $(call imgname,$(1),$(2))-initramfs-uImage.bin
 endef
 
+
 Image/Build/TPLINK/loader=$(call Image/BuildLoaderAlone,$(1),gz,$(2),0x22000,0)
 
 define Image/Build/TPLINK
@@ -578,6 +592,7 @@ define Image/Build/TPLINK/initramfs
 		-o $(call imgname,$(1),$(2))-uImage.bin
 endef
 
+
 Image/Build/TPLINK-LZMA/buildkernel=$(call PatchKernelLzma,$(2),$(3))
 
 define Image/Build/TPLINK-LZMA
@@ -603,6 +618,7 @@ define Image/Build/TPLINK-LZMA/initramfs
 		-o $(call imgname,$(1),$(2))-uImage.bin
 endef
 
+
 Image/Build/CyberTAN/buildkernel=$(call MkuImageGzip,$(2),$(3))
 
 define Image/Build/CyberTAN
@@ -720,6 +736,7 @@ ifdef CONFIG_PACKAGE_uboot-ar71xx-nbg460n_550n_550nh
   endef
 endif
 
+
 Image/Build/OpenMesh/buildkernel=$(call MkuImageLzma,$(2))
 
 define Image/Build/OpenMesh
@@ -735,7 +752,9 @@ define Image/Build/OpenMesh
 		"$(KDIR)/root.$(1)" "rootfs"
 endef
 
+
 Image/Build/Zcomax/buildkernel=$(call MkuImageLzma,$(2),$(3) $(4))
+Image/Build/Zcomax/initramfs=$(call MkuImageLzma/initramfs,$(2),$(3) $(4))
 
 define Image/Build/Zcomax
 	$(call Sysupgrade/RKuImage,$(1),$(2),1507328,6356992)
@@ -748,8 +767,6 @@ define Image/Build/Zcomax
 	fi
 endef
 
-Image/Build/Zcomax/initramfs=$(call MkuImageLzma/initramfs,$(2),$(3) $(4))
-
 
 define Jffs2Template
   define Image/Build/Template/$(1)/jffs2-$(2)