Просмотр исходного кода

split out profile definitions from Makefiles

structure is as follows:
target/linux/<arch>/profiles/<profilename>.mk

These files are included by a blob match in the target Makefile

The files should be labeled based on their profile Name in the definition

SVN-Revision: 6468
Tim Yardley 19 лет назад
Родитель
Сommit
03beb39e5f
29 измененных файлов с 373 добавлено и 186 удалено
  1. 2 17
      target/linux/ar7-2.4/Makefile
  2. 13 0
      target/linux/ar7-2.4/profiles/AnnexA.mk
  3. 13 0
      target/linux/ar7-2.4/profiles/AnnexB.mk
  4. 13 0
      target/linux/ar7-2.4/profiles/None.mk
  5. 2 17
      target/linux/au1000-2.6/Makefile
  6. 13 0
      target/linux/au1000-2.6/profiles/Atheros.mk
  7. 13 0
      target/linux/au1000-2.6/profiles/Broadcom.mk
  8. 13 0
      target/linux/au1000-2.6/profiles/Intel.mk
  9. 2 101
      target/linux/brcm-2.4/Makefile
  10. 17 0
      target/linux/brcm-2.4/profiles/Atheros.mk
  11. 17 0
      target/linux/brcm-2.4/profiles/Broadcom.mk
  12. 17 0
      target/linux/brcm-2.4/profiles/BroadcomMimo.mk
  13. 17 0
      target/linux/brcm-2.4/profiles/None.mk
  14. 17 0
      target/linux/brcm-2.4/profiles/WL500G.mk
  15. 17 0
      target/linux/brcm-2.4/profiles/WL500GD.mk
  16. 17 0
      target/linux/brcm-2.4/profiles/WL500GP.mk
  17. 19 0
      target/linux/brcm-2.4/profiles/WL700GE.mk
  18. 17 0
      target/linux/brcm-2.4/profiles/WLHDD.mk
  19. 17 0
      target/linux/brcm-2.4/profiles/WRT54G3G.mk
  20. 2 29
      target/linux/brcm-2.6/Makefile
  21. 17 0
      target/linux/brcm-2.6/profiles/Atheros.mk
  22. 17 0
      target/linux/brcm-2.6/profiles/None.mk
  23. 17 0
      target/linux/brcm-2.6/profiles/WGT634U.mk
  24. 2 17
      target/linux/brcm63xx-2.6/Makefile
  25. 17 0
      target/linux/brcm63xx-2.6/profiles/Atheros.mk
  26. 17 0
      target/linux/brcm63xx-2.6/profiles/Broadcom.mk
  27. 13 0
      target/linux/brcm63xx-2.6/profiles/Ralink.mk
  28. 2 5
      target/linux/rdc-2.6/Makefile
  29. 13 0
      target/linux/rdc-2.6/profiles/Ralink.mk

+ 2 - 17
target/linux/ar7-2.4/Makefile

@@ -20,22 +20,7 @@ KERNEL:=2.4
 include $(INCLUDE_DIR)/kernel-build.mk
 DEFAULT_PACKAGES += kmod-avalanche-cpmac
 
-define Profile/AnnexA
-  NAME:=ADSL Annex A (default)
-  PACKAGES:=kmod-sangam-atm-annex-a ppp-mod-pppoa
-endef
-$(eval $(call Profile,AnnexA))
-
-define Profile/AnnexB
-  NAME:=ADSL Annex B
-  PACKAGES:=kmod-sangam-atm-annex-b ppp-mod-pppoa
-endef
-$(eval $(call Profile,AnnexB))
-
-define Profile/None
-  NAME:=No ADSL
-  PACKAGES:=
-endef
-$(eval $(call Profile,None))
+# include the profiles
+-include profiles/*.mk
 
 $(eval $(call BuildKernel))

+ 13 - 0
target/linux/ar7-2.4/profiles/AnnexA.mk

@@ -0,0 +1,13 @@
+#
+# Copyright (C) 2006 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+define Profile/AnnexA
+  NAME:=ADSL Annex A (default)
+  PACKAGES:=kmod-sangam-atm-annex-a ppp-mod-pppoa
+endef
+$(eval $(call Profile,AnnexA))
+

+ 13 - 0
target/linux/ar7-2.4/profiles/AnnexB.mk

@@ -0,0 +1,13 @@
+#
+# Copyright (C) 2006 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+define Profile/AnnexB
+  NAME:=ADSL Annex B
+  PACKAGES:=kmod-sangam-atm-annex-b ppp-mod-pppoa
+endef
+$(eval $(call Profile,AnnexB))
+

+ 13 - 0
target/linux/ar7-2.4/profiles/None.mk

@@ -0,0 +1,13 @@
+#
+# Copyright (C) 2006 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+define Profile/None
+  NAME:=No ADSL
+  PACKAGES:=
+endef
+$(eval $(call Profile,None))
+

+ 2 - 17
target/linux/au1000-2.6/Makefile

@@ -25,23 +25,8 @@ define Kernel/BuildImage
 	$(CP) $(LINUX_DIR)/arch/mips/boot/compressed/images/zImage.srec $(LINUX_DIR)/zImage.srec
 endef
 
-define Profile/Atheros
-  NAME:=Atheros WiFi (default)
-  PACKAGES:=kmod-madwifi
-endef
-$(eval $(call Profile,Atheros))
-
-define Profile/Intel
-  NAME:=Intel IPW2200 WiFi
-  PACKAGES:=kmod-net-ipw2200
-endef
-$(eval $(call Profile,Intel))
-
-define Profile/Broadcom
-  NAME:=Broadcom BCM43xx WiFi
-  PACKAGES:=kmod-net-bcm43xx
-endef
-$(eval $(call Profile,Broadcom))
+# include the profiles
+-include profiles/*.mk
 
 $(eval $(call BuildKernel))
 

+ 13 - 0
target/linux/au1000-2.6/profiles/Atheros.mk

@@ -0,0 +1,13 @@
+#
+# Copyright (C) 2006 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+define Profile/Atheros
+  NAME:=Atheros WiFi (default)
+  PACKAGES:=kmod-madwifi
+endef
+$(eval $(call Profile,Atheros))
+

+ 13 - 0
target/linux/au1000-2.6/profiles/Broadcom.mk

@@ -0,0 +1,13 @@
+#
+# Copyright (C) 2006 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+define Profile/Broadcom
+  NAME:=Broadcom BCM43xx WiFi
+  PACKAGES:=kmod-net-bcm43xx
+endef
+$(eval $(call Profile,Broadcom))
+

+ 13 - 0
target/linux/au1000-2.6/profiles/Intel.mk

@@ -0,0 +1,13 @@
+#
+# Copyright (C) 2006 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+define Profile/Intel
+  NAME:=Intel IPW2200 WiFi
+  PACKAGES:=kmod-net-ipw2200
+endef
+$(eval $(call Profile,Intel))
+

+ 2 - 101
target/linux/brcm-2.4/Makefile

@@ -21,106 +21,7 @@ KERNEL:=2.4
 include $(INCLUDE_DIR)/kernel-build.mk
 DEFAULT_PACKAGES += kmod-switch kmod-diag nvram
 
-define Profile/Broadcom
-  NAME:=Generic, Broadcom WiFi (default)
-  PACKAGES:=kmod-brcm-wl wlc nas kmod-wlcompat
-endef
-
-define Profile/Broadcom/Description
-	Default package set compatible with most BCM947xx hardware
-endef
-$(eval $(call Profile,Broadcom))
-
-define Profile/BroadcomMimo
-  NAME:=Generic, Broadcom WiFi (MIMO)
-  PACKAGES:=kmod-brcm-wl-mimo wlc nas kmod-wlcompat
-endef
-
-define Profile/BroadcomMimo/Description
-	Default package set compatible with 802.11n (draft) hardware
-endef
-$(eval $(call Profile,BroadcomMimo))
-
-define Profile/Atheros
-  NAME:=Generic, Atheros WiFi
-  PACKAGES:=kmod-madwifi
-endef
-
-define Profile/Atheros/Description
-	Package set compatible with hardware using Atheros WiFi cards
-endef
-$(eval $(call Profile,Atheros))
-
-define Profile/None
-  NAME:=Generic, No WiFi
-  PACKAGES:=
-endef
-
-define Profile/None/Description
-	Package set without WiFi support
-endef
-$(eval $(call Profile,None))
-
-
-define Profile/WRT54G3G
-  NAME:=Linksys WRT54G3G
-  PACKAGES:=kmod-brcm-wl kmod-usb-core kmod-usb-ohci kmod-usb2 kmod-pcmcia-core kmod-pcmcia-serial kmod-nozomi comgt wlc nas kmod-wlcompat
-endef
-
-define Profile/WRT54G3G/Description
-	Package set optimized for the WRT54G3G with UMTS support
-endef
-$(eval $(call Profile,WRT54G3G))
-
-define Profile/WL500G
-  NAME:=ASUS WL-500g
-  PACKAGES:=kmod-brcm-wl kmod-usb-core kmod-usb-ohci kmod-lp wlc nas kmod-wlcompat
-endef
-
-define Profile/WL500G/Description
-	Package set optimized for the WL-500g with USB and parallel port support
-endef
-$(eval $(call Profile,WL500G))
-
-define Profile/WL500GD
-  NAME:=ASUS WL-500g Deluxe
-  PACKAGES:=kmod-brcm-wl kmod-usb-core kmod-usb-uhci kmod-usb2 wlc nas kmod-wlcompat
-endef
-
-define Profile/WL500GD/Description
-	Package set optimized for the WL-500g Deluxe with USB support
-endef
-$(eval $(call Profile,WL500GD))
-
-define Profile/WL500GP
-  NAME:=ASUS WL-500g Premium
-  PACKAGES:=kmod-brcm-wl kmod-usb-core kmod-usb-ohci kmod-usb2 wlc nas kmod-wlcompat
-endef
-
-define Profile/WL500GP/Description
-	Package set optimized for the WL-500g Premium with USB support
-endef
-$(eval $(call Profile,WL500GP))
-
-define Profile/WLHDD
-  NAME:=WL-HDD
-  PACKAGES:=kmod-brcm-wl kmod-usb-core kmod-usb-ohci kmod-ide-core kmod-ide-pdc202xx wlc nas kmod-wlcompat
-endef
-
-define Profile/WLHDD/Description
-	Package set optimized for the WL-HDD with USB and IDE support
-endef
-$(eval $(call Profile,WLHDD))
-
-define Profile/WL700GE
-  NAME:=WL-700gE
-  PACKAGES:=-ppp -ppp-mod-pppoe -kmod-ipt-nathelper -iptables -dnsmasq -bridge kmod-ide-core kmod-ide-aec62xx kmod-fs-ext3 fdisk e2fsprogs
-endef
-
-define Profile/WL700GE/Description
-	Minimal package set optimized for booting the WL-700gE from flash with a writable filesystem
-	and the utilities to create a new filesystem on the HDD
-endef
-$(eval $(call Profile,WL700GE))
+# include the profiles
+-include profiles/*.mk
 
 $(eval $(call BuildKernel))

+ 17 - 0
target/linux/brcm-2.4/profiles/Atheros.mk

@@ -0,0 +1,17 @@
+#
+# Copyright (C) 2006 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+define Profile/Atheros
+  NAME:=Generic, Atheros WiFi
+  PACKAGES:=kmod-madwifi
+endef
+
+define Profile/Atheros/Description
+	Package set compatible with hardware using Atheros WiFi cards
+endef
+$(eval $(call Profile,Atheros))
+

+ 17 - 0
target/linux/brcm-2.4/profiles/Broadcom.mk

@@ -0,0 +1,17 @@
+#
+# Copyright (C) 2006 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+define Profile/Broadcom
+  NAME:=Generic, Broadcom WiFi (default)
+  PACKAGES:=kmod-brcm-wl wlc nas kmod-wlcompat
+endef
+
+define Profile/Broadcom/Description
+	Default package set compatible with most BCM947xx hardware
+endef
+$(eval $(call Profile,Broadcom))
+

+ 17 - 0
target/linux/brcm-2.4/profiles/BroadcomMimo.mk

@@ -0,0 +1,17 @@
+#
+# Copyright (C) 2006 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+define Profile/BroadcomMimo
+  NAME:=Generic, Broadcom WiFi (MIMO)
+  PACKAGES:=kmod-brcm-wl-mimo wlc nas kmod-wlcompat
+endef
+
+define Profile/BroadcomMimo/Description
+	Default package set compatible with 802.11n (draft) hardware
+endef
+$(eval $(call Profile,BroadcomMimo))
+

+ 17 - 0
target/linux/brcm-2.4/profiles/None.mk

@@ -0,0 +1,17 @@
+#
+# Copyright (C) 2006 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+define Profile/None
+  NAME:=Generic, No WiFi
+  PACKAGES:=
+endef
+
+define Profile/None/Description
+	Package set without WiFi support
+endef
+$(eval $(call Profile,None))
+

+ 17 - 0
target/linux/brcm-2.4/profiles/WL500G.mk

@@ -0,0 +1,17 @@
+#
+# Copyright (C) 2006 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+define Profile/WL500G
+  NAME:=ASUS WL-500g
+  PACKAGES:=kmod-brcm-wl kmod-usb-core kmod-usb-ohci kmod-lp wlc nas kmod-wlcompat
+endef
+
+define Profile/WL500G/Description
+	Package set optimized for the WL-500g with USB and parallel port support
+endef
+$(eval $(call Profile,WL500G))
+

+ 17 - 0
target/linux/brcm-2.4/profiles/WL500GD.mk

@@ -0,0 +1,17 @@
+#
+# Copyright (C) 2006 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+define Profile/WL500GD
+  NAME:=ASUS WL-500g Deluxe
+  PACKAGES:=kmod-brcm-wl kmod-usb-core kmod-usb-uhci kmod-usb2 wlc nas kmod-wlcompat
+endef
+
+define Profile/WL500GD/Description
+	Package set optimized for the WL-500g Deluxe with USB support
+endef
+$(eval $(call Profile,WL500GD))
+

+ 17 - 0
target/linux/brcm-2.4/profiles/WL500GP.mk

@@ -0,0 +1,17 @@
+#
+# Copyright (C) 2006 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+define Profile/WL500GP
+  NAME:=ASUS WL-500g Premium
+  PACKAGES:=kmod-brcm-wl kmod-usb-core kmod-usb-ohci kmod-usb2 wlc nas kmod-wlcompat
+endef
+
+define Profile/WL500GP/Description
+	Package set optimized for the WL-500g Premium with USB support
+endef
+$(eval $(call Profile,WL500GP))
+

+ 19 - 0
target/linux/brcm-2.4/profiles/WL700GE.mk

@@ -0,0 +1,19 @@
+#
+# Copyright (C) 2006 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+define Profile/WL700GE
+  NAME:=WL-700gE
+  PACKAGES:=-ppp -ppp-mod-pppoe -kmod-ipt-nathelper -iptables -dnsmasq -bridge kmod-ide-core kmod-ide-aec62xx kmod-fs-ext3 fdisk e2fsprogs
+endef
+
+define Profile/WL700GE/Description
+	Minimal package set optimized for booting the WL-700gE from flash with a writable filesystem
+	and the utilities to create a new filesystem on the HDD
+endef
+$(eval $(call Profile,WL700GE))
+
+

+ 17 - 0
target/linux/brcm-2.4/profiles/WLHDD.mk

@@ -0,0 +1,17 @@
+#
+# Copyright (C) 2006 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+define Profile/WLHDD
+  NAME:=WL-HDD
+  PACKAGES:=kmod-brcm-wl kmod-usb-core kmod-usb-ohci kmod-ide-core kmod-ide-pdc202xx wlc nas kmod-wlcompat
+endef
+
+define Profile/WLHDD/Description
+	Package set optimized for the WL-HDD with USB and IDE support
+endef
+$(eval $(call Profile,WLHDD))
+

+ 17 - 0
target/linux/brcm-2.4/profiles/WRT54G3G.mk

@@ -0,0 +1,17 @@
+#
+# Copyright (C) 2006 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+define Profile/WRT54G3G
+  NAME:=Linksys WRT54G3G
+  PACKAGES:=kmod-brcm-wl kmod-usb-core kmod-usb-ohci kmod-usb2 kmod-pcmcia-core kmod-pcmcia-serial kmod-nozomi comgt wlc nas kmod-wlcompat
+endef
+
+define Profile/WRT54G3G/Description
+	Package set optimized for the WRT54G3G with UMTS support
+endef
+$(eval $(call Profile,WRT54G3G))
+

+ 2 - 29
target/linux/brcm-2.6/Makefile

@@ -19,34 +19,7 @@ endef
 include $(INCLUDE_DIR)/kernel-build.mk
 DEFAULT_PACKAGES += kmod-switch kmod-diag
 
-define Profile/Atheros
-  NAME:=Atheros WiFi (default)
-  PACKAGES:=kmod-madwifi
-endef
-
-define Profile/Atheros/Description
-	Package set compatible with hardware using Atheros WiFi cards
-endef
-$(eval $(call Profile,Atheros))
-
-define Profile/WGT634U
-  NAME:=Netgear WGT634U
-  PACKAGES:=kmod-madwifi kmod-usb-core kmod-usb-ohci kmod-usb2
-endef
-
-define Profile/WGT634U/Description
-	Package set compatible with the Netgear WGT634U. Contains USB support
-endef
-$(eval $(call Profile,WGT634U))
-
-define Profile/None
-  NAME:=No WiFi
-  PACKAGES:=
-endef
-
-define Profile/None/Description
-	Package set without WiFi support
-endef
-$(eval $(call Profile,None))
+# include the profiles
+-include profiles/*.mk
 
 $(eval $(call BuildKernel))

+ 17 - 0
target/linux/brcm-2.6/profiles/Atheros.mk

@@ -0,0 +1,17 @@
+#
+# Copyright (C) 2006 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+define Profile/Atheros
+  NAME:=Atheros WiFi (default)
+  PACKAGES:=kmod-madwifi
+endef
+
+define Profile/Atheros/Description
+	Package set compatible with hardware using Atheros WiFi cards
+endef
+$(eval $(call Profile,Atheros))
+

+ 17 - 0
target/linux/brcm-2.6/profiles/None.mk

@@ -0,0 +1,17 @@
+#
+# Copyright (C) 2006 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+define Profile/None
+  NAME:=No WiFi
+  PACKAGES:=
+endef
+
+define Profile/None/Description
+	Package set without WiFi support
+endef
+$(eval $(call Profile,None))
+

+ 17 - 0
target/linux/brcm-2.6/profiles/WGT634U.mk

@@ -0,0 +1,17 @@
+#
+# Copyright (C) 2006 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+define Profile/WGT634U
+  NAME:=Netgear WGT634U
+  PACKAGES:=kmod-madwifi kmod-usb-core kmod-usb-ohci kmod-usb2
+endef
+
+define Profile/WGT634U/Description
+	Package set compatible with the Netgear WGT634U. Contains USB support
+endef
+$(eval $(call Profile,WGT634U))
+

+ 2 - 17
target/linux/brcm63xx-2.6/Makefile

@@ -18,22 +18,7 @@ endef
 
 include $(INCLUDE_DIR)/kernel-build.mk
 
-define Profile/Broadcom
-  NAME:=Broadcom WiFi (default)
-  PACKAGES:=kmod-net-bcm43xx
-endef
-$(eval $(call Profile,Broadcom))
-
-define Profile/Atheros
-  NAME:=Atheros WiFi
-  PACKAGES:=kmod-madwifi
-endef
-$(eval $(call Profile,Atheros))
-
-define Profile/Ralink
-  NAME:=Ralink WiFi
-  PACKAGES:=kmod-rt61
-endef
-$(eval $(call Profile,Ralink))
+# include the profiles
+-include profiles/*.mk
 
 $(eval $(call BuildKernel))

+ 17 - 0
target/linux/brcm63xx-2.6/profiles/Atheros.mk

@@ -0,0 +1,17 @@
+#
+# Copyright (C) 2006 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+define Profile/Atheros
+  NAME:=Atheros WiFi (default)
+  PACKAGES:=kmod-madwifi
+endef
+
+define Profile/Atheros/Description
+	Package set compatible with hardware using Atheros WiFi cards
+endef
+$(eval $(call Profile,Atheros))
+

+ 17 - 0
target/linux/brcm63xx-2.6/profiles/Broadcom.mk

@@ -0,0 +1,17 @@
+#
+# Copyright (C) 2006 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+define Profile/Broadcom
+  NAME:=Broadcom WiFi (default)
+  PACKAGES:=kmod-net-bcm43xx
+endef
+
+define Profile/Broadcom/Description
+	Package set compatible with hardware using Broadcom WiFi cards
+endef
+$(eval $(call Profile,Broadcom))
+

+ 13 - 0
target/linux/brcm63xx-2.6/profiles/Ralink.mk

@@ -0,0 +1,13 @@
+#
+# Copyright (C) 2006 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+define Profile/Ralink
+  NAME:=Ralink WiFi
+  PACKAGES:=kmod-rt61
+endef
+$(eval $(call Profile,Ralink))
+

+ 2 - 5
target/linux/rdc-2.6/Makefile

@@ -18,10 +18,7 @@ endef
 
 include $(INCLUDE_DIR)/kernel-build.mk
 
-define Profile/Ralink
-  NAME:=Ralink WiFi (default)
-  PACKAGES:=kmod-rt61
-endef
-$(eval $(call Profile,Ralink))
+# include the profiles
+-include profiles/*.mk
 
 $(eval $(call BuildKernel))

+ 13 - 0
target/linux/rdc-2.6/profiles/Ralink.mk

@@ -0,0 +1,13 @@
+#
+# Copyright (C) 2006 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+define Profile/Ralink
+  NAME:=Ralink WiFi
+  PACKAGES:=kmod-rt61
+endef
+$(eval $(call Profile,Ralink))
+