diff options
| author | Waldemar Brodkorb <wbrodkorb@conet.de> | 2015-03-11 13:19:43 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbrodkorb@conet.de> | 2015-03-11 13:19:43 +0100 |
| commit | 9689b3e8d0efe90bd3eab5b85634b965e32625c9 (patch) | |
| tree | 87c8bc01ca8f3f2cb0fe8f3d62bc2e364b046f0d /target/linux | |
| parent | 99776550c8d6f0cee284d4c9bbe6d7453a2fe8f9 (diff) | |
sync patches with rpi upstream
Diffstat (limited to 'target/linux')
| -rw-r--r-- | target/linux/config/Config.in.audio | 1 | ||||
| -rw-r--r-- | target/linux/config/Config.in.dma | 37 |
2 files changed, 23 insertions, 15 deletions
diff --git a/target/linux/config/Config.in.audio b/target/linux/config/Config.in.audio index 3a7519863..7566b8cdd 100644 --- a/target/linux/config/Config.in.audio +++ b/target/linux/config/Config.in.audio @@ -198,7 +198,6 @@ config ADK_KERNEL_SND_BCM2708_SOC_RPI_PROTO select ADK_KERNEL_SND_BCM2708_SOC_I2S select ADK_KERNEL_SND_SOC_WM8731 depends on ADK_TARGET_BOARD_BCM28XX - depends on ADK_KERNEL_VERSION_3_18 config ADK_KERNEL_SND_IMX_SOC bool "IMX6 SoC sound chip" diff --git a/target/linux/config/Config.in.dma b/target/linux/config/Config.in.dma index 010b6b105..c3038289d 100644 --- a/target/linux/config/Config.in.dma +++ b/target/linux/config/Config.in.dma @@ -1,10 +1,33 @@ config ADK_KERNEL_DMADEVICES bool +config ADK_KERNEL_CMA + bool + +config ADK_KERNEL_CMA_SIZE_MBYTES + int + default 8 + +config ADK_KERNEL_CMA_SIZE_SEL_MBYTES + bool + +config ADK_KERNEL_DMA_CMA + bool + +config ADK_KERNEL_BCM_VC_SM + bool + +config ADK_KERNEL_BCM_VC_CMA + bool + config ADK_KERNEL_DMA_BCM2708 bool select ADK_KERNEL_DMADEVICES + select ADK_KERNEL_BCM_VC_SM select ADK_KERNEL_BCM_VC_CMA + select ADK_KERNEL_CMA + select ADK_KERNEL_CMA_SIZE_SEL_MBYTES + select ADK_KERNEL_DMA_CMA depends on ADK_TARGET_BOARD_BCM28XX default y if ADK_TARGET_BOARD_BCM28XX default n @@ -19,17 +42,3 @@ config ADK_KERNEL_IMX_SDMA default y if ADK_TARGET_SYSTEM_SOLIDRUN_IMX6 default n -config ADK_KERNEL_CMA - bool - -config ADK_KERNEL_CMA_SIZE_MBYTES - int - default 8 - -config ADK_KERNEL_DMA_CMA - bool - select ADK_KERNEL_CMA - -config ADK_KERNEL_BCM_VC_CMA - bool - select ADK_KERNEL_DMA_CMA |