From 61efbd720a0dd47b55153a1753f8d9d29483fcc7 Mon Sep 17 00:00:00 2001 From: juhosg Date: Sat, 2 Jan 2010 16:30:49 +0000 Subject: [PATCH] ar71xx: simplify image generation a bit git-svn-id: svn://svn.openwrt.org/openwrt/trunk@19010 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- target/linux/ar71xx/image/Makefile | 88 +++++++----------------------- 1 file changed, 20 insertions(+), 68 deletions(-) diff --git a/target/linux/ar71xx/image/Makefile b/target/linux/ar71xx/image/Makefile index 4788f70f3..af0116c49 100644 --- a/target/linux/ar71xx/image/Makefile +++ b/target/linux/ar71xx/image/Makefile @@ -264,132 +264,84 @@ define Image/Build/WNDR3700 -o $(call imgname,$(1),$(2))-factory.img endef -define Image/Build/Template/Compex - $(call Image/Build/MyLoader,$(1),$(2)) -endef - define Image/Build/Template/Compex/squashfs - $(call Image/Build/Template/Compex,squashfs,$(1)) -endef - -define Image/Build/Template/WRT400N - $(call Image/Build/WRT400N,$(1),$(2),$(3),$(4)) + $(call Image/Build/MyLoader,squashfs,$(1)) endef define Image/Build/Template/WRT400N/squashfs - $(call Image/Build/Template/WRT400N,squashfs,$(1),$(2),$(3)) + $(call Image/Build/WRT400N,squashfs,$(1),$(2),$(3)) endef define Image/Build/Template/WRT400N/jffs2-64k - $(call Image/Build/Template/WRT400N,jffs2-64k,$(1),$(2),$(3)) -endef - -define Image/Build/Template/DIR825B1 - $(call Image/Build/DIR825B1,$(1),$(2),$(3),$(4)) + $(call Image/Build/WRT400N,jffs2-64k,$(1),$(2),$(3)) endef define Image/Build/Template/DIR825B1/squashfs - $(call Image/Build/Template/DIR825B1,squashfs,$(1),$(2),$(3)) + $(call Image/Build/DIR825B1,squashfs,$(1),$(2),$(3)) endef define Image/Build/Template/DIR825B1/jffs2-64k - $(call Image/Build/Template/DIR825B1,jffs2-64k,$(1),$(2),$(3)) -endef - -define Image/Build/Template/CyberTAN - $(call Image/Build/CyberTAN,$(1),$(2),$(3),$(4)) + $(call Image/Build/DIR825B1,jffs2-64k,$(1),$(2),$(3)) endef define Image/Build/Template/CyberTAN/squashfs - $(call Image/Build/Template/CyberTAN,squashfs,$(1),$(2),$(3)) + $(call Image/Build/CyberTAN,squashfs,$(1),$(2),$(3)) endef define Image/Build/Template/CyberTAN/jffs2-64k - $(call Image/Build/Template/CyberTAN,jffs2-64k,$(1),$(2),$(3)) -endef - -define Image/Build/Template/Cameo - $(call Image/Build/Cameo,$(1),$(2),$(3),$(4)) + $(call Image/Build/CyberTAN,jffs2-64k,$(1),$(2),$(3)) endef define Image/Build/Template/Cameo/squashfs - $(call Image/Build/Template/Cameo,squashfs,$(1),$(2),$(3)) -endef - -define Image/Build/Template/AP83 - $(call Image/Build/AP83,$(1),$(2),$(3)) + $(call Image/Build/Cameo,squashfs,$(1),$(2),$(3)) endef define Image/Build/Template/AP83/squashfs - $(call Image/Build/Template/AP83,squashfs,$(1),$(2)) + $(call Image/Build/AP83,squashfs,$(1),$(2)) endef define Image/Build/Template/AP83/jffs2-64k - $(call Image/Build/Template/AP83,jffs2-64k,$(1),$(2)) -endef - -define Image/Build/Template/TPLINK - $(call Image/Build/TPLINK,$(1),$(2),$(3),$(4)) + $(call Image/Build/AP83,jffs2-64k,$(1),$(2)) endef define Image/Build/Template/TPLINK/squashfs - $(call Image/Build/Template/TPLINK,squashfs,$(1),$(2),$(3)) -endef - -define Image/Build/Template/TPLINK4K - $(call Image/Build/TPLINK,$(1),$(2),$(3),$(4)) + $(call Image/Build/TPLINK,squashfs,$(1),$(2),$(3)) endef define Image/Build/Template/TPLINK4K/squashfs - $(call Image/Build/Template/TPLINK,squashfs,$(1),$(2),$(3)) -endef - -define Image/Build/Template/UBNT - $(call Image/Build/UBNT,$(1),$(2),$(3),$(4),$(5),$(6)) + $(call Image/Build/TPLINK,squashfs,$(1),$(2),$(3)) endef define Image/Build/Template/UBNT/squashfs - $(call Image/Build/Template/UBNT,squashfs,$(1),$(2),$(3),$(4),$(5)) + $(call Image/Build/UBNT,squashfs,$(1),$(2),$(3),$(4),$(5)) endef define Image/Build/Template/UBNT/jffs2-64k - $(call Image/Build/Template/UBNT,jffs2-64k,$(1),$(2),$(3),$(4),$(5)) -endef - -define Image/Build/Template/UBNTXM - $(call Image/Build/UBNTXM,$(1),$(2),$(3),$(4),$(5),$(6)) + $(call Image/Build/UBNT,jffs2-64k,$(1),$(2),$(3),$(4),$(5)) endef define Image/Build/Template/UBNTXM/squashfs - $(call Image/Build/Template/UBNTXM,squashfs,$(1),$(2),$(3),$(4),$(5)) + $(call Image/Build/UBNTXM,squashfs,$(1),$(2),$(3),$(4),$(5)) endef define Image/Build/Template/UBNTXM/jffs2-64k - $(call Image/Build/Template/UBNTXM,jffs2-64k,$(1),$(2),$(3),$(4),$(5)) -endef - -define Image/Build/Template/Planex - $(call Image/Build/Planex,$(1),$(2),$(3)) + $(call Image/Build/UBNTXM,jffs2-64k,$(1),$(2),$(3),$(4),$(5)) endef define Image/Build/Template/Planex/squashfs - $(call Image/Build/Template/Planex,squashfs,$(1),$(2)) + $(call Image/Build/Planex,squashfs,$(1),$(2)) endef define Image/Build/Template/Planex/jffs2-64k - $(call Image/Build/Template/Planex,jffs2-64k,$(1),$(2)) -endef - -define Image/Build/Template/WNDR3700 - $(call Image/Build/WNDR3700,$(1),$(2),$(3)) + $(call Image/Build/Planex,jffs2-64k,$(1),$(2)) endef define Image/Build/Template/WNDR3700/squashfs - $(call Image/Build/Template/WNDR3700,squashfs,$(1),$(2)) + $(call Image/Build/WNDR3700,squashfs,$(1),$(2)) endef define Image/Build/Template/WNDR3700/jffs2-64k - $(call Image/Build/Template/WNDR3700,jffs2-64k,$(1),$(2)) + $(call Image/Build/WNDR3700,jffs2-64k,$(1),$(2)) endef define Image/Build/Profile/AP83 -- 2.35.1