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

3 files changed, 47 insertions, 52 deletions

diff --git a/target/linux/config/Config.in.block b/target/linux/config/Config.in.block
index 0558f536a..ac8267663 100644
--- a/target/linux/config/Config.in.block
+++ b/target/linux/config/Config.in.block
@@ -2,56 +2,57 @@ menu "Block devices support"
 
 config ADK_KERNEL_MD
 	boolean
-	default n
 
 config ADK_KERNEL_SWAP
 	boolean
-	default n
 
 config ADK_KERNEL_LBD
 	boolean
-	default n
 
 config ADK_KERNEL_BLK_DEV_IO_TRACE
 	boolean
-	default n
 
 config ADK_KERNEL_LSF
 	boolean
-	default n
 
 config ADK_KERNEL_IOSCHED_AS
 	boolean
-	default n
 
 config ADK_KERNEL_IOSCHED_DEADLINE
 	boolean
-	default n
 
 config ADK_KERNEL_IOSCHED_CFQ
 	boolean
-	default n
 
 config ADK_KERNEL_SCSI
 	boolean
-	default n
 
 config ADK_KERNEL_BLK_DEV_SD
 	boolean
-	default n
 
 config ADK_KERNEL_DM_CRYPT
 	boolean
-	default n
 
 config ADK_KERNEL_BLK_DEV_DM
+	boolean
 	select ADK_KERNEL_MD
 	depends on !ADK_LINUX_CRIS_FOXBOARD
-	boolean
-	default n
 
 config ADK_KERNEL_ATA
 	boolean
+
+config ADK_KERNEL_ATA_SFF
+	boolean
+
+config ADK_KERNEL_ATA_PIIX
+	boolean
+	select ADK_KERNEL_BLOCK
+	select ADK_KERNEL_ATA
+	select ADK_KERNEL_ATA_SFF
+	select ADK_KERNEL_BLK_DEV_SD
+	default y if ADK_HARDWARE_IBMX40
+	default y if ADK_HARDWARE_QEMU_X86
+	default y if ADK_HARDWARE_QEMU_X86_64
 	default n
 
 config ADK_KERNEL_SATA_AHCI
@@ -143,6 +144,7 @@ config ADK_KPACKAGE_KMOD_SCSI
 	select ADK_KERNEL_IOSCHED_AS
 	depends on !ADK_KERNEL_SCSI
 	depends on !ADK_KERNEL_SATA_AHCI
+	depends on !ADK_KERNEL_ATA_PIIX
 	tristate
 	help
 	  If you want to use a SCSI hard disk, SCSI tape drive, SCSI CD-ROM or
diff --git a/target/linux/config/Config.in.input b/target/linux/config/Config.in.input
index c320c43a7..0d4f7fcbc 100644
--- a/target/linux/config/Config.in.input
+++ b/target/linux/config/Config.in.input
@@ -2,19 +2,35 @@ menu "Input devices"
 depends on ADK_TARGET_WITH_USB || ADK_TARGET_WITH_INPUT
 
 config ADK_KERNEL_INPUT
-	bool
+	boolean
+	default y if ADK_HARDWARE_IBMX40
+	default y if ADK_HARDWARE_SHUTTLE
 	default n
 
 config ADK_KERNEL_INPUT_KEYBOARD
-	bool
+	boolean
+	default y if ADK_HARDWARE_IBMX40
+	default y if ADK_HARDWARE_SHUTTLE
+	default n
+
+config ADK_KERNEL_KEYBOARD_ATKBD
+	boolean
+	default y if ADK_HARDWARE_IBMX40
+	default y if ADK_HARDWARE_SHUTTLE
+	default n
+
+config ADK_KERNEL_INPUT_MOUSEDEV
+	boolean
+	default y if ADK_HARDWARE_IBMX40
+	default y if ADK_HARDWARE_SHUTTLE
 	default n
 
 config ADK_KERNEL_HID_SUPPORT
-	bool
+	boolean
 	default n
 
 config ADK_KERNEL_HID
-	bool
+	boolean
 	select ADK_KERNEL_HID_SUPPORT
 	default n
 
@@ -37,14 +53,14 @@ config ADK_KPACKAGE_KMOD_KEYBOARD_ATKBD
 
 config ADK_KPACKAGE_KMOD_INPUT_MOUSEDEV
 	prompt "kmod-input-mouse................. Mouse support (PS/2)"
-	select ADK_KERNEL_INPUT
 	tristate
+	select ADK_KERNEL_INPUT
 	default n
 
 config ADK_KPACKAGE_KMOD_INPUT_EVDEV
 	prompt "kmod-input-evdev................. Event support"
-	select ADK_KERNEL_INPUT
 	tristate
+	select ADK_KERNEL_INPUT
 	default n
 
 endmenu
diff --git a/target/linux/config/Config.in.netdevice b/target/linux/config/Config.in.netdevice
index a5aea22e0..fcaefbf48 100644
--- a/target/linux/config/Config.in.netdevice
+++ b/target/linux/config/Config.in.netdevice
@@ -79,6 +79,8 @@ config ADK_KPACKAGE_KMOD_E1000
 	select ADK_KERNEL_NET_ETHERNET
 	select ADK_KERNEL_NETDEV_1000
 	default y if ADK_HARDWARE_IBMX40
+	default y if ADK_HARDWARE_QEMU_X86
+	default y if ADK_HARDWARE_QEMU_X86_64
 	default n
 	help
 	  This driver supports Intel(R) PRO/1000 gigabit ethernet family of
@@ -137,18 +139,6 @@ config ADK_KERNEL_ATH_COMMON
 config ADK_KPACKAGE_KMOD_P54_COMMON
 	tristate
 
-config ADK_MOD_KERNEL_MAC80211
-	tristate
-	select ADK_MOD_KERNEL_CFG80211
-	select ADK_MOD_KERNEL_LIB80211
-	select ADK_KPACKAGE_KMOD_CRYPTO_AES
-	select ADK_KPACKAGE_KMOD_CRYPTO_ECB
-	select ADK_KPACKAGE_KMOD_CRYPTO_ARC4
-	select ADK_KERNEL_CRC32
-	select ADK_KERNEL_WIRELESS
-	select ADK_KERNEL_WLAN_80211
-	default n
-
 config ADK_KERNEL_MAC80211_DEBUG_MENU
 	boolean
 
@@ -159,39 +149,31 @@ config ADK_KERNEL_MAC80211_VERBOSE_DEBUG
 config ADK_KERNEL_MAC80211_DEBUGFS
 	boolean
 
-menu "Wireless card support"
-depends on ADK_TARGET_WITH_MINIPCI || ADK_TARGET_WITH_PCI || ADK_TARGET_WITH_USB || ADK_TARGET_WITH_SSB
-
 config ADK_KPACKAGE_KMOD_MAC80211
-	prompt "kmod-mac80211.................. mac80211 softmac"
 	tristate
+	select ADK_KERNEL_WIRELESS
+	select ADK_KERNEL_WLAN_80211
 	select ADK_MOD_KERNEL_CFG80211
 	select ADK_MOD_KERNEL_LIB80211
 	select ADK_KPACKAGE_KMOD_CRYPTO_AES
 	select ADK_KPACKAGE_KMOD_CRYPTO_ECB
 	select ADK_KPACKAGE_KMOD_CRYPTO_ARC4
-	select ADK_KERNEL_WIRELESS
-	select ADK_KERNEL_WLAN_80211
-	select ADK_KERNEL_CRC32
-	default y if ADK_HARDWARE_IBMX40
-	default n
 
 config ADK_DEBUG_MAC80211
 	boolean
-	prompt "enable verbose debugging messages in mac80211"
 	select ADK_KERNEL_MAC80211_VERBOSE_DEBUG
 	select ADK_KERNEL_MAC80211_DEBUGFS
 	select ADK_KERNEL_DEBUG_FS
-	depends on ADK_KPACKAGE_KMOD_MAC80211
-	default n
-	help
+
+menu "Wireless card support"
+depends on ADK_TARGET_WITH_MINIPCI || ADK_TARGET_WITH_PCI || ADK_TARGET_WITH_USB || ADK_TARGET_WITH_SSB
 
 config ADK_KPACKAGE_KMOD_ATH5K
 	prompt "kmod-ath5k................... Atheros 5xxx wireless cards"
 	tristate
 	select ADK_KERNEL_MAC80211_LEDS
 	select ADK_KERNEL_ATH_COMMON
-	depends on ADK_KPACKAGE_KMOD_MAC80211
+	select ADK_KPACKAGE_KMOD_MAC80211
 	depends on ADK_TARGET_WITH_MINIPCI || ADK_TARGET_WITH_PCI
 	default y if ADK_HARDWARE_IBMX40
 	default n
@@ -201,7 +183,7 @@ config ADK_KPACKAGE_KMOD_ATH5K
 config ADK_KERNEL_ATH5K_DEBUG
 	prompt "enable debugging info via debugfs"
 	boolean
-	select ADK_KERNEL_DEBUG_FS
+	select ADK_DEBUG_MAC80211
 	depends on ADK_KPACKAGE_KMOD_ATH5K
 	default n
 	help
@@ -220,7 +202,6 @@ config ADK_KPACKAGE_KMOD_B43
 	prompt "kmod-b43..................... Broadcom B43xx wireless cards"
 	tristate
 	select ADK_KPACKAGE_KMOD_FW_LOADER
-	depends on ADK_KPACKAGE_KMOD_MAC80211
 	depends on ADK_TARGET_WITH_SSB || ADK_TARGET_WITH_MINIPCI
 	default n
 	help
@@ -229,7 +210,6 @@ config ADK_KPACKAGE_KMOD_B43
 config ADK_KPACKAGE_KMOD_RTL8187
 	prompt "kmod-rtl8187................. Realtek RTL8187/RTL8187B wireless cards"
 	tristate
-	depends on ADK_KPACKAGE_KMOD_MAC80211
 	default n
 	help
 	  Driver for Realtek RTL8187/RTL8187B wireless chips.
@@ -240,7 +220,6 @@ config ADK_KPACKAGE_KMOD_P54_USB
 	select ADK_KPACKAGE_KMOD_P54_COMMON
 	select ADK_KPACKAGE_KMOD_FW_LOADER
 	select ADK_PACKAGE_P54_FIRMWARE
-	depends on ADK_KPACKAGE_KMOD_MAC80211
 	depends on ADK_PACKAGE_KMOD_USB_CONTROLLER
 	default n
 	help
@@ -251,7 +230,6 @@ config ADK_KPACKAGE_KMOD_RT2400PCI
 	tristate
 	select ADK_KERNEL_RT2X00
 	select ADK_KERNEL_MAC80211_LEDS
-	depends on ADK_KPACKAGE_KMOD_MAC80211
 	depends on ADK_TARGET_WITH_MINIPCI || ADK_TARGET_WITH_PCI
 	default n
 	help
@@ -263,7 +241,6 @@ config ADK_KPACKAGE_KMOD_RT2500PCI
 	tristate
 	select ADK_KERNEL_RT2X00
 	select ADK_KERNEL_MAC80211_LEDS
-	depends on ADK_KPACKAGE_KMOD_MAC80211
 	depends on ADK_TARGET_WITH_MINIPCI || ADK_TARGET_WITH_PCI
 	default n
 	help
@@ -277,7 +254,6 @@ config ADK_KPACKAGE_KMOD_RT61PCI
 	select ADK_KERNEL_MAC80211_LEDS
 	select ADK_KPACKAGE_KMOD_CRC_ITU_T
 	select ADK_PACKAGE_RT61_FIRMWARE
-	depends on ADK_KPACKAGE_KMOD_MAC80211
 	depends on ADK_TARGET_WITH_MINIPCI || ADK_TARGET_WITH_PCI
 	default n
 	help
@@ -287,6 +263,7 @@ config ADK_KPACKAGE_KMOD_RT61PCI
 config ADK_KERNEL_RT2X00_DEBUG
 	prompt "enable debugging info"
 	boolean
+	select ADK_DEBUG_MAC80211
 	depends on ADK_KPACKAGE_KMOD_RT61PCI || \
 		ADK_KPACKAGE_KMOD_RT2500PCI || \
 		ADK_KPACKAGE_KMOD_RT2400PCI