summaryrefslogtreecommitdiff
path: root/target/linux/config
diff options
context:
space:
mode:
Diffstat (limited to 'target/linux/config')
-rw-r--r--target/linux/config/Config.in.audio8
-rw-r--r--target/linux/config/Config.in.misc6
-rw-r--r--target/linux/config/Config.in.watchdog10
3 files changed, 22 insertions, 2 deletions
diff --git a/target/linux/config/Config.in.audio b/target/linux/config/Config.in.audio
index 6ba4f4842..7813c1800 100644
--- a/target/linux/config/Config.in.audio
+++ b/target/linux/config/Config.in.audio
@@ -16,6 +16,9 @@ config ADK_KERNEL_SND_ARM
config ADK_KERNEL_SND_SOC_GENERIC_DMAENGINE_PCM
boolean
+config ADK_KERNEL_SND_DMAENGINE_PCM
+ tristate
+
config ADK_KERNEL_SND_SOC_SPDIF
tristate
@@ -175,7 +178,8 @@ config ADK_KERNEL_SND_IMX_SOC
select ADK_KERNEL_SND_SOC
select ADK_KERNEL_SND_COMPRESS
select ADK_KERNEL_SND_PCM_DMAENGINE if !ADK_KERNEL_VERSION_3_10_30
- select ADK_KERNEL_SND_SOC_GENERIC_DMAENGINE_PCM if ADK_KERNEL_VERSION_3_10_30
+ select ADK_KERNEL_SND_SOC_GENERIC_DMAENGINE_PCM
+ select ADK_KERNEL_SND_DMAENGINE_PCM
select ADK_KERNEL_SND_SOC_FSL_SPDIF if ADK_KERNEL_VERSION_3_10_30
select ADK_KERNEL_SND_SOC_IMX_PCM_DMA
select ADK_KERNEL_SND_SOC_IMX_HDMI_DMA
@@ -185,7 +189,7 @@ config ADK_KERNEL_SND_IMX_SOC
select ADK_KERNEL_REGMAP_SPI
select ADK_KERNEL_REGMAP_I2C
depends on ADK_TARGET_SYSTEM_CUBOX_I
- default m if ADK_TARGET_SYSTEM_CUBOX_I && !ADK_KERNEL_VERSION_3_14
+ default m if ADK_TARGET_SYSTEM_CUBOX_I
default n
endmenu
diff --git a/target/linux/config/Config.in.misc b/target/linux/config/Config.in.misc
index 463a8f369..41e8edc0c 100644
--- a/target/linux/config/Config.in.misc
+++ b/target/linux/config/Config.in.misc
@@ -12,6 +12,12 @@ config ADK_KERNEL_KEYS
config ADK_KERNEL_SBUS
boolean
+config ADK_KERNEL_IMX_WEIM
+ boolean
+ depends on ADK_TARGET_SYSTEM_CUBOX_I
+ default y if ADK_TARGET_SYSTEM_CUBOX_I
+ default n
+
menu "Miscellaneous devices support"
source "target/linux/config/Config.in.rtc"
diff --git a/target/linux/config/Config.in.watchdog b/target/linux/config/Config.in.watchdog
index d8cc5932e..1b9d183cc 100644
--- a/target/linux/config/Config.in.watchdog
+++ b/target/linux/config/Config.in.watchdog
@@ -15,6 +15,16 @@ config ADK_KERNEL_CS5535_CLOCK_EVENT_SRC
menu "Watchdog driver support"
+config ADK_KERNEL_IMX2_WDT
+ prompt "Cubox-i Hardware Watchdog"
+ boolean
+ select ADK_KERNEL_WATCHDOG
+ depends on ADK_TARGET_SYSTEM_CUBOX_I
+ default y if ADK_TARGET_SYSTEM_CUBOX_I
+ default n
+ help
+ Watchdog driver for Cubox-i
+
config ADK_KERNEL_SCx200_WDT
prompt "Natsemi Hardware Watchdog"
boolean