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

14 files changed, 132 insertions, 116 deletions

diff --git a/target/linux/config/Config.in.audio b/target/linux/config/Config.in.audio
index dc2ff100f..8a4198aee 100644
--- a/target/linux/config/Config.in.audio
+++ b/target/linux/config/Config.in.audio
@@ -4,10 +4,10 @@ depends on ADK_TARGET_WITH_PCI || ADK_TARGET_WITH_USB || ADK_TARGET_WITH_SOUND
 config ADK_KERNEL_SND_ARM
 	boolean
 
-config ADK_KERNEL_SND_USB
+config ADK_KERNEL_SND_PCI
 	boolean
 
-config ADK_KERNEL_SND_SOC
+config ADK_KERNEL_SND_USB
 	boolean
 
 config ADK_KERNEL_SND_PXA2XX_AC97
@@ -39,7 +39,6 @@ config ADK_KPACKAGE_KMOD_SND_RAWMIDI
 
 config ADK_KPACKAGE_KMOD_SND_AC97_CODEC
 	tristate
-	depends on ADK_TARGET_WITH_PCI || ADK_TARGET_WITH_SOUND
 
 config ADK_KPACKAGE_KMOD_SND
 	prompt "kmod-snd...................... ALSA sound support"
@@ -60,7 +59,6 @@ config ADK_KPACKAGE_KMOD_SND_OSSEMUL
 	select ADK_KERNEL_SND_PCM_OSS
 	select ADK_KPACKAGE_KMOD_SND
 	default y if ADK_TARGET_SYSTEM_IBM_X40
-	default y if ADK_NATIVE_SYSTEM_IBM_X40
 	default n
 	help
 	 ALSA OSS Emulation
@@ -71,7 +69,6 @@ config ADK_KPACKAGE_KMOD_SND_INTEL8X0
 	select ADK_KPACKAGE_KMOD_SND_AC97_CODEC
 	select ADK_KPACKAGE_KMOD_SND
 	default y if ADK_TARGET_SYSTEM_IBM_X40
-	default y if ADK_NATIVE_SYSTEM_IBM_X40
 	default n
 	depends on ADK_TARGET_WITH_PCI
 	help
@@ -98,6 +95,7 @@ config ADK_KPACKAGE_KMOD_SND_ENS1370
 config ADK_KPACKAGE_KMOD_SND_CS5535AUDIO
 	prompt "kmod-snd-cs5535audio.......... ALSA AMD CS5535 driver"
 	tristate
+	select ADK_KERNEL_SND_PCI
 	select ADK_KPACKAGE_KMOD_SND_AC97_CODEC
 	select ADK_KPACKAGE_KMOD_SND
 	default y if ADK_TARGET_SYSTEM_LEMOTE_YEELONG
@@ -107,6 +105,10 @@ config ADK_KPACKAGE_KMOD_SND_CS5535AUDIO
 	help
 	 ALSA AMD CS5535 driver
 
+config ADK_KPACKAGE_KMOD_SND_SOC
+	tristate
+	default n
+
 config ADK_KERNEL_SND_PXA2XX_SOC
 	tristate
 	default n
@@ -115,10 +117,10 @@ config ADK_KPACKAGE_KMOD_SND_PXA2XX_SOC_SPITZ
 	prompt "kmod-snd-pxa2xx-soc-spitz..... ALSA SOC Sharp Zaurus"
 	tristate
 	select ADK_KERNEL_SND_ARM
-	select ADK_KERNEL_SND_SOC
 	select ADK_KERNEL_SND_PXA2XX_AC97
-	select ADK_KPACKAGE_KMOD_SND_AC97_CODEC
 	select ADK_KPACKAGE_KMOD_SND
+	select ADK_KPACKAGE_KMOD_SND_AC97_CODEC
+	select ADK_KPACKAGE_KMOD_SND_SOC
 	select ADK_KERNEL_SND_PXA2XX_SOC
 	depends on ADK_TARGET_SYSTEM_SHARP_ZAURUS
 	default y if ADK_TARGET_SYSTEM_SHARP_ZAURUS
@@ -133,4 +135,26 @@ config ADK_KPACKAGE_KMOD_SND_BCM2835
 	default y if ADK_TARGET_SYSTEM_RASPBERRY_PI
 	default n
 
+config ADK_KPACKAGE_KMOD_SND_BCM2708_SOC_I2S
+	prompt "kmod-snd-bcm2708-soc-i2s........ ALSA SOC I2S Raspberry PI"
+	select ADK_KPACKAGE_KMOD_SND
+	select ADK_KERNEL_SND_ARM
+	select ADK_KPACKAGE_KMOD_SND_SOC
+	boolean
+	default n
+
+config ADK_KPACKAGE_KMOD_SND_BCM2708_SOC_HIFIBERRY_DAC
+	prompt "kmod-snd-bcm2708-hifiberry-dac.... ALSA for Raspberry PI with hifiberry DAC"
+	tristate
+	select ADK_KPACKAGE_KMOD_SND_BCM2708_SOC_I2S
+	depends on ADK_TARGET_SYSTEM_RASPBERRY_PI
+	default n
+
+config ADK_KPACKAGE_KMOD_SND_BCM2708_SOC_HIFIBERRY_DIGI
+	prompt "kmod-snd-bcm2708-hifiberry-digi... ALSA for Raspberry PI with hifiberry DIGI"
+	tristate
+	select ADK_KPACKAGE_KMOD_SND_BCM2708_SOC_I2S
+	depends on ADK_TARGET_SYSTEM_RASPBERRY_PI
+	default n
+
 endmenu
diff --git a/target/linux/config/Config.in.block b/target/linux/config/Config.in.block
index 057556afd..9297031c2 100644
--- a/target/linux/config/Config.in.block
+++ b/target/linux/config/Config.in.block
@@ -177,7 +177,6 @@ config ADK_KERNEL_SATA_AHCI
 	select ADK_KERNEL_BLK_DEV
 	select ADK_KERNEL_BLK_DEV_SD
 	depends on ADK_TARGET_WITH_SATA
-	default y if ADK_TARGET_SYSTEM_SHUTTLE_SA76
 	default y if ADK_TARGET_SYSTEM_VBOX_I686
 	default n	
 
@@ -191,8 +190,6 @@ config ADK_KPACKAGE_KMOD_SATA_AHCI
 	select ADK_KERNEL_BLK_DEV_SD
 	depends on !ADK_KERNEL_SATA_AHCI
 	depends on ADK_TARGET_WITH_SATA
-	default y if ADK_TARGET_SYSTEM_INTEL_ATOM
-	default y if ADK_NATIVE_SYSTEM_INTEL_ATOM
 	default n
 	help
 	  Enables support for AHCI Serial ATA.
diff --git a/target/linux/config/Config.in.cpu b/target/linux/config/Config.in.cpu
index efaf3a658..a8dfd5188 100644
--- a/target/linux/config/Config.in.cpu
+++ b/target/linux/config/Config.in.cpu
@@ -39,6 +39,14 @@ config ADK_KERNEL_CPU_FREQ
 	boolean
 	default n
 
+config ADK_KERNEL_REGULATOR
+	boolean
+	default n
+
+config ADK_KERNEL_REGULATOR_ANATOP
+	boolean
+	default n
+
 config ADK_KERNEL_CPU_FREQ_GOV_PERFORMANCE
 	boolean
 	default n
@@ -59,15 +67,25 @@ config ADK_KERNEL_CPU_FREQ_GOV_CONSERVATIVE
 	boolean
 	default n
 
+config ADK_KERNEL_ARM_IMX6_CPUFREQ
+	prompt "CPU frequency support for cubox-i"
+	boolean
+	select ADK_KERNEL_CPU_FREQ
+	select ADK_KERNEL_REGULATOR
+	select ADK_KERNEL_REGULATOR_ANATOP
+	default y if ADK_TARGET_SYSTEM_CUBOX_I
+	depends on ADK_TARGET_SYSTEM_CUBOX_I
+
 config ADK_KERNEL_ARM_BCM2835_CPUFREQ
-	prompt "CPU frequency support"
+	prompt "CPU frequency support for raspberry-pi"
 	boolean
 	select ADK_KERNEL_CPU_FREQ
 	default y if ADK_TARGET_SYSTEM_RASPBERRY_PI
+	depends on ADK_TARGET_SYSTEM_RASPBERRY_PI
 
 choice
 prompt "Governor"
-depends on ADK_KERNEL_ARM_BCM2835_CPUFREQ
+depends on ADK_KERNEL_ARM_BCM2835_CPUFREQ || ADK_KERNEL_ARM_IMX6_CPUFREQ
 
 config ADK_KERNEL_CPU_FREQ_DEFAULT_GOV_ONDEMAND
 	boolean "ondemand"
diff --git a/target/linux/config/Config.in.debug b/target/linux/config/Config.in.debug
index 6236b329b..80387c627 100644
--- a/target/linux/config/Config.in.debug
+++ b/target/linux/config/Config.in.debug
@@ -25,6 +25,35 @@ config ADK_QUIET_KERNEL
 	help
 	  Make bootup quiet without messages from the kernel.
 
+config ADK_KERNEL_EARLY_PRINTK
+	boolean
+	default n
+
+config ADK_KERNEL_PRINTK
+	prompt "Enable printk to save space and quieten bootup"
+	boolean
+	select ADK_KERNEL_EARLY_PRINTK
+	default y
+	depends on !ADK_PKG_TEST
+	help
+	  Disable printk to save space and quieten bootup.
+
+config ADK_KERNEL_PRINTK_TIME
+	prompt "Enable timing information for printk"
+	boolean
+	depends on ADK_KERNEL_PRINTK
+	default n
+	help
+	  Enable timing information for printk, to analyze kernel
+	  bootup performance.
+
+config ADK_KERNEL_BUG
+	prompt "Enable BUGS() in the kernel"
+	boolean
+	default n
+	help
+	  Enable if you need BUGS() in the kernel.
+
 config ADK_KERNEL_NETCONSOLE
 	prompt "Netconsole"
 	boolean
diff --git a/target/linux/config/Config.in.graphics b/target/linux/config/Config.in.graphics
index 477541478..dc748e6c0 100644
--- a/target/linux/config/Config.in.graphics
+++ b/target/linux/config/Config.in.graphics
@@ -2,16 +2,12 @@ config ADK_KERNEL_VT
 	boolean
 	default y if ADK_HARDWARE_VBOX
 	default y if ADK_TARGET_WITH_VGA
-	default y if ADK_NATIVE_SYSTEM_IBM_X40
-	default y if ADK_NATIVE_SYSTEM_INTEL_ATOM
 	default n
 
 config ADK_KERNEL_VT_CONSOLE
 	boolean
 	default y if ADK_HARDWARE_VBOX
 	default y if ADK_TARGET_WITH_VGA
-	default y if ADK_NATIVE_SYSTEM_IBM_X40
-	default y if ADK_NATIVE_SYSTEM_INTEL_ATOM
 	default n
 
 config ADK_KERNEL_VGA_CONSOLE
@@ -143,9 +139,8 @@ config ADK_HARDWARE_GRAPHICS_INTEL_I915
 	select ADK_KERNEL_DRM_I915_KMS
 	select ADK_KERNEL_DRM_I915
 	default y if ADK_TARGET_SYSTEM_IBM_X40
-	default y if ADK_NATIVE_SYSTEM_IBM_X40
 	default n
-	depends on ADK_TARGET_SYSTEM_IBM_X40 || ADK_NATIVE_SYSTEM_IBM_X40 || ADK_TARGET_SYSTEM_INTEL_ATOM || ADK_NATIVE_SYSTEM_INTEL_ATOM
+	depends on ADK_TARGET_SYSTEM_IBM_X40
 	help
           AGP/DRM/KMS support for Intel chipset i915.
 	
diff --git a/target/linux/config/Config.in.input b/target/linux/config/Config.in.input
index 939354881..5a01ee1e1 100644
--- a/target/linux/config/Config.in.input
+++ b/target/linux/config/Config.in.input
@@ -4,13 +4,15 @@ config ADK_KERNEL_INPUT
 	default y if ADK_TARGET_SYSTEM_VBOX_I686
 	default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX1C
 	default y if ADK_TARGET_SYSTEM_IBM_X40
-	default y if ADK_NATIVE_SYSTEM_IBM_X40
 	default y if ADK_TARGET_SYSTEM_LEMOTE_YEELONG
-	default y if ADK_NATIVE_SYSTEM_LEMOTE_YEELONG
 	default y if ADK_TARGET_SYSTEM_SHARP_ZAURUS
 	default y if ADK_TARGET_SYSTEM_RASPBERRY_PI
 	default n
 
+config ADK_KERNEL_USB_HID
+	boolean
+	default n
+
 config ADK_KERNEL_HID_LOGITECH
 	boolean
 	default n
@@ -61,9 +63,7 @@ config ADK_KERNEL_INPUT_KEYBOARD
 	default y if ADK_TARGET_SYSTEM_VBOX_I686
 	default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX1C
 	default y if ADK_TARGET_SYSTEM_IBM_X40
-	default y if ADK_NATIVE_SYSTEM_IBM_X40
 	default y if ADK_TARGET_SYSTEM_LEMOTE_YEELONG
-	default y if ADK_NATIVE_SYSTEM_LEMOTE_YEELONG
 	default y if ADK_TARGET_SYSTEM_SHARP_ZAURUS
 	default y if ADK_TARGET_SYSTEM_RASPBERRY_PI
 	default n
@@ -73,9 +73,7 @@ config ADK_KERNEL_KEYBOARD_ATKBD
 	default y if ADK_TARGET_SYSTEM_VBOX_I686
 	default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX1C
 	default y if ADK_TARGET_SYSTEM_IBM_X40
-	default y if ADK_NATIVE_SYSTEM_IBM_X40
 	default y if ADK_TARGET_SYSTEM_LEMOTE_YEELONG
-	default y if ADK_NATIVE_SYSTEM_LEMOTE_YEELONG
 	default n
 
 config ADK_KERNEL_INPUT_MOUSE
@@ -84,9 +82,7 @@ config ADK_KERNEL_INPUT_MOUSE
 	default y if ADK_TARGET_SYSTEM_VBOX_I686
 	default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX1C
 	default y if ADK_TARGET_SYSTEM_IBM_X40
-	default y if ADK_NATIVE_SYSTEM_IBM_X40
 	default y if ADK_TARGET_SYSTEM_LEMOTE_YEELONG
-	default y if ADK_NATIVE_SYSTEM_LEMOTE_YEELONG
 	default y if ADK_TARGET_SYSTEM_SHARP_ZAURUS
 	default y if ADK_TARGET_SYSTEM_RASPBERRY_PI
 	default n
@@ -96,9 +92,7 @@ config ADK_KERNEL_INPUT_MOUSEDEV
 	default y if ADK_TARGET_SYSTEM_VBOX_I686
 	default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX1C
 	default y if ADK_TARGET_SYSTEM_IBM_X40
-	default y if ADK_NATIVE_SYSTEM_IBM_X40
 	default y if ADK_TARGET_SYSTEM_LEMOTE_YEELONG
-	default y if ADK_NATIVE_SYSTEM_LEMOTE_YEELONG
 	default y if ADK_TARGET_SYSTEM_SHARP_ZAURUS
 	default y if ADK_TARGET_SYSTEM_RASPBERRY_PI
 	default n
@@ -123,6 +117,7 @@ depends on ADK_TARGET_WITH_USB || ADK_TARGET_WITH_INPUT || ADK_TARGET_WITH_TOUCH
 config ADK_KPACKAGE_KMOD_USB_HID
 	prompt "kmod-usb-hid..................... USB keyboard/mouse support"
 	tristate
+	depends on !ADK_KERNEL_USB_HID
 	select ADK_KERNEL_INPUT
 	select ADK_KERNEL_HID
 	select ADK_KERNEL_HID_GENERIC
@@ -132,8 +127,6 @@ config ADK_KPACKAGE_KMOD_USB_HID
 	depends on ADK_PACKAGE_KMOD_USB_CONTROLLER
 	depends on ADK_TARGET_WITH_USB
 	default y if ADK_TARGET_SYSTEM_RASPBERRY_PI
-	default y if ADK_TARGET_SYSTEM_QEMU_SH4 && ADK_TARGET_QEMU_WITH_GRAPHIC
-	default y if ADK_TARGET_SYSTEM_QEMU_SH4EB && ADK_TARGET_QEMU_WITH_GRAPHIC
 	default n
 
 config ADK_KERNEL_LOGITECH_DINOVO
diff --git a/target/linux/config/Config.in.misc b/target/linux/config/Config.in.misc
index ea9bc5e5a..64eb8d38b 100644
--- a/target/linux/config/Config.in.misc
+++ b/target/linux/config/Config.in.misc
@@ -57,11 +57,9 @@ config ADK_KERNEL_RTC_DRV_CMOS
 	default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX1C
 	default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX2D13
 	default y if ADK_TARGET_SYSTEM_IBM_X40
-	default y if ADK_NATIVE_SYSTEM_IBM_X40
-	default y if ADK_NATIVE_SYSTEM_LEMOTE_YEELONG
 	default y if ADK_TARGET_SYSTEM_LEMOTE_YEELONG
  	default n
-	depends on (ADK_TARGET_SYSTEM_PCENGINES_ALIX1C || ADK_TARGET_SYSTEM_PCENGINES_ALIX2D13 || ADK_TARGET_SYSTEM_IBM_X40 || ADK_NATIVE_SYSTEM_IBM_X40 || ADK_NATIVE_SYSTEM_LEMOTE_YEELONG || ADK_TARGET_SYSTEM_LEMOTE_YEELONG)
+	depends on (ADK_TARGET_SYSTEM_PCENGINES_ALIX1C || ADK_TARGET_SYSTEM_PCENGINES_ALIX2D13 || ADK_TARGET_SYSTEM_IBM_X40 || ADK_TARGET_SYSTEM_LEMOTE_YEELONG)
  	help
 	 PC CMOS RTC support.
 	
diff --git a/target/linux/config/Config.in.netdevice b/target/linux/config/Config.in.netdevice
index 001ecfd33..7aabc0b7e 100644
--- a/target/linux/config/Config.in.netdevice
+++ b/target/linux/config/Config.in.netdevice
@@ -68,17 +68,6 @@ config ADK_KERNEL_NATSEMI
 	default n
 	help
 
-config ADK_KERNEL_8139TOO
-	boolean
-	select ADK_KERNEL_NETDEVICES
-	select ADK_KERNEL_NET_ETHERNET
-	select ADK_KERNEL_NET_PCI
-	select ADK_KERNEL_MII
-	default y if ADK_TARGET_SYSTEM_LEMOTE_YEELONG
-	default n
-	help
-
-
 config ADK_KERNEL_VIA_RHINE
 	boolean
 	select ADK_KERNEL_NETDEVICES
@@ -357,7 +346,6 @@ config ADK_KPACKAGE_KMOD_ATH5K
 	select ADK_KPACKAGE_KMOD_MAC80211
 	depends on ADK_TARGET_WITH_MINIPCI || ADK_TARGET_WITH_PCI || ADK_TARGET_WITH_AHB
 	default y if ADK_TARGET_SYSTEM_IBM_X40
-	default y if ADK_NATIVE_SYSTEM_IBM_X40
 	default y if ADK_TARGET_SYSTEM_FON_FON2100
 	default n
 	help
diff --git a/target/linux/config/Config.in.netfilter.ip4 b/target/linux/config/Config.in.netfilter.ip4
index cf33c02a2..b43a566b9 100644
--- a/target/linux/config/Config.in.netfilter.ip4
+++ b/target/linux/config/Config.in.netfilter.ip4
@@ -37,9 +37,10 @@ config ADK_KPACKAGE_KMOD_IP_NF_FILTER
 config ADK_KPACKAGE_KMOD_FULL_NAT
 	tristate "Meta package for Full NAT"
 	select ADK_KPACKAGE_KMOD_NF_NAT if ADK_KERNEL_VERSION_3_4_82
+	select ADK_KPACKAGE_KMOD_NF_NAT_IPV4 if ADK_KERNEL_VERSION_3_10_30
 	select ADK_KPACKAGE_KMOD_NF_NAT_IPV4 if ADK_KERNEL_VERSION_3_11_10
-	select ADK_KPACKAGE_KMOD_NF_NAT_IPV4 if ADK_KERNEL_VERSION_3_12_11
-	select ADK_KPACKAGE_KMOD_NF_NAT_IPV4 if ADK_KERNEL_VERSION_3_13_5
+	select ADK_KPACKAGE_KMOD_NF_NAT_IPV4 if ADK_KERNEL_VERSION_3_12_13
+	select ADK_KPACKAGE_KMOD_NF_NAT_IPV4 if ADK_KERNEL_VERSION_3_13_6
 
 config ADK_KPACKAGE_KMOD_NF_NAT
 	tristate 'Full NAT'
@@ -53,8 +54,10 @@ config ADK_KPACKAGE_KMOD_NF_NAT
 config ADK_KPACKAGE_KMOD_NF_NAT_IPV4
 	tristate 'Full NAT'
 	depends on ADK_KPACKAGE_KMOD_IP_NF_IPTABLES
-	depends on ADK_KERNEL_VERSION_3_11_10 || ADK_KERNEL_VERSION_3_12_11 \
-		|| ADK_KERNEL_VERSION_3_13_5
+	depends on ADK_KERNEL_VERSION_3_10_30 \
+		|| ADK_KERNEL_VERSION_3_11_10 \
+		|| ADK_KERNEL_VERSION_3_12_13 \
+		|| ADK_KERNEL_VERSION_3_13_6
 	help
 	  The Full NAT option allows masquerading, port forwarding and other
 	  forms of full Network Address Port Translation.  It is controlled by
diff --git a/target/linux/config/Config.in.pm b/target/linux/config/Config.in.pm
index d93c820cc..4bfe42c58 100644
--- a/target/linux/config/Config.in.pm
+++ b/target/linux/config/Config.in.pm
@@ -1,5 +1,6 @@
-config ADK_KERNEL_PM
+config ADK_KERNEL_PM_RUNTIME
 	boolean
+	default y if ADK_TARGET_SYSTEM_CUBOX_I
 
 config ADK_KERNEL_ACPI
 	boolean
@@ -28,7 +29,7 @@ depends on ADK_TARGET_WITH_ACPI || ADK_TARGET_SYSTEM_LEMOTE_YEELONG
 config ADK_HARDWARE_ACPI
 	prompt "Enable ACPI support"
 	boolean
-	select ADK_KERNEL_PM
+	select ADK_KERNEL_PM_RUNTIME
 	select ADK_KERNEL_ACPI
 	select ADK_KERNEL_ACPI_SYSFS_POWER
 	select ADK_KERNEL_ACPI_AC
@@ -36,12 +37,7 @@ config ADK_HARDWARE_ACPI
 	select ADK_KERNEL_ACPI_BUTTON
 	select ADK_KERNEL_ACPI_FAN
 	select ADK_KERNEL_ACPI_DOCK
-	default y if ADK_TARGET_SYSTEM_INTEL_ATOM
-	default y if ADK_NATIVE_SYSTEM_INTEL_ATOM
 	default y if ADK_TARGET_SYSTEM_IBM_X40
-	default y if ADK_NATIVE_SYSTEM_IBM_X40
-	default y if ADK_TARGET_SYSTEM_TAROX_PC
-	default y if ADK_NATIVE_SYSTEM_TAROX_PC
 	default n
 	help
 	 Enable ACPI support.
@@ -49,13 +45,9 @@ config ADK_HARDWARE_ACPI
 config ADK_KERNEL_SUSPEND
 	prompt "Enable Suspend-to-RAM support"
 	boolean
-	select ADK_KERNEL_PM
-	default y if ADK_TARGET_SYSTEM_INTEL_ATOM
-	default y if ADK_NATIVE_SYSTEM_INTEL_ATOM
+	select ADK_KERNEL_PM_RUNTIME
 	default y if ADK_TARGET_SYSTEM_IBM_X40
-	default y if ADK_NATIVE_SYSTEM_IBM_X40
 	default y if ADK_TARGET_SYSTEM_LEMOTE_YEELONG
-	default y if ADK_NATIVE_SYSTEM_LEMOTE_YEELONG
 	default n
 	help
 	  Enable Suspend-to-RAM support.
@@ -63,15 +55,11 @@ config ADK_KERNEL_SUSPEND
 config ADK_KERNEL_HIBERNATION
 	prompt "Enable Suspend-to-Disk support"
 	boolean
-	select ADK_KERNEL_PM
+	select ADK_KERNEL_PM_RUNTIME
 	select ADK_KERNEL_SWAP
 	select BUSYBOX_SWAPONOFF
-	default y if ADK_TARGET_SYSTEM_INTEL_ATOM
-	default y if ADK_NATIVE_SYSTEM_INTEL_ATOM
 	default y if ADK_TARGET_SYSTEM_IBM_X40
-	default y if ADK_NATIVE_SYSTEM_IBM_X40
 	default y if ADK_TARGET_SYSTEM_LEMOTE_YEELONG
-	default y if ADK_NATIVE_SYSTEM_LEMOTE_YEELONG
 	default n
 	help
 	  Enable Suspend-to-Disk support.
diff --git a/target/linux/config/Config.in.sched b/target/linux/config/Config.in.sched
index 7cea06102..2e749a5fb 100644
--- a/target/linux/config/Config.in.sched
+++ b/target/linux/config/Config.in.sched
@@ -17,7 +17,6 @@ config ADK_KERNEL_NET_ESTIMATOR
 	default n
 
 config ADK_KERNEL_NET_SCHED
-	#prompt "kmod-net-sched.................... QoS and/or fair queueing support"
 	boolean
 	default n
 	help
diff --git a/target/linux/config/Config.in.serial b/target/linux/config/Config.in.serial
deleted file mode 100644
index 6ba3d4872..000000000
--- a/target/linux/config/Config.in.serial
+++ /dev/null
@@ -1,9 +0,0 @@
-config ADK_KERNEL_SERIAL_PXA
-	boolean
-	default y if ADK_TARGET_QEMU_ARM_MODEL_SPITZ
-	default y if ADK_TARGET_SYSTEM_SHARP_ZAURUS
-
-config ADK_KERNEL_SERIAL_PXA_CONSOLE
-	boolean
-	default y if ADK_TARGET_QEMU_ARM_MODEL_SPITZ
-	default y if ADK_TARGET_SYSTEM_SHARP_ZAURUS
diff --git a/target/linux/config/Config.in.usb b/target/linux/config/Config.in.usb
index e1fd3c0c3..2d50e24b2 100644
--- a/target/linux/config/Config.in.usb
+++ b/target/linux/config/Config.in.usb
@@ -1,12 +1,27 @@
 menu "USB support"
-depends on ADK_TARGET_WITH_USB
+depends on ADK_TARGET_WITH_USB || ADK_HARDWARE_QEMU
 
 config ADK_KERNEL_USB_SUPPORT
 	boolean
 
 config ADK_KERNEL_USB
+	boolean
 	select ADK_KERNEL_USB_SUPPORT
+	default y if ADK_TARGET_SYSTEM_QEMU_SH4
+	default y if ADK_TARGET_SYSTEM_QEMU_SH4EB
+	default n
+
+config ADK_KERNEL_USB_OHCI_HCD
+	boolean
+	default y if ADK_TARGET_SYSTEM_QEMU_SH4
+	default y if ADK_TARGET_SYSTEM_QEMU_SH4EB
+	default n
+
+config ADK_KERNEL_USB_OHCI_HCD_PLATFORM
 	boolean
+	default y if ADK_TARGET_SYSTEM_QEMU_SH4
+	default y if ADK_TARGET_SYSTEM_QEMU_SH4EB
+	default n
 
 config ADK_KERNEL_USB_LIBUSUAL
 	tristate
@@ -35,18 +50,10 @@ config ADK_KPACKAGE_KMOD_USB
 	select ADK_KERNEL_NLS
 	select ADK_KERNEL_USB_SUPPORT
 	depends on !ADK_KERNEL_USB
-	default y if ADK_TARGET_SYSTEM_QEMU_I686
-	default y if ADK_TARGET_SYSTEM_QEMU_SH4
-	default y if ADK_TARGET_SYSTEM_QEMU_X86_64
 	default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX1C
 	default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX2D2
 	default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX2D13
-	default y if ADK_TARGET_SYSTEM_TAROX_PC
-	default y if ADK_NATIVE_SYSTEM_TAROX_PC
 	default y if ADK_TARGET_SYSTEM_IBM_X40
-	default y if ADK_NATIVE_SYSTEM_IBM_X40
-	default y if ADK_TARGET_SYSTEM_INTEL_ATOM
-	default y if ADK_NATIVE_SYSTEM_INTEL_ATOM
 	default y if ADK_TARGET_SYSTEM_LEMOTE_YEELONG
 	default y if ADK_TARGET_SYSTEM_ACMESYSTEMS_FOXG20
 	default n
@@ -88,9 +95,6 @@ config ADK_KPACKAGE_KMOD_USB_UHCI_HCD
 	depends on !ADK_TARGET_SYSTEM_ACMESYSTEMS_FOXG20
 	depends on !ADK_TARGET_SYSTEM_RASPBERRY_PI
 	default y if ADK_TARGET_SYSTEM_IBM_X40
-	default y if ADK_NATIVE_SYSTEM_IBM_X40
-	default y if ADK_TARGET_SYSTEM_INTEL_ATOM
-	default y if ADK_NATIVE_SYSTEM_INTEL_ATOM
 	default y if ADK_TARGET_SYSTEM_LEMOTE_YEELONG
 	default n
 	help
@@ -108,16 +112,12 @@ config ADK_KPACKAGE_KMOD_USB_OHCI_HCD
 	tristate
 	select ADK_PACKAGE_KMOD_USB_CONTROLLER
 	depends on ADK_KPACKAGE_KMOD_USB
-	#depends on !ADK_TARGET_SYSTEM_ACMESYSTEMS_FOXG20
 	depends on !ADK_TARGET_SYSTEM_RASPBERRY_PI
 	default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX1C
 	default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX2D2
 	default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX2D13
 	default y if ADK_TARGET_SYSTEM_ACMESYSTEMS_FOXG20
-	default y if ADK_TARGET_SYSTEM_INTEL_ATOM
-	default y if ADK_NATIVE_SYSTEM_INTEL_ATOM
 	default y if ADK_TARGET_SYSTEM_LEMOTE_YEELONG
-	default y if ADK_TARGET_SYSTEM_QEMU_SH4
 	default n
 	help
 	  The Open Host Controller Interface (OHCI) is a standard for accessing
@@ -174,17 +174,10 @@ config ADK_KPACKAGE_KMOD_USB_EHCI_HCD
 	depends on !ADK_TARGET_SYSTEM_ACMESYSTEMS_FOXG20
 	depends on !ADK_TARGET_SYSTEM_RASPBERRY_PI
 	depends on ADK_KPACKAGE_KMOD_USB
-	default y if ADK_TARGET_SYSTEM_QEMU_I686
-	default y if ADK_TARGET_SYSTEM_QEMU_X86_64
 	default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX1C
 	default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX2D2
 	default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX2D13
-	default y if ADK_TARGET_SYSTEM_INTEL_ATOM
-	default y if ADK_NATIVE_SYSTEM_INTEL_ATOM
 	default y if ADK_TARGET_SYSTEM_IBM_X40
-	default y if ADK_NATIVE_SYSTEM_IBM_X40
-	default y if ADK_TARGET_SYSTEM_TAROX_PC
-	default y if ADK_NATIVE_SYSTEM_TAROX_PC
 	default y if ADK_TARGET_SYSTEM_LEMOTE_YEELONG
 	default n
 	help
@@ -215,34 +208,34 @@ config ADK_PACKAGE_KMOD_USB_CONTROLLER
 config ADK_KPACKAGE_KMOD_USB_ACM
 	prompt "kmod-usb-acm...................... Support for USB modems/isdn controllers"
 	tristate
-	default n
 	depends on ADK_PACKAGE_KMOD_USB_CONTROLLER
+	default n
 
 config ADK_KPACKAGE_KMOD_USB_PEGASUS
 	prompt "kmod-usb-pegasus.................. Support for USB Pegasus"
 	tristate
-	default n
 	depends on ADK_PACKAGE_KMOD_USB_CONTROLLER
+	default n
 
 config ADK_KPACKAGE_KMOD_USB_HSO
 	prompt "kmod-usb-hso...................... Support for USB HSO devices"
 	tristate
 	select ADK_KPACKAGE_KMOD_RFKILL
 	select ADK_KPACKAGE_KMOD_USB_STORAGE
-	default n
 	depends on ADK_PACKAGE_KMOD_USB_CONTROLLER
+	default n
 
 config ADK_KPACKAGE_KMOD_USB_PRINTER
 	prompt "kmod-usb-printer.................. Support for USB printers"
 	tristate
-	default n
 	depends on ADK_PACKAGE_KMOD_USB_CONTROLLER
+	default n
 
 config ADK_KPACKAGE_KMOD_USB_SERIAL
 	prompt "kmod-usb-serial................... Support for USB-to-serial converters"
 	tristate
-	default n
 	depends on ADK_PACKAGE_KMOD_USB_CONTROLLER
+	default n
 	help
 	  Say Y here if you have a USB device that provides normal serial
 	  ports, or acts like a serial device, and you want to connect it to
@@ -256,8 +249,8 @@ config ADK_KPACKAGE_KMOD_USB_SERIAL
 config ADK_KPACKAGE_KMOD_USB_SERIAL_BELKIN
 	prompt   "kmod-usb-serial-belkin.......... Support for Belkin USB-to-serial converters"
 	tristate
-	default n
 	depends on ADK_KPACKAGE_KMOD_USB_SERIAL
+	default n
 	help
 	  Say Y here if you want to use a Belkin USB Serial single port
 	  adaptor (F5U103 is one of the model numbers) or the Peracom single
@@ -266,8 +259,8 @@ config ADK_KPACKAGE_KMOD_USB_SERIAL_BELKIN
 config ADK_KPACKAGE_KMOD_USB_SERIAL_FTDI_SIO
 	prompt   "kmod-usb-serial-ftdi............ Support for FTDI USB-to-serial converter"
 	tristate
-	default n
 	depends on ADK_KPACKAGE_KMOD_USB_SERIAL
+	default n
 	help
 	  Say Y here if you want to use a FTDI SIO single port USB to serial
 	  converter device. The implementation I have is called the USC-1000.
@@ -279,8 +272,8 @@ config ADK_KPACKAGE_KMOD_USB_SERIAL_FTDI_SIO
 config ADK_KPACKAGE_KMOD_USB_SERIAL_MCT_U232
 	prompt   "kmod-usb-serial-mct-u232........ Support for Magic Control Technology USB-to-Serial converters"
 	tristate
-	default n
 	depends on ADK_KPACKAGE_KMOD_USB_SERIAL
+	default n
 	help
 	  Say Y here if you want to use a USB Serial single port adapter from
 	  Magic Control Technology Corp. (U232 is one of the model numbers).
@@ -291,8 +284,8 @@ config ADK_KPACKAGE_KMOD_USB_SERIAL_MCT_U232
 config ADK_KPACKAGE_KMOD_USB_SERIAL_PL2303
 	prompt   "kmod-usb-serial-pl2303.......... Support for Prolific PL2303 USB-to-Serial converters"
 	tristate
-	default n
 	depends on ADK_KPACKAGE_KMOD_USB_SERIAL
+	default n
 	help
 	  Say Y here if you want to use the PL2303 USB Serial single port
 	  adapter from Prolific.
@@ -300,8 +293,8 @@ config ADK_KPACKAGE_KMOD_USB_SERIAL_PL2303
 config ADK_KPACKAGE_KMOD_USB_SERIAL_VISOR
 	prompt   "kmod-usb-serial-visor........... Support for Handspring Visor / Palm m50x / Sony Clie Driver"
 	tristate
-	default n
 	depends on ADK_KPACKAGE_KMOD_USB_SERIAL
+	default n
 	help
 	  Say Y here if you want to connect to your HandSpring Visor, Palm
 	  m500 or m505 through its USB docking station. See
@@ -311,43 +304,43 @@ config ADK_KPACKAGE_KMOD_USB_SERIAL_VISOR
 config ADK_KPACKAGE_KMOD_USB_STORAGE
 	prompt "kmod-usb-storage.................. Support for USB storage devices"
 	tristate
-	default n
 	depends on ADK_PACKAGE_KMOD_USB_CONTROLLER
 	depends on !ADK_KERNEL_USB_STORAGE
 	select ADK_KPACKAGE_KMOD_SCSI if !ADK_KERNEL_SCSI
 	select ADK_KPACKAGE_KMOD_BLK_DEV_SD if !ADK_KERNEL_SCSI
+	default n
 
 config ADK_KPACKAGE_KMOD_USB_ATM
         prompt "kmod-usb-atm...................... Support for USB ATM devices"
 	tristate
-	default n
 	depends on ADK_PACKAGE_KMOD_USB_CONTROLLER
+	default n
 
 config ADK_KPACKAGE_KMOD_USB_ATM_SPEEDTOUCH
         prompt   "kmod-usb-atm-speedtouch......... Support for USB Speedtouch ADSL modem"
 	tristate
-	default n
 	depends on ADK_KPACKAGE_KMOD_USB_ATM
+	default n
 
 config ADK_KPACKAGE_KMOD_USB_USBNET
         prompt "kmod-usb-usbnet................... Multi-purpose USB Networking Framework"
 	tristate
-	default n
 	depends on ADK_PACKAGE_KMOD_USB_CONTROLLER
+	default n
 
 config ADK_KPACKAGE_KMOD_SND_USB_AUDIO
 	prompt "kmod-snd-usb-audio................ USB sound adapter"
 	tristate
-	default n
 	select ADK_KERNEL_SND_USB
 	select ADK_KPACKAGE_KMOD_SND
 	select ADK_KPACKAGE_KMOD_SND_RAWMIDI
 	depends on ADK_PACKAGE_KMOD_USB_CONTROLLER
+	default n
 
 config ADK_KPACKAGE_KMOD_USB_SISUSBVGA
         prompt "kmod-usb-svga..................... USB 2.0 SVGA dongle support (Net2280/SiS315)"
 	tristate
-	default n
 	depends on ADK_PACKAGE_KMOD_USB_CONTROLLER
+	default n
 	
 endmenu
diff --git a/target/linux/config/Config.in.watchdog b/target/linux/config/Config.in.watchdog
index 08e884a01..4a727e7d6 100644
--- a/target/linux/config/Config.in.watchdog
+++ b/target/linux/config/Config.in.watchdog
@@ -73,7 +73,7 @@ config ADK_KERNEL_RC32434_WDT
 	 Routerboard 532's SoC, the IDT RC32434.
 
 config ADK_KPACKAGE_KMOD_SOFT_WATCHDOG
-	prompt "kmod-softdog...................... Software watchdog"
+	prompt "kmod-soft-watchdog...................... Software watchdog"
 	tristate
 	default n
 	select ADK_KERNEL_WATCHDOG