diff options
Diffstat (limited to 'target/linux')
| -rw-r--r-- | target/linux/config/Config.in.audio | 6 | ||||
| -rw-r--r-- | target/linux/config/Config.in.cpu | 1 | ||||
| -rw-r--r-- | target/linux/config/Config.in.graphics | 1 | ||||
| -rw-r--r-- | target/linux/config/Config.in.pm | 29 |
4 files changed, 23 insertions, 14 deletions
diff --git a/target/linux/config/Config.in.audio b/target/linux/config/Config.in.audio index 1e08c94b5..54270c374 100644 --- a/target/linux/config/Config.in.audio +++ b/target/linux/config/Config.in.audio @@ -28,6 +28,9 @@ config ADK_KERNEL_SND_SOC_IMX_SGTL5000 config ADK_KERNEL_SND_SOC_IMX_PCM_DMA bool +config ADK_KERNEL_SND_SOC_HDMI_CODEC + bool + config ADK_KERNEL_SND_SOC_IMX_HDMI_DMA bool @@ -203,6 +206,7 @@ config ADK_KERNEL_SND_IMX_SOC bool "IMX6 SoC sound chip" select ADK_KERNEL_SND select ADK_KERNEL_SND_SOC + select ADK_KERNEL_SND_SOC_HDMI_CODEC select ADK_KERNEL_SND_SOC_IMX_PCM_DMA select ADK_KERNEL_SND_SOC_IMX_HDMI_DMA select ADK_KERNEL_SND_SOC_IMX_HDMI @@ -212,7 +216,7 @@ config ADK_KERNEL_SND_IMX_SOC select ADK_KERNEL_SND_SOC_FSL_SPDIF select ADK_KERNEL_REGMAP_SPI select ADK_KERNEL_REGMAP_I2C - depends on ADK_TARGET_SYSTEM_SOLIDRUN_IMX6 && ADK_KERNEL_VERSION_3_14 + depends on ADK_TARGET_SYSTEM_SOLIDRUN_IMX6 default y if ADK_TARGET_SYSTEM_SOLIDRUN_IMX6 default n diff --git a/target/linux/config/Config.in.cpu b/target/linux/config/Config.in.cpu index 797e1a60e..f0caaea9b 100644 --- a/target/linux/config/Config.in.cpu +++ b/target/linux/config/Config.in.cpu @@ -48,7 +48,6 @@ config ADK_KERNEL_ARM_IMX6Q_CPUFREQ select ADK_KERNEL_REGULATOR_ANATOP select ADK_KERNEL_REGULATOR_PFUZE100 depends on ADK_TARGET_SYSTEM_SOLIDRUN_IMX6 - depends on !ADK_KERNEL_VERSION_3_12 default y if ADK_TARGET_SYSTEM_SOLIDRUN_IMX6 default n diff --git a/target/linux/config/Config.in.graphics b/target/linux/config/Config.in.graphics index 4993dd57d..5e5aef2d9 100644 --- a/target/linux/config/Config.in.graphics +++ b/target/linux/config/Config.in.graphics @@ -244,7 +244,6 @@ config ADK_KERNEL_DRM_VIVANTE select ADK_KERNEL_FB_MXC_EDID select ADK_KERNEL_MXC_VPU depends on ADK_TARGET_SYSTEM_SOLIDRUN_IMX6 - depends on ADK_KERNEL_VERSION_3_14 default y if ADK_TARGET_SYSTEM_SOLIDRUN_IMX6 default n help diff --git a/target/linux/config/Config.in.pm b/target/linux/config/Config.in.pm index 0e418ce0c..e7c875047 100644 --- a/target/linux/config/Config.in.pm +++ b/target/linux/config/Config.in.pm @@ -1,34 +1,39 @@ +config ADK_KERNEL_PM + bool + default y if ADK_TARGET_SYSTEM_SOLIDRUN_IMX6 + config ADK_KERNEL_PM_RUNTIME - boolean + bool default y if ADK_TARGET_SYSTEM_SOLIDRUN_IMX6 config ADK_KERNEL_ACPI - boolean + bool config ADK_KERNEL_ACPI_SYSFS_POWER - boolean + bool config ADK_KERNEL_ACPI_AC - boolean + bool config ADK_KERNEL_ACPI_BATTERY - boolean + bool config ADK_KERNEL_ACPI_BUTTON - boolean + bool config ADK_KERNEL_ACPI_FAN - boolean + bool config ADK_KERNEL_ACPI_DOCK - boolean + bool menu "Power Management support" depends on ADK_TARGET_WITH_ACPI || ADK_TARGET_SYSTEM_LEMOTE_YEELONG config ADK_HARDWARE_ACPI prompt "Enable ACPI support" - boolean + bool + select ADK_KERNEL_PM select ADK_KERNEL_PM_RUNTIME select ADK_KERNEL_ACPI select ADK_KERNEL_ACPI_SYSFS_POWER @@ -45,7 +50,8 @@ config ADK_HARDWARE_ACPI config ADK_KERNEL_SUSPEND prompt "Enable Suspend-to-RAM support" - boolean + bool + 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 @@ -55,7 +61,8 @@ config ADK_KERNEL_SUSPEND config ADK_KERNEL_HIBERNATION prompt "Enable Suspend-to-Disk support" - boolean + bool + select ADK_KERNEL_PM select ADK_KERNEL_PM_RUNTIME select ADK_KERNEL_SWAP select BUSYBOX_SWAPONOFF |