diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-05-16 09:41:57 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-05-16 09:42:19 +0200 |
| commit | a37955570287dd5ec690c229b1f30d97578a975f (patch) | |
| tree | a283a43f6a4b8f72cc70627f61d44c4729d4e502 /target/linux | |
| parent | 40a104be0f8087bf063a6d8421b52dcc679ef39c (diff) | |
add support for 3.10.30 stable from Jon Nettleton
Diffstat (limited to 'target/linux')
| -rw-r--r-- | target/linux/config/Config.in.audio | 8 | ||||
| -rw-r--r-- | target/linux/config/Config.in.graphics | 31 |
2 files changed, 34 insertions, 5 deletions
diff --git a/target/linux/config/Config.in.audio b/target/linux/config/Config.in.audio index be067302d..ec7c159d6 100644 --- a/target/linux/config/Config.in.audio +++ b/target/linux/config/Config.in.audio @@ -10,6 +10,9 @@ config ADK_KERNEL_SND_PCI config ADK_KERNEL_SND_USB boolean +config ADK_KERNEL_SND_SOC_GENERIC_DMAENGINE_PCM + boolean + config ADK_KERNEL_SND_SOC_IMX_PCM_DMA boolean @@ -162,17 +165,18 @@ config ADK_KERNEL_SND_BCM2708_SOC_HIFIBERRY_DIGI config ADK_KERNEL_SND_IMX_SOC prompt "Cubox-i SoC sound chip" tristate - depends on ADK_TARGET_SYSTEM_CUBOX_I select ADK_KERNEL_SND select ADK_KERNEL_SND_SOC select ADK_KERNEL_SND_COMPRESS - select ADK_KERNEL_SND_PCM_DMAENGINE if !ADK_KERNEL_VERSION_3_10_37 + select ADK_KERNEL_SND_PCM_DMAENGINE if !ADK_KERNEL_VERSION_3_10_37 && !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_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 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 default n diff --git a/target/linux/config/Config.in.graphics b/target/linux/config/Config.in.graphics index 77ee1ebf0..d1973768b 100644 --- a/target/linux/config/Config.in.graphics +++ b/target/linux/config/Config.in.graphics @@ -37,6 +37,15 @@ config ADK_KERNEL_FRAMEBUFFER_CONSOLE config ADK_KERNEL_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY boolean +config ADK_KERNEL_FB_MXS + boolean + +config ADK_KERNEL_FB_MXC_SYNC_PANEL + boolean + +config ADK_KERNEL_FB_MXC_HDMI + boolean + config ADK_KERNEL_MFD_SM501 boolean @@ -125,7 +134,7 @@ config ADK_KERNEL_FB_VESA Framebuffer support for VirtualBox Emulator. config ADK_KERNEL_DRM_IMX - prompt "Framebuffer support for Cubox-i (IMX)" + prompt "Framebuffer support for Cubox-i" boolean select ADK_KERNEL_DRM select ADK_KERNEL_DMA_CMA @@ -142,12 +151,28 @@ config ADK_KERNEL_DRM_IMX select ADK_KERNEL_FRAMEBUFFER_CONSOLE select ADK_KERNEL_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY select ADK_KERNEL_I2C_IMX + depends on ADK_TARGET_SYSTEM_CUBOX_I + depends on ADK_KERNEL_VERSION_3_15_RC5 default y if ADK_TARGET_SYSTEM_CUBOX_I default n - depends on ADK_TARGET_SYSTEM_CUBOX_I help - Framebuffer support for Cubox-i. + Framebuffer support for Cubox-i +config ADK_KERNEL_DRM_VIVANTE + prompt "Framebuffer support for Cubox-i" + boolean + select ADK_KERNEL_DRM + select ADK_KERNEL_FB + select ADK_KERNEL_FB_MXS + select ADK_KERNEL_FB_MXC_SYNC_PANEL + select ADK_KERNEL_FB_MXC_HDMI + depends on ADK_TARGET_SYSTEM_CUBOX_I + depends on ADK_KERNEL_VERSION_3_10_30 + default y if ADK_TARGET_SYSTEM_CUBOX_I + default n + help + Framebuffer support for Cubox-i (Vivante) + config ADK_KERNEL_FB_PXA prompt "Framebuffer support for Sharp Zaurus (PXA)" boolean |