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

5 files changed, 72 insertions, 10 deletions

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..46942160f 100644
--- a/target/linux/config/Config.in.debug
+++ b/target/linux/config/Config.in.debug
@@ -25,6 +25,34 @@ 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
+	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.input b/target/linux/config/Config.in.input
index 17c23b65c..5a01ee1e1 100644
--- a/target/linux/config/Config.in.input
+++ b/target/linux/config/Config.in.input
@@ -9,6 +9,10 @@ config ADK_KERNEL_INPUT
 	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
@@ -113,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
@@ -122,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.pm b/target/linux/config/Config.in.pm
index deff5b3f6..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
@@ -44,7 +45,7 @@ config ADK_HARDWARE_ACPI
 config ADK_KERNEL_SUSPEND
 	prompt "Enable Suspend-to-RAM support"
 	boolean
-	select ADK_KERNEL_PM
+	select ADK_KERNEL_PM_RUNTIME
 	default y if ADK_TARGET_SYSTEM_IBM_X40
 	default y if ADK_TARGET_SYSTEM_LEMOTE_YEELONG
 	default n
@@ -54,7 +55,7 @@ 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_IBM_X40
diff --git a/target/linux/config/Config.in.usb b/target/linux/config/Config.in.usb
index b2c750673..f6fd22339 100644
--- a/target/linux/config/Config.in.usb
+++ b/target/linux/config/Config.in.usb
@@ -1,11 +1,23 @@
 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
 	select ADK_KERNEL_USB_SUPPORT
+	default y if ADK_TARGET_SYSTEM_QEMU_SH4
+	default y if ADK_TARGET_SYSTEM_QEMU_SH4EB
+	boolean
+
+config ADK_KERNEL_USB_OHCI_HCD
+	default y if ADK_TARGET_SYSTEM_QEMU_SH4
+	default y if ADK_TARGET_SYSTEM_QEMU_SH4EB
+	boolean
+
+config ADK_KERNEL_USB_OHCI_HCD_PLATFORM
+	default y if ADK_TARGET_SYSTEM_QEMU_SH4
+	default y if ADK_TARGET_SYSTEM_QEMU_SH4EB
 	boolean
 
 config ADK_KERNEL_USB_LIBUSUAL
@@ -36,7 +48,6 @@ config ADK_KPACKAGE_KMOD_USB
 	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
@@ -108,6 +119,7 @@ config ADK_KPACKAGE_KMOD_USB_OHCI_HCD
 	default y if ADK_TARGET_SYSTEM_ACMESYSTEMS_FOXG20
 	default y if ADK_TARGET_SYSTEM_LEMOTE_YEELONG
 	default y if ADK_TARGET_SYSTEM_QEMU_SH4
+	default y if ADK_TARGET_SYSTEM_QEMU_SH4EB
 	default n
 	help
 	  The Open Host Controller Interface (OHCI) is a standard for accessing