Author: hauke
Date: 2014-06-05 23:23:58 +0200 (Thu, 05 Jun 2014)
New Revision: 41024

Added:
   trunk/target/linux/brcm47xx/generic/
   trunk/target/linux/brcm47xx/generic/profiles/
   trunk/target/linux/brcm47xx/generic/target.mk
Removed:
   trunk/target/linux/brcm47xx/profiles/
Modified:
   trunk/target/linux/brcm47xx/Makefile
   trunk/target/linux/brcm47xx/image/Makefile
Log:
brcm47xx: move current target to "generic" subtarget

This allows creating more subtargets and optimize builds per family.

Signed-off-by: Rafa?\197?\130 Mi?\197?\130ecki <[email protected]>
Signed-off-by: Hauke Mehrtens <[email protected]>


Modified: trunk/target/linux/brcm47xx/Makefile
===================================================================
--- trunk/target/linux/brcm47xx/Makefile        2014-06-05 21:14:02 UTC (rev 
41023)
+++ trunk/target/linux/brcm47xx/Makefile        2014-06-05 21:23:58 UTC (rev 
41024)
@@ -10,18 +10,15 @@
 BOARD:=brcm47xx
 BOARDNAME:=Broadcom BCM47xx/53xx (MIPS)
 FEATURES:=squashfs usb pcmcia low_mem
+SUBTARGETS:=generic
 MAINTAINER:=Hauke Mehrtens <[email protected]>
 
 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))

Added: trunk/target/linux/brcm47xx/generic/target.mk
===================================================================
--- trunk/target/linux/brcm47xx/generic/target.mk                               
(rev 0)
+++ trunk/target/linux/brcm47xx/generic/target.mk       2014-06-05 21:23:58 UTC 
(rev 41024)
@@ -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

Modified: trunk/target/linux/brcm47xx/image/Makefile
===================================================================
--- trunk/target/linux/brcm47xx/image/Makefile  2014-06-05 21:14:02 UTC (rev 
41023)
+++ trunk/target/linux/brcm47xx/image/Makefile  2014-06-05 21:23:58 UTC (rev 
41024)
@@ -98,8 +98,12 @@
        $(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 @@
 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 @@
 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 @@
        $(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)))
_______________________________________________
openwrt-commits mailing list
[email protected]
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-commits

Reply via email to