Merge trunk into realtek-unstable

Conflicts:
	Config.in
	feeds.conf.default
	package/base-files/files/etc/hotplug2-common.rules
	package/network/config/netifd/files/etc/init.d/network

7 files changed, 101 insertions, 5 deletions

diff --git a/target/linux/ramips/rt305x/profiles/allnet.mk b/target/linux/ramips/rt305x/profiles/allnet.mk
index 35f6332d2..858891f4d 100644
--- a/target/linux/ramips/rt305x/profiles/allnet.mk
+++ b/target/linux/ramips/rt305x/profiles/allnet.mk
@@ -31,7 +31,8 @@ $(eval $(call Profile,ALL0256N))
 
 define Profile/ALL5002
 	NAME:=Allnet ALL5002
-	PACKAGES:=kmod-usb-core kmod-usb-ohci kmod-usb2 kmod-ledtrig-usbdev
+	PACKAGES:=kmod-usb-core kmod-usb-ohci kmod-usb2 kmod-ledtrig-usbdev \
+	kmod-i2c-core kmod-i2c-gpio kmod-hwmon-lm92 kmod-gpio-pcf857x
 endef
 
 define Profile/ALL5002/Description
@@ -39,3 +40,15 @@ define Profile/ALL5002/Description
 endef
 
 $(eval $(call Profile,ALL5002))
+
+define Profile/ALL5003
+	NAME:=Allnet ALL5003
+	PACKAGES:=kmod-usb-core kmod-usb-ohci kmod-usb2 kmod-ledtrig-usbdev \
+	kmod-i2c-core kmod-i2c-gpio kmod-hwmon-lm92 kmod-gpio-pcf857x
+endef
+
+define Profile/ALL5003/Description
+	Package set for Allnet ALL5003
+endef
+
+$(eval $(call Profile,ALL5003))
diff --git a/target/linux/ramips/rt305x/profiles/alpha.mk b/target/linux/ramips/rt305x/profiles/alpha.mk
new file mode 100644
index 000000000..a537509a9
--- /dev/null
+++ b/target/linux/ramips/rt305x/profiles/alpha.mk
@@ -0,0 +1,19 @@
+#
+# Copyright (C) 2013 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+define Profile/ASL26555
+	NAME:=Alpha ASL26555
+	PACKAGES:=\
+		kmod-usb-core kmod-usb-rt305x-dwc_otg \
+		kmod-ledtrig-usbdev
+endef
+
+define Profile/ASL26555/Description
+	Package set for Alpha ASL26555
+endef
+
+$(eval $(call Profile,ASL26555))
diff --git a/target/linux/ramips/rt305x/profiles/broadway.mk b/target/linux/ramips/rt305x/profiles/broadway.mk
new file mode 100644
index 000000000..8e994bdb8
--- /dev/null
+++ b/target/linux/ramips/rt305x/profiles/broadway.mk
@@ -0,0 +1,19 @@
+#
+# Copyright (C) 2012 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+define Profile/BROADWAY
+	NAME:=Hauppauge Broadway
+	PACKAGES:=\
+		kmod-usb-core kmod-usb-rt305x-dwc_otg \
+		kmod-ledtrig-usbdev restorefactory
+endef
+
+define Profile/BROADWAY/Description
+	Package set for Hauppauge Broadway
+endef
+
+$(eval $(call Profile,BROADWAY))
diff --git a/target/linux/ramips/rt305x/profiles/dlink.mk b/target/linux/ramips/rt305x/profiles/dlink.mk
new file mode 100644
index 000000000..29d8b7c38
--- /dev/null
+++ b/target/linux/ramips/rt305x/profiles/dlink.mk
@@ -0,0 +1,20 @@
+#
+# Copyright (C) 2013 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+define Profile/DIR615H1
+	NAME:=Dlink DIR-615 H1
+        PACKAGES:=\
+                -kmod-usb-core -kmod-usb-rt305x-dwc_otg \
+                -kmod-ledtrig-usbdev
+endef
+
+define Profile/DIR615H1/Description
+	Package set for Dlink DIR-615 H1 board
+endef
+
+$(eval $(call Profile,DIR615H1))
+
diff --git a/target/linux/ramips/rt305x/profiles/freestation5.mk b/target/linux/ramips/rt305x/profiles/freestation5.mk
index 6da1e68c2..a3c105b95 100644
--- a/target/linux/ramips/rt305x/profiles/freestation5.mk
+++ b/target/linux/ramips/rt305x/profiles/freestation5.mk
@@ -12,7 +12,7 @@ define Profile/FREESTATION5
 endef
 
 define Profile/FREESTATION5/Description
-	Package set for ARC Flex FreeStation5
+	Package set for ARC FreeStation, Flex mARC, iFlex, and SplitStation
 endef
 
 $(eval $(call Profile,FREESTATION5))
diff --git a/target/linux/ramips/rt305x/profiles/tenda.mk b/target/linux/ramips/rt305x/profiles/tenda.mk
index 5e45b5f91..10a4cb307 100644
--- a/target/linux/ramips/rt305x/profiles/tenda.mk
+++ b/target/linux/ramips/rt305x/profiles/tenda.mk
@@ -5,6 +5,19 @@
 # See /LICENSE for more information.
 #
 
+define Profile/3G300M
+	NAME:=Tenda 3G300M
+	PACKAGES:=\
+		kmod-usb-core kmod-usb-rt305x-dwc_otg \
+		kmod-ledtrig-usbdev
+endef
+
+define Profile/3G300M/Description
+	Package set for Tenda 3G300M board
+endef
+
+$(eval $(call Profile,3G300M))
+
 define Profile/W306R_V20
 	NAME:=Tenda W306R V2.0
 	PACKAGES:=
diff --git a/target/linux/ramips/rt305x/profiles/upvel.mk b/target/linux/ramips/rt305x/profiles/upvel.mk
index fa1c9936d..3910c8f16 100644
--- a/target/linux/ramips/rt305x/profiles/upvel.mk
+++ b/target/linux/ramips/rt305x/profiles/upvel.mk
@@ -5,14 +5,26 @@
 # See /LICENSE for more information.
 #
 
-define Profile/UPVEL
+define Profile/UR-336UN
 	NAME:=UPVEL UR-336UN
 	PACKAGES:=\
 		kmod-usb-core kmod-usb-rt305x-dwc_otg \
 		kmod-ledtrig-usbdev
 endef
 
-define Profile/UPVEL/Description
+define Profile/UR-336UN/Description
 	Default package set compatible with URVEL router board.
 endef
-$(eval $(call Profile,UPVEL))
+$(eval $(call Profile,UR-336UN))
+
+define Profile/UR-326N4G
+	NAME:=UPVEL UR-326N4G
+	PACKAGES:=\
+		kmod-usb-core kmod-usb-rt305x-dwc_otg \
+		kmod-ledtrig-usbdev
+endef
+
+define Profile/UR-326N4G/Description
+	Default package set compatible with URVEL router board.
+endef
+$(eval $(call Profile,UR-326N4G))