brcm47xx: move current target to "generic" subtarget

This allows creating more subtargets and optimize builds per family.

Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>


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

23 files changed, 22 insertions, 11 deletions

diff --git a/target/linux/brcm47xx/Makefile b/target/linux/brcm47xx/Makefile
index 1944bc88be..fa5d21bbe9 100644
--- a/target/linux/brcm47xx/Makefile
+++ b/target/linux/brcm47xx/Makefile
@@ -10,18 +10,15 @@ ARCH:=mipsel
 BOARD:=brcm47xx
 BOARDNAME:=Broadcom BCM47xx/53xx (MIPS)
 FEATURES:=squashfs usb pcmcia low_mem
+SUBTARGETS:=generic
 MAINTAINER:=Hauke Mehrtens <hauke@hauke-m.de>
 
 LINUX_VERSION:=3.10.36
 
 include $(INCLUDE_DIR)/target.mk
+
 DEFAULT_PACKAGES += swconfig wpad-mini nvram \
 	kmod-leds-gpio kmod-gpio-button-hotplug \
 	kmod-ledtrig-default-on kmod-ledtrig-timer kmod-ledtrig-netdev
 
-define Target/Description
-	Build firmware images for Broadcom based routers
-	(e.g. Netgear WGT634U)
-endef
-
 $(eval $(call BuildTarget))
diff --git a/target/linux/brcm47xx/profiles/100-Broadcom-b43.mk b/target/linux/brcm47xx/generic/profiles/100-Broadcom-b43.mk
index 4c420fb299..4c420fb299 100644
--- a/target/linux/brcm47xx/profiles/100-Broadcom-b43.mk
+++ b/target/linux/brcm47xx/generic/profiles/100-Broadcom-b43.mk
diff --git a/target/linux/brcm47xx/profiles/101-Broadcom-wl.mk b/target/linux/brcm47xx/generic/profiles/101-Broadcom-wl.mk
index 21265daff8..21265daff8 100644
--- a/target/linux/brcm47xx/profiles/101-Broadcom-wl.mk
+++ b/target/linux/brcm47xx/generic/profiles/101-Broadcom-wl.mk
diff --git a/target/linux/brcm47xx/profiles/104-Broadcom-ath5k.mk b/target/linux/brcm47xx/generic/profiles/104-Broadcom-ath5k.mk
index ca5295f7e3..ca5295f7e3 100644
--- a/target/linux/brcm47xx/profiles/104-Broadcom-ath5k.mk
+++ b/target/linux/brcm47xx/generic/profiles/104-Broadcom-ath5k.mk
diff --git a/target/linux/brcm47xx/profiles/105-Broadcom-none.mk b/target/linux/brcm47xx/generic/profiles/105-Broadcom-none.mk
index 301d02aebb..301d02aebb 100644
--- a/target/linux/brcm47xx/profiles/105-Broadcom-none.mk
+++ b/target/linux/brcm47xx/generic/profiles/105-Broadcom-none.mk
diff --git a/target/linux/brcm47xx/profiles/200-Broadcom-b44-b43.mk b/target/linux/brcm47xx/generic/profiles/200-Broadcom-b44-b43.mk
index 662a7c8e94..662a7c8e94 100644
--- a/target/linux/brcm47xx/profiles/200-Broadcom-b44-b43.mk
+++ b/target/linux/brcm47xx/generic/profiles/200-Broadcom-b44-b43.mk
diff --git a/target/linux/brcm47xx/profiles/201-Broadcom-b44-wl.mk b/target/linux/brcm47xx/generic/profiles/201-Broadcom-b44-wl.mk
index f974c00e45..f974c00e45 100644
--- a/target/linux/brcm47xx/profiles/201-Broadcom-b44-wl.mk
+++ b/target/linux/brcm47xx/generic/profiles/201-Broadcom-b44-wl.mk
diff --git a/target/linux/brcm47xx/profiles/204-Broadcom-b44-ath5k.mk b/target/linux/brcm47xx/generic/profiles/204-Broadcom-b44-ath5k.mk
index e9dda49d66..e9dda49d66 100644
--- a/target/linux/brcm47xx/profiles/204-Broadcom-b44-ath5k.mk
+++ b/target/linux/brcm47xx/generic/profiles/204-Broadcom-b44-ath5k.mk
diff --git a/target/linux/brcm47xx/profiles/205-Broadcom-b44-none.mk b/target/linux/brcm47xx/generic/profiles/205-Broadcom-b44-none.mk
index a936bba203..a936bba203 100644
--- a/target/linux/brcm47xx/profiles/205-Broadcom-b44-none.mk
+++ b/target/linux/brcm47xx/generic/profiles/205-Broadcom-b44-none.mk
diff --git a/target/linux/brcm47xx/profiles/210-Broadcom-tg3-b43.mk b/target/linux/brcm47xx/generic/profiles/210-Broadcom-tg3-b43.mk
index a0bece914d..a0bece914d 100644
--- a/target/linux/brcm47xx/profiles/210-Broadcom-tg3-b43.mk
+++ b/target/linux/brcm47xx/generic/profiles/210-Broadcom-tg3-b43.mk
diff --git a/target/linux/brcm47xx/profiles/211-Broadcom-tg3-wl.mk b/target/linux/brcm47xx/generic/profiles/211-Broadcom-tg3-wl.mk
index 24ac234fff..24ac234fff 100644
--- a/target/linux/brcm47xx/profiles/211-Broadcom-tg3-wl.mk
+++ b/target/linux/brcm47xx/generic/profiles/211-Broadcom-tg3-wl.mk
diff --git a/target/linux/brcm47xx/profiles/215-Broadcom-tg3-none.mk b/target/linux/brcm47xx/generic/profiles/215-Broadcom-tg3-none.mk
index 2d13ca80c4..2d13ca80c4 100644
--- a/target/linux/brcm47xx/profiles/215-Broadcom-tg3-none.mk
+++ b/target/linux/brcm47xx/generic/profiles/215-Broadcom-tg3-none.mk
diff --git a/target/linux/brcm47xx/profiles/220-Broadcom-bgmac-b43.mk b/target/linux/brcm47xx/generic/profiles/220-Broadcom-bgmac-b43.mk
index 6ef0691a4c..6ef0691a4c 100644
--- a/target/linux/brcm47xx/profiles/220-Broadcom-bgmac-b43.mk
+++ b/target/linux/brcm47xx/generic/profiles/220-Broadcom-bgmac-b43.mk
diff --git a/target/linux/brcm47xx/profiles/221-Broadcom-bgmac-wl.mk b/target/linux/brcm47xx/generic/profiles/221-Broadcom-bgmac-wl.mk
index f671cd9599..f671cd9599 100644
--- a/target/linux/brcm47xx/profiles/221-Broadcom-bgmac-wl.mk
+++ b/target/linux/brcm47xx/generic/profiles/221-Broadcom-bgmac-wl.mk
diff --git a/target/linux/brcm47xx/profiles/225-Broadcom-bgmac-none.mk b/target/linux/brcm47xx/generic/profiles/225-Broadcom-bgmac-none.mk
index 0512119304..0512119304 100644
--- a/target/linux/brcm47xx/profiles/225-Broadcom-bgmac-none.mk
+++ b/target/linux/brcm47xx/generic/profiles/225-Broadcom-bgmac-none.mk
diff --git a/target/linux/brcm47xx/profiles/226-Broadcom-bgmac-brcsmac.mk b/target/linux/brcm47xx/generic/profiles/226-Broadcom-bgmac-brcsmac.mk
index d9dc9e7a4a..d9dc9e7a4a 100644
--- a/target/linux/brcm47xx/profiles/226-Broadcom-bgmac-brcsmac.mk
+++ b/target/linux/brcm47xx/generic/profiles/226-Broadcom-bgmac-brcsmac.mk
diff --git a/target/linux/brcm47xx/profiles/PS-1208MFG.mk b/target/linux/brcm47xx/generic/profiles/PS-1208MFG.mk
index 33a2565ff3..33a2565ff3 100644
--- a/target/linux/brcm47xx/profiles/PS-1208MFG.mk
+++ b/target/linux/brcm47xx/generic/profiles/PS-1208MFG.mk
diff --git a/target/linux/brcm47xx/profiles/WGT634U.mk b/target/linux/brcm47xx/generic/profiles/WGT634U.mk
index 16c8d9de72..16c8d9de72 100644
--- a/target/linux/brcm47xx/profiles/WGT634U.mk
+++ b/target/linux/brcm47xx/generic/profiles/WGT634U.mk
diff --git a/target/linux/brcm47xx/profiles/WL500GPv1-ATH.mk b/target/linux/brcm47xx/generic/profiles/WL500GPv1-ATH.mk
index 3cdd8a0b33..3cdd8a0b33 100644
--- a/target/linux/brcm47xx/profiles/WL500GPv1-ATH.mk
+++ b/target/linux/brcm47xx/generic/profiles/WL500GPv1-ATH.mk
diff --git a/target/linux/brcm47xx/profiles/WRT350Nv1.mk b/target/linux/brcm47xx/generic/profiles/WRT350Nv1.mk
index c861615aad..c861615aad 100644
--- a/target/linux/brcm47xx/profiles/WRT350Nv1.mk
+++ b/target/linux/brcm47xx/generic/profiles/WRT350Nv1.mk
diff --git a/target/linux/brcm47xx/profiles/WRTSL54GS.mk b/target/linux/brcm47xx/generic/profiles/WRTSL54GS.mk
index 68d9a17fe8..68d9a17fe8 100644
--- a/target/linux/brcm47xx/profiles/WRTSL54GS.mk
+++ b/target/linux/brcm47xx/generic/profiles/WRTSL54GS.mk
diff --git a/target/linux/brcm47xx/generic/target.mk b/target/linux/brcm47xx/generic/target.mk
new file mode 100644
index 0000000000..0bcc5f031d
--- /dev/null
+++ b/target/linux/brcm47xx/generic/target.mk
@@ -0,0 +1,6 @@
+BOARDNAME:=Generic
+
+define Target/Description
+	Build generic firmware for all Broadcom BCM47xx and BCM53xx MIPS
+	devices. It runs on both architectures BMIPS3300 and MIPS 74K.
+endef
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)))