diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-05-03 15:33:09 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-05-03 15:33:09 +0200 |
| commit | 4a4478fce5fffa5db6b413b755851b18638328c0 (patch) | |
| tree | f7baa56440d645bcf0c44d3e3c9e22507e6bf647 /target/linux | |
| parent | 96d5911e0b2ea6b8977a7a84967af877b7717637 (diff) | |
| parent | 5f2187e92c8d151b840454282fe390ebad030e35 (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'target/linux')
| -rw-r--r-- | target/linux/Config.in | 1 | ||||
| -rw-r--r-- | target/linux/config/Config.in.audio | 27 | ||||
| -rw-r--r-- | target/linux/config/Config.in.kernel | 33 |
3 files changed, 53 insertions, 8 deletions
diff --git a/target/linux/Config.in b/target/linux/Config.in index 778f4aa7c..03c4f079e 100644 --- a/target/linux/Config.in +++ b/target/linux/Config.in @@ -1,3 +1,4 @@ +source target/linux/config/Config.in.kernel source target/linux/config/Config.in.cpu source target/linux/config/Config.in.block source target/linux/config/Config.in.flash diff --git a/target/linux/config/Config.in.audio b/target/linux/config/Config.in.audio index d228feb96..b618c59b7 100644 --- a/target/linux/config/Config.in.audio +++ b/target/linux/config/Config.in.audio @@ -10,6 +10,18 @@ config ADK_KERNEL_SND_PCI config ADK_KERNEL_SND_USB boolean +config ADK_KERNEL_SND_SOC_IMX_PCM_DMA + boolean + +config ADK_KERNEL_SND_SOC_IMX_HDMI_DMA + boolean + +config ADK_KERNEL_SND_SOC_IMX_SPDIF + boolean + +config ADK_KERNEL_SND_SOC_IMX_HDMI + boolean + config ADK_KERNEL_SND_PXA2XX_AC97 boolean @@ -124,7 +136,7 @@ config ADK_KPACKAGE_KMOD_SND_BCM2708_SOC_I2S select ADK_KPACKAGE_KMOD_SND select ADK_KERNEL_SND_ARM select ADK_KPACKAGE_KMOD_SND_SOC - select ADK_KPACKAGE_KMOD_SND_PCM_DMAENGINE if !ADK_KERNEL_VERSION_3_10_34 + select ADK_KPACKAGE_KMOD_SND_PCM_DMAENGINE if !ADK_KERNEL_VERSION_3_10_37 select ADK_KPACKAGE_KMOD_SND_COMPRESS depends on ADK_TARGET_SYSTEM_RASPBERRY_PI default n @@ -147,4 +159,17 @@ config ADK_KPACKAGE_KMOD_SND_BCM2708_SOC_HIFIBERRY_DIGI depends on ADK_TARGET_SYSTEM_RASPBERRY_PI default n +config ADK_KPACKAGE_KMOD_SND_IMX_SOC + prompt "Cubox-i SoC sound chip" + tristate + depends on ADK_TARGET_SYSTEM_CUBOX_I + select ADK_KPACKAGE_KMOD_SND + select ADK_KPACKAGE_KMOD_SND_SOC + select ADK_KERNEL_SND_SOC_IMX_PCM_DMA + select ADK_KERNEL_SND_SOC_IMX_HDMI_DMA + select ADK_KERNEL_SND_SOC_IMX_HDMI + select ADK_KERNEL_SND_SOC_IMX_SPDIF + default y if ADK_TARGET_SYSTEM_CUBOX_I + default n + endmenu diff --git a/target/linux/config/Config.in.kernel b/target/linux/config/Config.in.kernel index aed028f79..e6dc6d6e9 100644 --- a/target/linux/config/Config.in.kernel +++ b/target/linux/config/Config.in.kernel @@ -106,12 +106,6 @@ config ADK_KERNEL_CPU_MIPS64_R1 config ADK_KERNEL_CPU_MIPS64_R2 boolean -config ADK_KERNEL_PREEMPT - boolean - -config ADK_KERNEL_THUMB2_KERNEL - boolean - # page size config ADK_KERNEL_PAGE_SIZE_4KB boolean @@ -119,10 +113,13 @@ config ADK_KERNEL_PAGE_SIZE_4KB config ADK_KERNEL_PAGE_SIZE_16KB boolean -# ABI +# ARM specific config ADK_KERNEL_AEABI boolean +config ADK_KERNEL_THUMB2_KERNEL + boolean + # endianess config ADK_KERNEL_CPU_BIG_ENDIAN default y if ADK_big @@ -131,3 +128,25 @@ config ADK_KERNEL_CPU_BIG_ENDIAN config ADK_KERNEL_CPU_LITTLE_ENDIAN default y if ADK_little boolean + +menu "Kernel options" + +config ADK_KERNEL_SMP + prompt "Enable symmetric multi processing" + boolean + default y if ADK_TARGET_CUBOX_I4PRO + default y if ADK_TARGET_CUBOX_I2ULTRA + default n + +config ADK_KERNEL_HIGHMEM + prompt "Enable high memory" + boolean + default y if ADK_TARGET_CUBOX_I4PRO + default n + +config ADK_KERNEL_PREEMPT + prompt "Enable preemptive kernel" + boolean + default n + +endmenu |