From 76c12ff797c49940741b107d7b09dc1bdd350670 Mon Sep 17 00:00:00 2001 From: Hauke Mehrtens Date: Thu, 24 Jan 2013 14:38:10 +0000 Subject: [PATCH] brcm47xx: change generic profiles The default profile now contains Ethernet drivers for all the types found on supported boards. There are other profiles for each Ethernet driver. SVN-Revision: 35314 --- .../brcm47xx/profiles/100-Broadcom-b43.mk | 11 +++++----- .../brcm47xx/profiles/101-Broadcom-wl.mk | 12 +++++------ .../brcm47xx/profiles/104-Broadcom-ath5k.mk | 13 ++++++------ .../brcm47xx/profiles/105-Broadcom-none.mk | 11 +++++----- .../brcm47xx/profiles/110-Bcm4705-b43.mk | 19 ------------------ .../linux/brcm47xx/profiles/111-Bcm4705-wl.mk | 20 ------------------- .../brcm47xx/profiles/115-Bcm4705-none.mk | 17 ---------------- .../brcm47xx/profiles/200-Broadcom-b44-b43.mk | 20 +++++++++++++++++++ .../brcm47xx/profiles/201-Broadcom-b44-wl.mk | 20 +++++++++++++++++++ .../profiles/204-Broadcom-b44-ath5k.mk | 19 ++++++++++++++++++ .../profiles/205-Broadcom-b44-none.mk | 18 +++++++++++++++++ .../brcm47xx/profiles/210-Broadcom-tg3-b43.mk | 20 +++++++++++++++++++ .../brcm47xx/profiles/211-Broadcom-tg3-wl.mk | 20 +++++++++++++++++++ .../profiles/215-Broadcom-tg3-none.mk | 18 +++++++++++++++++ .../profiles/220-Broadcom-bgmac-b43.mk | 20 +++++++++++++++++++ .../profiles/221-Broadcom-bgmac-wl.mk | 20 +++++++++++++++++++ .../profiles/225-Broadcom-bgmac-none.mk | 18 +++++++++++++++++ 17 files changed, 218 insertions(+), 78 deletions(-) delete mode 100644 target/linux/brcm47xx/profiles/110-Bcm4705-b43.mk delete mode 100644 target/linux/brcm47xx/profiles/111-Bcm4705-wl.mk delete mode 100644 target/linux/brcm47xx/profiles/115-Bcm4705-none.mk create mode 100644 target/linux/brcm47xx/profiles/200-Broadcom-b44-b43.mk create mode 100644 target/linux/brcm47xx/profiles/201-Broadcom-b44-wl.mk create mode 100644 target/linux/brcm47xx/profiles/204-Broadcom-b44-ath5k.mk create mode 100644 target/linux/brcm47xx/profiles/205-Broadcom-b44-none.mk create mode 100644 target/linux/brcm47xx/profiles/210-Broadcom-tg3-b43.mk create mode 100644 target/linux/brcm47xx/profiles/211-Broadcom-tg3-wl.mk create mode 100644 target/linux/brcm47xx/profiles/215-Broadcom-tg3-none.mk create mode 100644 target/linux/brcm47xx/profiles/220-Broadcom-bgmac-b43.mk create mode 100644 target/linux/brcm47xx/profiles/221-Broadcom-bgmac-wl.mk create mode 100644 target/linux/brcm47xx/profiles/225-Broadcom-bgmac-none.mk diff --git a/target/linux/brcm47xx/profiles/100-Broadcom-b43.mk b/target/linux/brcm47xx/profiles/100-Broadcom-b43.mk index 54e3909b68..b50e30562e 100644 --- a/target/linux/brcm47xx/profiles/100-Broadcom-b43.mk +++ b/target/linux/brcm47xx/profiles/100-Broadcom-b43.mk @@ -1,18 +1,19 @@ # -# Copyright (C) 2007-2010 OpenWrt.org +# Copyright (C) 2007-2013 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. # define Profile/Broadcom-b43 - NAME:=Broadcom BCM43xx WiFi (b43, default) - PACKAGES:=kmod-b44 kmod-b43 kmod-b43legacy + NAME:=Broadcom SoC, all Ethernet, BCM43xx WiFi (b43, default) + PACKAGES:=kmod-b44 kmod-tg3 kmod-bgmac kmod-b43 kmod-b43legacy endef define Profile/Broadcom-b43/Description - Package set compatible with hardware using Broadcom BCM43xx cards - using the MAC80211 b43 and b43legacy drivers and b44 Ethernet driver. + Package set compatible with hardware any Broadcom BCM47xx or BCM535x + SoC with Broadcom BCM43xx Wifi cards using the mac80211, b43 and + b43legacy drivers and b44, tg3 or bgmac Ethernet driver. endef $(eval $(call Profile,Broadcom-b43)) diff --git a/target/linux/brcm47xx/profiles/101-Broadcom-wl.mk b/target/linux/brcm47xx/profiles/101-Broadcom-wl.mk index bad38de671..e06ceb0a86 100644 --- a/target/linux/brcm47xx/profiles/101-Broadcom-wl.mk +++ b/target/linux/brcm47xx/profiles/101-Broadcom-wl.mk @@ -1,19 +1,19 @@ # -# Copyright (C) 2010 OpenWrt.org +# Copyright (C) 2010-2013 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. # define Profile/Broadcom-wl - NAME:=Broadcom BCM43xx WiFi (wl, proprietary) - PACKAGES:=-wpad-mini kmod-b44 kmod-brcm-wl wlc nas + NAME:=Broadcom SoC, all Ethernet, BCM43xx WiFi (wl, proprietary) + PACKAGES:=-wpad-mini kmod-b44 kmod-tg3 kmod-bgmac kmod-brcm-wl wlc nas endef define Profile/Broadcom-wl/Description - Package set compatible with hardware using Broadcom BCM43xx cards - using the proprietary broadcom wireless "wl" driver and b44 Ethernet - driver. + Package set compatible with hardware any Broadcom BCM47xx or BCM535x + SoC with Broadcom BCM43xx Wifi cards using the proprietary Broadcom + wireless "wl" driver and b44, tg3 or bgmac Ethernet driver. endef $(eval $(call Profile,Broadcom-wl)) diff --git a/target/linux/brcm47xx/profiles/104-Broadcom-ath5k.mk b/target/linux/brcm47xx/profiles/104-Broadcom-ath5k.mk index 56a505a90e..cd6b10b373 100644 --- a/target/linux/brcm47xx/profiles/104-Broadcom-ath5k.mk +++ b/target/linux/brcm47xx/profiles/104-Broadcom-ath5k.mk @@ -1,18 +1,19 @@ # -# Copyright (C) 2006-2008 OpenWrt.org +# Copyright (C) 2006-2013 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. # define Profile/Broadcom-ath5k - NAME:=Atheros WiFi (ath5k) - PACKAGES:=kmod-b44 kmod-ath5k + NAME:=Broadcom SoC, all Ethernet, Atheros WiFi (ath5k) + PACKAGES:=kmod-b44 kmod-tg3 kmod-bgmac kmod-ath5k endef -define Profile/Atheros/Description - Package set compatible with hardware using Atheros WiFi cards and - b44 Ethernet driver. +define Profile/Broadcom-ath5k/Description + Package set compatible with hardware any Broadcom BCM47xx or BCM535x + SoC with Atheros Wifi cards using the mac80211 and ath5k drivers and + b44, tg3 or bgmac Ethernet driver. endef $(eval $(call Profile,Broadcom-ath5k)) diff --git a/target/linux/brcm47xx/profiles/105-Broadcom-none.mk b/target/linux/brcm47xx/profiles/105-Broadcom-none.mk index d04813692a..7917d3552f 100644 --- a/target/linux/brcm47xx/profiles/105-Broadcom-none.mk +++ b/target/linux/brcm47xx/profiles/105-Broadcom-none.mk @@ -1,17 +1,18 @@ # -# Copyright (C) 2006-2008 OpenWrt.org +# Copyright (C) 2006-2013 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. # define Profile/Broadcom-none - NAME:=No WiFi - PACKAGES:=-wpad-mini kmod-b44 + NAME:=Broadcom SoC, all Ethernet, No WiFi + PACKAGES:=-wpad-mini kmod-b44 kmod-tg3 kmod-bgmac endef -define Profile/None/Description - Package set without WiFi support and b44 Ethernet driver. +define Profile/Broadcom-none/Description + Package set compatible with hardware any Broadcom BCM47xx or BCM535x + SoC without any Wifi cards and b44, tg3 or bgmac Ethernet driver. endef $(eval $(call Profile,Broadcom-none)) diff --git a/target/linux/brcm47xx/profiles/110-Bcm4705-b43.mk b/target/linux/brcm47xx/profiles/110-Bcm4705-b43.mk deleted file mode 100644 index 081ea6cef9..0000000000 --- a/target/linux/brcm47xx/profiles/110-Bcm4705-b43.mk +++ /dev/null @@ -1,19 +0,0 @@ -# -# Copyright (C) 2007-2010 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# - -define Profile/Bcm4705-b43 - NAME:=BCM4705/BCM4785, Broadcom BCM43xx WiFi (b43) - PACKAGES:=kmod-b43 kmod-b43legacy kmod-tg3 -endef - -define Profile/Broadcom-b43/Description - Package set compatible with hardware using Broadcom BCM43xx cards - using the MAC80211 b43 and b43legacy drivers and tg3 Ethernet driver -endef - -$(eval $(call Profile,Bcm4705-b43)) - diff --git a/target/linux/brcm47xx/profiles/111-Bcm4705-wl.mk b/target/linux/brcm47xx/profiles/111-Bcm4705-wl.mk deleted file mode 100644 index f9a07c8b72..0000000000 --- a/target/linux/brcm47xx/profiles/111-Bcm4705-wl.mk +++ /dev/null @@ -1,20 +0,0 @@ -# -# Copyright (C) 2010 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# - -define Profile/Bcm4705-wl - NAME:=BCM4705/BCM4785, BCM43xx WiFi (wl, proprietary) - PACKAGES:=-wpad-mini kmod-brcm-wl wlc nas kmod-tg3 -endef - -define Profile/Bcm4705-wl/Description - Package set compatible with hardware using Broadcom BCM43xx cards - using the proprietary broadcom wireless "wl" driver and tg3 Ethernet - driver. -endef - -$(eval $(call Profile,Bcm4705-wl)) - diff --git a/target/linux/brcm47xx/profiles/115-Bcm4705-none.mk b/target/linux/brcm47xx/profiles/115-Bcm4705-none.mk deleted file mode 100644 index 3ef15d29be..0000000000 --- a/target/linux/brcm47xx/profiles/115-Bcm4705-none.mk +++ /dev/null @@ -1,17 +0,0 @@ -# -# Copyright (C) 2006-2008 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# - -define Profile/Bcm4705-none - NAME:=BCM4705/BCM4785, no WiFi - PACKAGES:=-wpad-mini kmod-tg3 -endef - -define Profile/None/Description - Package set without WiFi support and tg3 Ethernet driver. -endef -$(eval $(call Profile,Bcm4705-none)) - diff --git a/target/linux/brcm47xx/profiles/200-Broadcom-b44-b43.mk b/target/linux/brcm47xx/profiles/200-Broadcom-b44-b43.mk new file mode 100644 index 0000000000..f246a3aae9 --- /dev/null +++ b/target/linux/brcm47xx/profiles/200-Broadcom-b44-b43.mk @@ -0,0 +1,20 @@ +# +# Copyright (C) 2007-2013 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# + +define Profile/Broadcom-b44-b43 + NAME:=Broadcom SoC, b44 Ethernet, BCM43xx WiFi (b43, default) + PACKAGES:=kmod-b44 kmod-b43 kmod-b43legacy +endef + +define Profile/Broadcom-b44-b43/Description + Package set compatible with hardware older Broadcom BCM47xx or BCM535x + SoC with Broadcom BCM43xx Wifi cards using the mac80211, b43 and + b43legacy drivers and b44 Ethernet driver. +endef + +$(eval $(call Profile,Broadcom-b44-b43)) + diff --git a/target/linux/brcm47xx/profiles/201-Broadcom-b44-wl.mk b/target/linux/brcm47xx/profiles/201-Broadcom-b44-wl.mk new file mode 100644 index 0000000000..83dd59638c --- /dev/null +++ b/target/linux/brcm47xx/profiles/201-Broadcom-b44-wl.mk @@ -0,0 +1,20 @@ +# +# Copyright (C) 2010-2013 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# + +define Profile/Broadcom-b44-wl + NAME:=Broadcom SoC, b44 Ethernet, BCM43xx WiFi (wl, proprietary) + PACKAGES:=-wpad-mini kmod-b44 kmod-brcm-wl wlc nas +endef + +define Profile/Broadcom-b44-wl/Description + Package set compatible with hardware older Broadcom BCM47xx or BCM535x + SoC with Broadcom BCM43xx Wifi cards using the proprietary Broadcom + wireless "wl" driver and b44 Ethernet driver. +endef + +$(eval $(call Profile,Broadcom-b44-wl)) + diff --git a/target/linux/brcm47xx/profiles/204-Broadcom-b44-ath5k.mk b/target/linux/brcm47xx/profiles/204-Broadcom-b44-ath5k.mk new file mode 100644 index 0000000000..55d729a5b7 --- /dev/null +++ b/target/linux/brcm47xx/profiles/204-Broadcom-b44-ath5k.mk @@ -0,0 +1,19 @@ +# +# Copyright (C) 2006-2013 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# + +define Profile/Broadcom-b44-ath5k + NAME:=Broadcom SoC, b44 Ethernet, Atheros WiFi (ath5k) + PACKAGES:=kmod-b44 kmod-ath5k +endef + +define Profile/Broadcom-b44-ath5k/Description + Package set compatible with hardware older Broadcom BCM47xx or BCM535x + SoC with Atheros Wifi cards using the mac80211 and ath5k drivers and + b44 Ethernet driver. +endef +$(eval $(call Profile,Broadcom-b44-ath5k)) + diff --git a/target/linux/brcm47xx/profiles/205-Broadcom-b44-none.mk b/target/linux/brcm47xx/profiles/205-Broadcom-b44-none.mk new file mode 100644 index 0000000000..88e6ec37ef --- /dev/null +++ b/target/linux/brcm47xx/profiles/205-Broadcom-b44-none.mk @@ -0,0 +1,18 @@ +# +# Copyright (C) 2006-2013 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# + +define Profile/Broadcom-b44-none + NAME:=Broadcom SoC, b44 Ethernet, No WiFi + PACKAGES:=-wpad-mini kmod-b44 +endef + +define Profile/Broadcom-b44-none/Description + Package set compatible with hardware older Broadcom BCM47xx or BCM535x + SoC without any Wifi cards and b44 Ethernet driver. +endef +$(eval $(call Profile,Broadcom-b44-none)) + diff --git a/target/linux/brcm47xx/profiles/210-Broadcom-tg3-b43.mk b/target/linux/brcm47xx/profiles/210-Broadcom-tg3-b43.mk new file mode 100644 index 0000000000..a0bece914d --- /dev/null +++ b/target/linux/brcm47xx/profiles/210-Broadcom-tg3-b43.mk @@ -0,0 +1,20 @@ +# +# Copyright (C) 2007-2013 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# + +define Profile/Broadcom-tg3-b43 + NAME:=Broadcom SoC, tg3 Ethernet, BCM43xx WiFi (b43) + PACKAGES:=kmod-b43 kmod-tg3 +endef + +define Profile/Broadcom-tg3-b43/Description + Package set compatible with hardware Broadcom BCM4705/BCM4785 + SoCs with Broadcom BCM43xx Wifi cards using the mac80211 and b43 + driver and tg3 Ethernet driver. +endef + +$(eval $(call Profile,Broadcom-tg3-b43)) + diff --git a/target/linux/brcm47xx/profiles/211-Broadcom-tg3-wl.mk b/target/linux/brcm47xx/profiles/211-Broadcom-tg3-wl.mk new file mode 100644 index 0000000000..d2788e6377 --- /dev/null +++ b/target/linux/brcm47xx/profiles/211-Broadcom-tg3-wl.mk @@ -0,0 +1,20 @@ +# +# Copyright (C) 2010-2013 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# + +define Profile/Broadcom-tg3-wl + NAME:=Broadcom SoC, tg3 Ethernet, BCM43xx WiFi (wl, proprietary) + PACKAGES:=-wpad-mini kmod-brcm-wl wlc nas kmod-tg3 +endef + +define Profile/Broadcom-tg3-wl/Description + Package set compatible with hardware Broadcom BCM4705/BCM4785 + SoC with Broadcom BCM43xx Wifi cards using the proprietary Broadcom + wireless "wl" driver and tg3 Ethernet driver. +endef + +$(eval $(call Profile,Broadcom-tg3-wl)) + diff --git a/target/linux/brcm47xx/profiles/215-Broadcom-tg3-none.mk b/target/linux/brcm47xx/profiles/215-Broadcom-tg3-none.mk new file mode 100644 index 0000000000..2d13ca80c4 --- /dev/null +++ b/target/linux/brcm47xx/profiles/215-Broadcom-tg3-none.mk @@ -0,0 +1,18 @@ +# +# Copyright (C) 2006-2013 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# + +define Profile/Broadcom-tg3-none + NAME:=Broadcom SoC, tg3 Ethernet, no WiFi + PACKAGES:=-wpad-mini kmod-tg3 +endef + +define Profile/Broadcom-tg3-none/Description + Package set compatible with hardware Broadcom BCM4705/BCM4785 + SoC without any Wifi cards and tg3 Ethernet driver. +endef +$(eval $(call Profile,Broadcom-tg3-none)) + diff --git a/target/linux/brcm47xx/profiles/220-Broadcom-bgmac-b43.mk b/target/linux/brcm47xx/profiles/220-Broadcom-bgmac-b43.mk new file mode 100644 index 0000000000..70cd8890a9 --- /dev/null +++ b/target/linux/brcm47xx/profiles/220-Broadcom-bgmac-b43.mk @@ -0,0 +1,20 @@ +# +# Copyright (C) 2007-2013 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# + +define Profile/Broadcom-bgmac-b43 + NAME:=Broadcom SoC, bgmac Ethernet, BCM43xx WiFi (bgmac) + PACKAGES:=kmod-bgmac kmod-b43 +endef + +define Profile/Broadcom-bgmac-b43/Description + Package set compatible with hardware newer Broadcom BCM47xx or BCM535x + SoC with Broadcom BCM43xx Wifi cards using the mac80211 and b43 + drivers and bgmac Ethernet driver. +endef + +$(eval $(call Profile,Broadcom-bgmac-b43)) + diff --git a/target/linux/brcm47xx/profiles/221-Broadcom-bgmac-wl.mk b/target/linux/brcm47xx/profiles/221-Broadcom-bgmac-wl.mk new file mode 100644 index 0000000000..1fa81d71ec --- /dev/null +++ b/target/linux/brcm47xx/profiles/221-Broadcom-bgmac-wl.mk @@ -0,0 +1,20 @@ +# +# Copyright (C) 2010-2013 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# + +define Profile/Broadcom-bgmac-wl + NAME:=Broadcom SoC, bgmac Ethernet, BCM43xx WiFi (wl, proprietary) + PACKAGES:=-wpad-mini kmod-bgmac kmod-brcm-wl wlc nas +endef + +define Profile/Broadcom-bgmac-wl/Description + Package set compatible with hardware newer Broadcom BCM47xx or BCM535x + SoC with Broadcom BCM43xx Wifi cards using the proprietary Broadcom + wireless "wl" driver and bgmac Ethernet driver. +endef + +$(eval $(call Profile,Broadcom-bgmac-wl)) + diff --git a/target/linux/brcm47xx/profiles/225-Broadcom-bgmac-none.mk b/target/linux/brcm47xx/profiles/225-Broadcom-bgmac-none.mk new file mode 100644 index 0000000000..731f9e5ea0 --- /dev/null +++ b/target/linux/brcm47xx/profiles/225-Broadcom-bgmac-none.mk @@ -0,0 +1,18 @@ +# +# Copyright (C) 2006-2013 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# + +define Profile/Broadcom-bgmac-none + NAME:=Broadcom SoC, bgmac Ethernet, No WiFi + PACKAGES:=-wpad-mini kmod-bgmac +endef + +define Profile/Broadcom-bgmac-none/Description + Package set compatible with hardware newer Broadcom BCM47xx or BCM535x + SoC without any Wifi cards and bgmac Ethernet driver. +endef +$(eval $(call Profile,Broadcom-bgmac-none)) + -- 2.25.1