From 431f863e5eda392580e2d7916973b27fc0a81f15 Mon Sep 17 00:00:00 2001 From: Hauke Mehrtens Date: Thu, 5 Jun 2014 21:23:58 +0000 Subject: brcm47xx: move current target to "generic" subtarget MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This allows creating more subtargets and optimize builds per family. Signed-off-by: Rafał Miłecki Signed-off-by: Hauke Mehrtens git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41024 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- target/linux/brcm47xx/image/Makefile | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) (limited to 'target/linux/brcm47xx/image') diff --git a/target/linux/brcm47xx/image/Makefile b/target/linux/brcm47xx/image/Makefile index f8f8cd0643..9f06e0f541 100644 --- a/target/linux/brcm47xx/image/Makefile +++ b/target/linux/brcm47xx/image/Makefile @@ -98,8 +98,12 @@ define Image/Build/trxV2 $(call Image/Build/CyberTAN2,$(1),$(2),$(3),$(4),$(5),$(if $(6),$(6))) endef +################################################# +# Subtarget generic +################################################# + # $(1): filesystem type. -define Image/Build/jffs2-128k +define Image/Build/generic/jffs2-128k $(call Image/Build/CyberTAN,$(1),wrt54gs,W54S,4.80.1,$(patsubst jffs2-%,jffs2,$(1))) $(call Image/Build/CyberTAN,$(1),wrtsl54gs,W54U,2.08.1,$(patsubst jffs2-%,jffs2,$(1))) $(call Image/Build/trxV2,$(1),wrt54g3gv2-vf,3G2V,3.00.24,$(patsubst jffs2-%,jffs2,$(1)),6) @@ -107,7 +111,7 @@ define Image/Build/jffs2-128k endef # $(1): filesystem type. -define Image/Build/jffs2-64k +define Image/Build/generic/jffs2-64k $(call Image/Build/Chk,$(1),wgr614_v8,U12H072T00_NETGEAR,2,$(patsubst jffs2-%,jffs2,$(1))) $(call Image/Build/Chk,$(1),wndr3300_v1,U12H093T00_NETGEAR,2,$(patsubst jffs2-%,jffs2,$(1))) $(call Image/Build/Chk,$(1),wndr3400_v1,U12H155T00_NETGEAR,2,$(patsubst jffs2-%,jffs2,$(1))) @@ -154,11 +158,15 @@ define Image/Build/jffs2-64k endef # $(1): filesystem type. -define Image/Build/squashfs - $(call Image/Build/jffs2-64k,$(1)) - $(call Image/Build/jffs2-128k,$(1)) +define Image/Build/generic/squashfs + $(call Image/Build/generic/jffs2-64k,$(1)) + $(call Image/Build/generic/jffs2-128k,$(1)) endef +################################################# +# Shared BuildImage defines +################################################# + define Image/Build/Initramfs $(STAGING_DIR_HOST)/bin/trx -o $(BIN_DIR)/$(IMG_PREFIX)-initramfs.trx -f $(KDIR)/loader.gz -f $(KDIR)/vmlinux-initramfs.lzma endef @@ -171,7 +179,7 @@ define Image/Build $(STAGING_DIR_HOST)/bin/trx -o $(BIN_DIR)/$(IMG_PREFIX)-$(1)-gz.trx \ -f $(KDIR)/vmlinux.gz \ $(call trxalign/$(1),$(1)) - $(call Image/Build/$(1),$(1)) + $(call Image/Build/$(SUBTARGET)/$(1),$(1)) # $(call Image/Build/Chk,$(1),wgr614_v9,U12H094T00_NETGEAR,2,$(patsubst jffs2-%,jffs2,$(1))) # $(call Image/Build/Chk,$(1),wndr3400_vcna,U12H155T01_NETGEAR,2,$(patsubst jffs2-%,jffs2,$(1))) # $(call Image/Build/Chk,$(1),wnr3500U,U12H136T00_NETGEAR,2,$(patsubst jffs2-%,jffs2,$(1))) -- cgit v1.2.3