Merge branch 'master' of git+ssh://openadk.org/git/openadk

2 files changed, 52 insertions, 0 deletions

diff --git a/target/linux/config/Config.in.input b/target/linux/config/Config.in.input
index 51d25c4ac..c2516c27d 100644
--- a/target/linux/config/Config.in.input
+++ b/target/linux/config/Config.in.input
@@ -107,6 +107,7 @@ config ADK_KERNEL_INPUT_MOUSE
 	default y if ADK_TARGET_SYSTEM_LEMOTE_YEELONG
 	default y if ADK_TARGET_SYSTEM_SHUTTLE_SA76
 	default y if ADK_TARGET_SYSTEM_SHARP_ZAURUS
+	default y if ADK_TARGET_SYSTEM_RASPBERRY_PI
 	default n
 
 config ADK_KERNEL_INPUT_MOUSEDEV
@@ -142,6 +143,7 @@ config ADK_KPACKAGE_KMOD_USB_HID
 	select ADK_KERNEL_HID
 	select ADK_KERNEL_INPUT_KEYBOARD
 	select ADK_KERNEL_INPUT_MOUSEDEV
+	select ADK_KERNEL_INPUT_MOUSE
 	depends on ADK_PACKAGE_KMOD_USB_CONTROLLER
         depends on !ADK_TARGET_SYSTEM_FOXBOARD_LX
 	depends on ADK_TARGET_WITH_USB
@@ -155,6 +157,7 @@ config ADK_KPACKAGE_KMOD_KEYBOARD_ATKBD
 	select ADK_KERNEL_INPUT
 	select ADK_KERNEL_INPUT_KEYBOARD
 	depends on !ADK_KERNEL_KEYBOARD_ATKBD
+	depends on !ADK_TARGET_SYSTEM_RASPBERRY_PI
 	default n
 
 config ADK_KPACKAGE_KMOD_INPUT_MOUSEDEV
@@ -169,6 +172,7 @@ config ADK_KPACKAGE_KMOD_INPUT_EVDEV
 	tristate
 	select ADK_KERNEL_INPUT
 	depends on !ADK_KERNEL_INPUT_EVDEV
+	default y if ADK_TARGET_SYSTEM_RASPBERRY_PI
 	default n
 
 endmenu
diff --git a/target/linux/config/Config.in.netdevice b/target/linux/config/Config.in.netdevice
index 2d5c8e3c7..b2eb73b57 100644
--- a/target/linux/config/Config.in.netdevice
+++ b/target/linux/config/Config.in.netdevice
@@ -313,12 +313,30 @@ config ADK_KERNEL_WLAN_80211
 config ADK_KPACKAGE_KMOD_RT2X00
 	tristate
 
+config ADK_KPACKAGE_KMOD_RT2X00_LIB_USB
+	tristate
+
+config ADK_KPACKAGE_KMOD_RT2X00_LIB_PCI
+	tristate
+
 config ADK_KERNEL_RT2X00
 	boolean
 	select ADK_KPACKAGE_KMOD_RT2X00
 	select ADK_KPACKAGE_KMOD_FW_LOADER
 	select ADK_KPACKAGE_KMOD_EEPROM_93CX6
 
+config ADK_KERNEL_RT2800USB_RT3573
+	boolean
+
+config ADK_KERNEL_RT2800USB_RT53XX
+	boolean
+
+config ADK_KERNEL_RT2800USB_RT55XX
+	boolean
+
+config ADK_KERNEL_RT2800USB_UNKNOWN
+	boolean
+
 config ADK_KERNEL_MOD_CFG80211
 	tristate
 
@@ -465,10 +483,38 @@ config ADK_KPACKAGE_KMOD_P54_USB
 	help
 	  Driver for Prism54 USB adaptors.
 
+config ADK_KPACKAGE_KMOD_RT2800USB
+	prompt "kmod-rt2800-usb.............. Ralink rt2800 USB"
+	tristate
+	select ADK_KERNEL_RT2X00
+	select ADK_KERNEL_RT2800USB_RT3573
+	select ADK_KERNEL_RT2800USB_RT53XX
+	select ADK_KERNEL_RT2800USB_RT55XX
+	select ADK_KERNEL_RT2800USB_UNKNOWN
+	select ADK_KPACKAGE_KMOD_RT2X00_LIB_USB
+	select ADK_KPACKAGE_KMOD_MAC80211
+	select ADK_KPACKAGE_KMOD_CRC_CCITT
+	depends on ADK_PACKAGE_KMOD_USB_CONTROLLER
+	default n
+	help
+	  Driver for Ralink RT2800 USB.
+
+config ADK_KPACKAGE_KMOD_RTL8192CU
+	prompt "kmod-rtl8192cu............... Realtek RTL8192CU USB"
+	tristate
+	select ADK_KPACKAGE_KMOD_MAC80211
+	select ADK_KERNEL_CFG80211_WEXT
+	select ADK_KERNEL_WIRELESS_EXT
+	depends on ADK_PACKAGE_KMOD_USB_CONTROLLER
+	default n
+	help
+	  Driver for Realtek RTL8192CU USB
+
 config ADK_KPACKAGE_KMOD_RT2400PCI
 	prompt "kmod-rt2400pci............... Ralink rt2400"
 	tristate
 	select ADK_KERNEL_RT2X00
+	select ADK_KPACKAGE_KMOD_RT2X00_LIB_PCI
 	select ADK_KPACKAGE_KMOD_MAC80211
 	select ADK_KERNEL_MAC80211_LEDS
 	depends on ADK_TARGET_WITH_MINIPCI || ADK_TARGET_WITH_PCI
@@ -481,6 +527,7 @@ config ADK_KPACKAGE_KMOD_RT2500PCI
 	prompt "kmod-rt2500pci............... Ralink rt2500"
 	tristate
 	select ADK_KERNEL_RT2X00
+	select ADK_KPACKAGE_KMOD_RT2X00_LIB_PCI
 	select ADK_KPACKAGE_KMOD_MAC80211
 	select ADK_KERNEL_MAC80211_LEDS
 	depends on ADK_TARGET_WITH_MINIPCI || ADK_TARGET_WITH_PCI
@@ -493,6 +540,7 @@ config ADK_KPACKAGE_KMOD_RT61PCI
 	prompt "kmod-rt61pci................. Ralink rt2501/rt61"
 	tristate
 	select ADK_KERNEL_RT2X00
+	select ADK_KPACKAGE_KMOD_RT2X00_LIB_PCI
 	select ADK_KPACKAGE_KMOD_MAC80211
 	select ADK_KERNEL_MAC80211_LEDS
 	select ADK_KPACKAGE_KMOD_CRC_ITU_T