ar71xx: clean up image fs selection templates

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

1 files changed, 43 insertions, 99 deletions

diff --git a/target/linux/ar71xx/image/Makefile b/target/linux/ar71xx/image/Makefile
index 57ef4c260..ef9da7595 100644
--- a/target/linux/ar71xx/image/Makefile
+++ b/target/linux/ar71xx/image/Makefile
@@ -276,152 +276,96 @@ define Image/Build/WNDR3700
 		-o $(call imgname,$(1),$(2))-factory.img
 endef
 
-define Image/Build/Template/Compex/squashfs
-	$(call Image/Build/MyLoader,squashfs,$(1))
+define Image/Build/Template/all/squashfs
+	$(call Image/Build/$(1),squashfs,$(2),$(3),$(4),$(5))
 endef
 
-define Image/Build/Template/WRT400N/squashfs
-	$(call Image/Build/WRT400N,squashfs,$(1),$(2),$(3))
+define Image/Build/Template/all/jffs2-64k
+	$(call Image/Build/$(1),jffs2-64k,$(2),$(3),$(4),$(5))
 endef
 
-define Image/Build/Template/WRT400N/jffs2-64k
-	$(call Image/Build/WRT400N,jffs2-64k,$(1),$(2),$(3))
+define Image/Build/Template/all/jffs2-128k
+	$(call Image/Build/$(1),jffs2-128k,$(2),$(3),$(4),$(5))
 endef
 
-define Image/Build/Template/DIR825B1/squashfs
-	$(call Image/Build/DIR825B1,squashfs,$(1),$(2),$(3))
+define Image/Build/Template/squashfs-only/squashfs
+	$(call Image/Build/$(1),squashfs,$(2),$(3),$(4),$(5))
 endef
 
-define Image/Build/Template/DIR825B1/jffs2-64k
-	$(call Image/Build/DIR825B1,jffs2-64k,$(1),$(2),$(3))
+define Image/Build/Template/64k/squashfs
+	$(call Image/Build/$(1),squashfs,$(2),$(3),$(4),$(5))
 endef
 
-define Image/Build/Template/CyberTAN/squashfs
-	$(call Image/Build/CyberTAN,squashfs,$(1),$(2),$(3))
+define Image/Build/Template/64k/jffs2-64k
+	$(call Image/Build/$(1),jffs2-64k,$(2),$(3),$(4),$(5))
 endef
 
-define Image/Build/Template/CyberTAN/jffs2-64k
-	$(call Image/Build/CyberTAN,jffs2-64k,$(1),$(2),$(3))
+define Image/Build/Template/128k/squashfs
+	$(call Image/Build/$(1),squashfs,$(2),$(3),$(4),$(5))
 endef
 
-define Image/Build/Template/Cameo/squashfs
-	$(call Image/Build/Cameo,squashfs,$(1),$(2),$(3))
-endef
-
-define Image/Build/Template/AP83/squashfs
-	$(call Image/Build/AP83,squashfs,$(1),$(2))
-endef
-
-define Image/Build/Template/AP83/jffs2-64k
-	$(call Image/Build/AP83,jffs2-64k,$(1),$(2))
-endef
-
-define Image/Build/Template/PB4X/squashfs
-	$(call Image/Build/PB4X,squashfs,$(1),$(2))
-endef
-
-define Image/Build/Template/PB4X/jffs2-64k
-	$(call Image/Build/PB4X,jffs2-64k,$(1),$(2))
-endef
-
-define Image/Build/Template/TPLINK/squashfs
-	$(call Image/Build/TPLINK,squashfs,$(1),$(2),$(3))
-endef
-
-define Image/Build/Template/TPLINK4K/squashfs
-	$(call Image/Build/TPLINK,squashfs,$(1),$(2),$(3))
-endef
-
-define Image/Build/Template/UBNT/squashfs
-	$(call Image/Build/UBNT,squashfs,$(1),$(2),$(3),$(4),$(5))
-endef
-
-define Image/Build/Template/UBNT/jffs2-64k
-	$(call Image/Build/UBNT,jffs2-64k,$(1),$(2),$(3),$(4),$(5))
-endef
-
-define Image/Build/Template/UBNTXM/squashfs
-	$(call Image/Build/UBNTXM,squashfs,$(1),$(2),$(3),$(4),$(5))
-endef
-
-define Image/Build/Template/UBNTXM/jffs2-64k
-	$(call Image/Build/UBNTXM,jffs2-64k,$(1),$(2),$(3),$(4),$(5))
-endef
-
-define Image/Build/Template/Planex/squashfs
-	$(call Image/Build/Planex,squashfs,$(1),$(2))
-endef
-
-define Image/Build/Template/Planex/jffs2-64k
-	$(call Image/Build/Planex,jffs2-64k,$(1),$(2))
-endef
-
-define Image/Build/Template/WNDR3700/squashfs
-	$(call Image/Build/WNDR3700,squashfs,$(1),$(2))
-endef
-
-define Image/Build/Template/WNDR3700/jffs2-64k
-	$(call Image/Build/WNDR3700,jffs2-64k,$(1),$(2))
+define Image/Build/Template/128k/jffs2-128k
+	$(call Image/Build/$(1),jffs2-128k,$(2),$(3),$(4),$(5))
 endef
 
 define Image/Build/Profile/AP81
-	$(call Image/Build/Template/AP83/$(1),ap81,board=AP81)
+	$(call Image/Build/Template/64k/$(1),AP83,ap81,board=AP81)
 endef
 
 define Image/Build/Profile/AP83
-	$(call Image/Build/Template/AP83/$(1),ap83,board=AP83)
+	$(call Image/Build/Template/64k/$(1),AP83,ap83,board=AP83)
 endef
 
 define Image/Build/Profile/PB42
-	$(call Image/Build/Template/PB4X/$(1),pb42,board=PB42)
+	$(call Image/Build/Template/64k/$(1),PB4X,pb42,board=PB42)
 endef
 
 define Image/Build/Profile/PB44
-	$(call Image/Build/Template/PB4X/$(1),pb44,board=PB44)
+	$(call Image/Build/Template/64k/$(1),PB4X,pb44,board=PB44)
 endef
 
 define Image/Build/Profile/WP543
-	$(call Image/Build/Template/Compex/$(1),wp543)
+	$(call Image/Build/Template/64k/$(1),MyLoader,wp543)
 endef
 
 define Image/Build/Profile/DIR615C1
-	$(call Image/Build/Template/Cameo/$(1),dir-615-c1,board=DIR-615-C1,"AP81-AR9130-RT-070614-02")
+	$(call Image/Build/Template/squashfs-only/$(1),Cameo,dir-615-c1,board=DIR-615-C1,"AP81-AR9130-RT-070614-02")
 endef
 
 define Image/Build/Profile/TEW632BRP
-	$(call Image/Build/Template/Cameo/$(1),tew-632brp,board=TEW-632BRP,"AP81-AR9130-RT-070614-00")
+	$(call Image/Build/Template/squashfs-only/$(1),Cameo,tew-632brp,board=TEW-632BRP,"AP81-AR9130-RT-070614-00")
 endef
 
 define Image/Build/Profile/TEW652BRP
-	$(call Image/Build/Template/Cameo/$(1),tew-652brp,board=TEW-632BRP,"AP81-AR9130-RT-080609-05")
+	$(call Image/Build/Template/squashfs-only/$(1),Cameo,tew-652brp,board=TEW-632BRP,"AP81-AR9130-RT-080609-05")
 endef
 
 define Image/Build/Profile/A02RBW300N
-	$(call Image/Build/Template/Cameo/$(1),a02-rb-w300n,board=TEW-632BRP,"AP81-AR9130-RT-070614-03")
+	$(call Image/Build/Template/squashfs-only/$(1),Cameo,a02-rb-w300n,board=TEW-632BRP,"AP81-AR9130-RT-070614-03")
 endef
 
 define Image/Build/Profile/UBNTRS
-	$(call Image/Build/Template/UBNT/$(1),ubnt-rs,board=UBNT-RS,RS,RSx,ar7100)
+	$(call Image/Build/Template/64k/$(1),UBNT,ubnt-rs,board=UBNT-RS,RS,RSx,ar7100)
 endef
 
 define Image/Build/Profile/UBNTRSPRO
-	$(call Image/Build/Template/UBNT/$(1),ubnt-rspro,board=UBNT-RSPRO,RSPRO,RSPRO,ar7100pro)
+	$(call Image/Build/Template/64k/$(1),UBNT,ubnt-rspro,board=UBNT-RSPRO,RSPRO,RSPRO,ar7100pro)
 endef
 
 define Image/Build/Profile/UBNTLSSR71
-	$(call Image/Build/Template/UBNT/$(1),ubnt-ls-sr71,board=UBNT-LS-SR71,LS-SR71,LS-SR71,ar7100)
+	$(call Image/Build/Template/64k/$(1),UBNT,ubnt-ls-sr71,board=UBNT-LS-SR71,LS-SR71,LS-SR71,ar7100)
 endef
 
 define Image/Build/Profile/UBNTBULLETM
-	$(call Image/Build/Template/UBNTXM/$(1),ubnt-bullet-m,board=UBNT-BM,XM,UBNTXM,ar7240)
+	$(call Image/Build/Template/64k/$(1),UBNTXM,ubnt-bullet-m,board=UBNT-BM,XM,UBNTXM,ar7240)
 endef
 
 define Image/Build/Profile/UBNTROCKETM
-	$(call Image/Build/Template/UBNTXM/$(1),ubnt-rocket-m,board=UBNT-RM,XM,UBNTXM,ar7240)
+	$(call Image/Build/Template/64k/$(1),UBNTXM,ubnt-rocket-m,board=UBNT-RM,XM,UBNTXM,ar7240)
 endef
 
 define Image/Build/Profile/UBNTNANOM
-	$(call Image/Build/Template/UBNTXM/$(1),ubnt-nano-m,board=UBNT-NM,XM,UBNTXM,ar7240)
+	$(call Image/Build/Template/64k/$(1),UBNTXM,ubnt-nano-m,board=UBNT-NM,XM,UBNTXM,ar7240)
 endef
 
 define Image/Build/Profile/UBNT
@@ -434,51 +378,51 @@ define Image/Build/Profile/UBNT
 endef
 
 define Image/Build/Profile/MZKW04NU
-	$(call Image/Build/Template/Planex/$(1),mzk-w04nu,board=MZK-W04NU)
+	$(call Image/Build/Template/64k/$(1),Planex,mzk-w04nu,board=MZK-W04NU)
 endef
 
 define Image/Build/Profile/MZKW300NH
-	$(call Image/Build/Template/Planex/$(1),mzk-w300nh,board=MZK-W300NH)
+	$(call Image/Build/Template/64k/$(1),Planex,mzk-w300nh,board=MZK-W300NH)
 endef
 
 define Image/Build/Profile/TLWR741NDV1
-	$(call Image/Build/Template/TPLINK4K/$(1),tl-wr741nd-v1,board=TL-WR741ND,TL-WR741NDv1)
+	$(call Image/Build/Template/squashfs-only/$(1),TPLINK4K,tl-wr741nd-v1,board=TL-WR741ND,TL-WR741NDv1)
 endef
 
 define Image/Build/Profile/TLWR841NV15
-	$(call Image/Build/Template/TPLINK/$(1),tl-wr841n-v1.5,board=TL-WR841N-v1.5,TL-WR841Nv1.5)
+	$(call Image/Build/Template/squashfs-only/$(1),TPLINK,tl-wr841n-v1.5,board=TL-WR841N-v1.5,TL-WR841Nv1.5)
 endef
 
 define Image/Build/Profile/TLWR841NDV3
-	$(call Image/Build/Template/TPLINK/$(1),tl-wr841nd-v3,board=TL-WR941ND,TL-WR841NDv3)
+	$(call Image/Build/Template/squashfs-only/$(1),TPLINK,tl-wr841nd-v3,board=TL-WR941ND,TL-WR841NDv3)
 endef
 
 define Image/Build/Profile/TLWR841NDV5
-	$(call Image/Build/Template/TPLINK4K/$(1),tl-wr841nd-v5,board=TL-WR741ND,TL-WR841NDv5)
+	$(call Image/Build/Template/squashfs-only/$(1),TPLINK4K,tl-wr841nd-v5,board=TL-WR741ND,TL-WR841NDv5)
 endef
 
 define Image/Build/Profile/TLWR941NDV2
-	$(call Image/Build/Template/TPLINK/$(1),tl-wr941nd-v2,board=TL-WR941ND,TL-WR941NDv2)
+	$(call Image/Build/Template/squashfs-only/$(1),TPLINK,tl-wr941nd-v2,board=TL-WR941ND,TL-WR941NDv2)
 endef
 
 define Image/Build/Profile/TLWR1043NDV1
-	$(call Image/Build/Template/TPLINK/$(1),tl-wr1043nd-v1,board=TL-WR1043ND,TL-WR1043NDv1)
+	$(call Image/Build/Template/squashfs-only/$(1),TPLINK,tl-wr1043nd-v1,board=TL-WR1043ND,TL-WR1043NDv1)
 endef
 
 define Image/Build/Profile/WNDR3700
-	$(call Image/Build/Template/WNDR3700/$(1),wndr3700,board=WNDR3700)
+	$(call Image/Build/Template/64k/$(1),WNDR3700,wndr3700,board=WNDR3700)
 endef
 
 define Image/Build/Profile/WRT400N
-	$(call Image/Build/Template/WRT400N/$(1),wrt400n,board=WRT400N)
+	$(call Image/Build/Template/64k/$(1),WRT400N,wrt400n,board=WRT400N)
 endef
 
 define Image/Build/Profile/DIR825B1
-	$(call Image/Build/Template/DIR825B1/$(1),dir-825-b1,board=DIR-825-B1)
+	$(call Image/Build/Template/64k/$(1),DIR825B1,dir-825-b1,board=DIR-825-B1)
 endef
 
 define Image/Build/Profile/WRT160NL
-	$(call Image/Build/Template/CyberTAN/$(1),wrt160nl,board=WRT160NL,1.00.01)
+	$(call Image/Build/Template/64k/$(1),CyberTAN,wrt160nl,board=WRT160NL,1.00.01)
 endef
 
 define Image/Build/Profile/Default