[brcm47xx] update profiles

* add profile for BCM4705 based SoC using tg3 instead of b44
* remove redundant 105-Atheros.mk
* reorder


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

7 files changed, 46 insertions, 25 deletions

diff --git a/target/linux/brcm47xx/profiles/100-Broadcom-b43.mk b/target/linux/brcm47xx/profiles/100-Broadcom-b43.mk
index df8d37baff..7880ce80f6 100644
--- a/target/linux/brcm47xx/profiles/100-Broadcom-b43.mk
+++ b/target/linux/brcm47xx/profiles/100-Broadcom-b43.mk
@@ -12,7 +12,7 @@ endef
 
 define Profile/Broadcom-b43/Description
 	Package set compatible with hardware using Broadcom BCM43xx cards
-	using the MAC80211 b43 and b43legacy drivers.
+	using the MAC80211 b43 and b43legacy drivers and b44 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 d67298cc9d..1464b7e15f 100644
--- a/target/linux/brcm47xx/profiles/101-Broadcom-wl.mk
+++ b/target/linux/brcm47xx/profiles/101-Broadcom-wl.mk
@@ -12,7 +12,8 @@ endef
 
 define Profile/Broadcom-wl/Description
 	Package set compatible with hardware using Broadcom BCM43xx cards
-	using the proprietary broadcom wireless "wl" driver.
+	using the proprietary broadcom wireless "wl" driver and b44 Ethernet
+	driver.
 endef
 
 $(eval $(call Profile,Broadcom-wl))
diff --git a/target/linux/brcm47xx/profiles/105-Atheros.mk b/target/linux/brcm47xx/profiles/104-Broadcom-ath5k.mk
index f47a3610b7..32baa089aa 100644
--- a/target/linux/brcm47xx/profiles/105-Atheros.mk
+++ b/target/linux/brcm47xx/profiles/104-Broadcom-ath5k.mk
@@ -5,13 +5,14 @@
 # See /LICENSE for more information.
 #
 
-define Profile/Atheros
+define Profile/Broadcom-ath5k
   NAME:=Atheros WiFi (ath5k)
   PACKAGES:=kmod-ath5k
 endef
 
 define Profile/Atheros/Description
-	Package set compatible with hardware using Atheros WiFi cards
+	Package set compatible with hardware using Atheros WiFi cards and
+	b44 Ethernet driver.
 endef
-$(eval $(call Profile,Atheros))
+$(eval $(call Profile,Broadcom-ath5k))
 
diff --git a/target/linux/brcm47xx/profiles/110-None.mk b/target/linux/brcm47xx/profiles/105-Broadcom-none.mk
index 73df59bf7d..04ad25dc67 100644
--- a/target/linux/brcm47xx/profiles/110-None.mk
+++ b/target/linux/brcm47xx/profiles/105-Broadcom-none.mk
@@ -5,13 +5,13 @@
 # See /LICENSE for more information.
 #
 
-define Profile/None
+define Profile/Broadcom-none
   NAME:=No WiFi
   PACKAGES:=-wpad-mini
 endef
 
 define Profile/None/Description
-	Package set without WiFi support
+	Package set without WiFi support and b44 Ethernet driver.
 endef
-$(eval $(call Profile,None))
+$(eval $(call Profile,Broadcom-none))
 
diff --git a/target/linux/brcm47xx/profiles/106-Atheros-ath5k.mk b/target/linux/brcm47xx/profiles/106-Atheros-ath5k.mk
deleted file mode 100644
index fe5a989a5d..0000000000
--- a/target/linux/brcm47xx/profiles/106-Atheros-ath5k.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/Atheros-ath5k
-  NAME:=Atheros WiFi (ath5k)
-  PACKAGES:=kmod-ath5k
-endef
-
-define Profile/Atheros-ath5k/Description
-	Package set compatible with hardware using Atheros WiFi cards
-endef
-$(eval $(call Profile,Atheros-ath5k))
-
diff --git a/target/linux/brcm47xx/profiles/110-Bcm4705-b43.mk b/target/linux/brcm47xx/profiles/110-Bcm4705-b43.mk
new file mode 100644
index 0000000000..f5bdaac50c
--- /dev/null
+++ b/target/linux/brcm47xx/profiles/110-Bcm4705-b43.mk
@@ -0,0 +1,19 @@
+#
+# 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 kmod-ssb-gige
+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/115-Bcm4705-none.mk b/target/linux/brcm47xx/profiles/115-Bcm4705-none.mk
new file mode 100644
index 0000000000..5b03f2c5ec
--- /dev/null
+++ b/target/linux/brcm47xx/profiles/115-Bcm4705-none.mk
@@ -0,0 +1,17 @@
+#
+# 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 kmod-ssb-gige
+endef
+
+define Profile/None/Description
+	Package set without WiFi support and tg3 Ethernet driver.
+endef
+$(eval $(call Profile,Bcm4705-none))
+