diff options
author | Waldemar Brodkorb <wbx@openadk.org> | 2014-03-12 20:34:01 +0100 |
---|---|---|
committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-03-12 20:34:01 +0100 |
commit | d2bda1cfddccdd4c553a15e775a037de3bbb0570 (patch) | |
tree | 965914462125326d3166287f4567ceae50bf7914 /target/linux/config/Config.in.pm | |
parent | 22db207e5c13ad254ff488b8be2601792aae8586 (diff) | |
parent | d07bf77e221876d0c9d6f9813ef165265b67c15e (diff) |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'target/linux/config/Config.in.pm')
-rw-r--r-- | target/linux/config/Config.in.pm | 22 |
1 files changed, 5 insertions, 17 deletions
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. |