From: Florian Fainelli <florian@openwrt.org>
Date: Sat, 30 May 2009 08:58:18 +0000 (+0000)
Subject: merge r16201 to 8.09
X-Git-Tag: 8.09.1~9
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=523b80710fec56a6678390d745556e2a1039ca3a;p=openwrt%2Fsvn-archive%2Fopenwrt.git

merge r16201 to 8.09

SVN-Revision: 16202
---

diff --git a/target/linux/ar7/Makefile b/target/linux/ar7/Makefile
index a6ffd49398..3c19000aeb 100644
--- a/target/linux/ar7/Makefile
+++ b/target/linux/ar7/Makefile
@@ -1,5 +1,5 @@
  
-# Copyright (C) 2006 OpenWrt.org
+# Copyright (C) 2006-2009 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -16,10 +16,10 @@ LINUX_VERSION:=2.6.26.8
 include $(INCLUDE_DIR)/target.mk
 
 DEFAULT_PACKAGES+= kmod-pppoa ppp-mod-pppoa linux-atm atm-tools br2684ctl \
-		kmod-acx kmod-sangam-atm-annex-a kmod-sangam-atm-annex-b
+		kmod-acx
 
 define Target/Description
-	Build firmware images for TI AR7 based routers
+	Build firmware images for TI AR7 based routers.
 endef
 
 $(eval $(call BuildTarget))
diff --git a/target/linux/ar7/profiles/100-Annex-A.mk b/target/linux/ar7/profiles/100-Annex-A.mk
new file mode 100644
index 0000000000..3d74b5d7de
--- /dev/null
+++ b/target/linux/ar7/profiles/100-Annex-A.mk
@@ -0,0 +1,17 @@
+#
+# Copyright (C) 2009 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+define Profile/Annex-A
+  NAME:=Annex-A DSL firmware (default)
+  PACKAGES:=kmod-sangam-atm-annex-a
+endef
+
+define Profile/Annex-A/Description
+	Package set compatible with Annex-A DSL lines (most countries).
+endef
+$(eval $(call Profile,Annex-A))
+
diff --git a/target/linux/ar7/profiles/100-Texas.mk b/target/linux/ar7/profiles/100-Texas.mk
index 267795f692..e69de29bb2 100644
--- a/target/linux/ar7/profiles/100-Texas.mk
+++ b/target/linux/ar7/profiles/100-Texas.mk
@@ -1,17 +0,0 @@
-#
-# Copyright (C) 2006 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-define Profile/Texas
-  NAME:=Texas Instruments WiFi (default)
-  PACKAGES:=kmod-acx-mac80211
-endef
-
-define Profile/Texas/Description
-	Package set compatible with hardware using Texas Instruments WiFi cards
-endef
-$(eval $(call Profile,Texas))
-
diff --git a/target/linux/ar7/profiles/110-Annex-B.mk b/target/linux/ar7/profiles/110-Annex-B.mk
new file mode 100644
index 0000000000..66692e7966
--- /dev/null
+++ b/target/linux/ar7/profiles/110-Annex-B.mk
@@ -0,0 +1,17 @@
+#
+# Copyright (C) 2009 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+define Profile/Annex-B
+  NAME:=Annex-B DSL firmware
+  PACKAGES:=kmod-sangam-atm-annex-b
+endef
+
+define Profile/Annex-B/Description
+	Package set compatible with Annex-B DSL lines (Germany).
+endef
+$(eval $(call Profile,Annex-B))
+
diff --git a/target/linux/ar7/profiles/110-None.mk b/target/linux/ar7/profiles/110-None.mk
index 2fcfacde9f..e69de29bb2 100644
--- a/target/linux/ar7/profiles/110-None.mk
+++ b/target/linux/ar7/profiles/110-None.mk
@@ -1,17 +0,0 @@
-#
-# 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))
-
diff --git a/target/linux/ar7/profiles/200-Texas.mk b/target/linux/ar7/profiles/200-Texas.mk
new file mode 100644
index 0000000000..7d868bdb08
--- /dev/null
+++ b/target/linux/ar7/profiles/200-Texas.mk
@@ -0,0 +1,18 @@
+#
+# Copyright (C) 2006-2009 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+define Profile/Texas
+  NAME:=Texas Instruments WiFi (mac80211)
+  PACKAGES:=kmod-acx-mac80211
+endef
+
+define Profile/Texas/Description
+	Package set compatible with hardware using Texas Instruments WiFi cards
+	using the mac80211 driver.
+endef
+$(eval $(call Profile,Texas))
+
diff --git a/target/linux/ar7/profiles/210-None.mk b/target/linux/ar7/profiles/210-None.mk
new file mode 100644
index 0000000000..2fcfacde9f
--- /dev/null
+++ b/target/linux/ar7/profiles/210-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))
+