diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-03-10 16:29:28 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-03-10 16:29:28 +0100 |
| commit | 39aef29414d77492e06d872cfeaf4ba744fa9d38 (patch) | |
| tree | 708ee5f6f46f5bd2db6c4ec1cce2a1922df4076a /target/linux/config/Config.in.cpu | |
| parent | ed3d91cf2dfc6f63ae749b54c7d718eb73dd6211 (diff) | |
| parent | 6e58f05aaae4943de494bc30dd3bf184a6d676f2 (diff) | |
resolve conflict
Diffstat (limited to 'target/linux/config/Config.in.cpu')
| -rw-r--r-- | target/linux/config/Config.in.cpu | 22 |
1 files changed, 20 insertions, 2 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" |