summaryrefslogtreecommitdiff
path: root/target/linux/config
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2015-03-08 13:06:38 -0500
committerWaldemar Brodkorb <wbx@openadk.org>2015-03-08 16:09:03 -0500
commit05a0357d0185db37b4a8de438ea6fc9b438883d1 (patch)
tree60c93aac871ff2b4d189827b1c3fe8c68ce86510 /target/linux/config
parent2eb3007baa24a2248764cb3559806904b9f25314 (diff)
sync patch set and config
Remove some old kernel symbols. Use 8 MB as default for CMA.
Diffstat (limited to 'target/linux/config')
-rw-r--r--target/linux/config/Config.in.audio16
-rw-r--r--target/linux/config/Config.in.block8
-rw-r--r--target/linux/config/Config.in.dma2
3 files changed, 2 insertions, 24 deletions
diff --git a/target/linux/config/Config.in.audio b/target/linux/config/Config.in.audio
index c6463e0ac..3a7519863 100644
--- a/target/linux/config/Config.in.audio
+++ b/target/linux/config/Config.in.audio
@@ -13,12 +13,6 @@ config ADK_KERNEL_SND_SOC
config ADK_KERNEL_SND_ARM
bool
-config ADK_KERNEL_SND_SOC_GENERIC_DMAENGINE_PCM
- bool
-
-config ADK_KERNEL_SND_DMAENGINE_PCM
- bool
-
config ADK_KERNEL_SND_SOC_SPDIF
bool
@@ -55,8 +49,6 @@ config ADK_KERNEL_SND_TIMER
config ADK_KERNEL_SND_PCM
bool
select ADK_KERNEL_SND_TIMER
- select ADK_KERNEL_SND_DMAENGINE_PCM
- select ADK_KERNEL_SND_PCM_DMAENGINE
config ADK_KERNEL_SND_HWDEP
bool
@@ -99,9 +91,6 @@ config ADK_KERNEL_SND_SOC_PCM512x_SPI
select ADK_KERNEL_SND_SOC_PCM512x
select ADK_KERNEL_SND_SOC_I2C_AND_SPI
-config ADK_KERNEL_SND_PCM_DMAENGINE
- bool
-
config ADK_KERNEL_SND
bool
select ADK_KERNEL_SOUND
@@ -172,8 +161,6 @@ config ADK_KERNEL_SND_BCM2708_SOC_I2S
select ADK_KERNEL_SND_SOC
select ADK_KERNEL_SND_BCM2835
select ADK_KERNEL_DMA_BCM2835
- select ADK_KERNEL_SND_DMAENGINE_PCM
- select ADK_KERNEL_SND_SOC_GENERIC_DMAENGINE_PCM
select ADK_KERNEL_REGMAP_MMIO
depends on ADK_TARGET_BOARD_BCM28XX
default n
@@ -217,8 +204,6 @@ 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_GENERIC_DMAENGINE_PCM
- select ADK_KERNEL_SND_DMAENGINE_PCM
select ADK_KERNEL_SND_SOC_IMX_PCM_DMA
select ADK_KERNEL_SND_SOC_IMX_HDMI_DMA
select ADK_KERNEL_SND_SOC_IMX_HDMI
@@ -228,7 +213,6 @@ config ADK_KERNEL_SND_IMX_SOC
select ADK_KERNEL_SND_SOC_FSL_SPDIF
select ADK_KERNEL_REGMAP_SPI
select ADK_KERNEL_REGMAP_I2C
- select ADK_KERNEL_SND_PCM_DMAENGINE
depends on ADK_TARGET_SYSTEM_SOLIDRUN_IMX6
depends on ADK_KERNEL_VERSION_3_14
default y if ADK_TARGET_SYSTEM_SOLIDRUN_IMX6
diff --git a/target/linux/config/Config.in.block b/target/linux/config/Config.in.block
index c08fac5c9..519f6284a 100644
--- a/target/linux/config/Config.in.block
+++ b/target/linux/config/Config.in.block
@@ -96,9 +96,6 @@ config ADK_KERNEL_MMC_BCM2835
config ADK_KERNEL_MMC_BCM2835_DMA
bool
-config ADK_KERNEL_MMC_SDHCI_BCM2708_DMA
- bool
-
menu "SATA/PATA devices support"
depends on ADK_TARGET_WITH_PATA || ADK_TARGET_WITH_SATA || ADK_TARGET_QEMU || ADK_TARGET_VBOX
@@ -298,7 +295,7 @@ config ADK_KERNEL_MMC_AT91
default y if ADK_TARGET_SYSTEM_ACMESYSTEMS_FOXG20
default n
-config ADK_KERNEL_MMC_SDHCI_BCM2708
+config ADK_KERNEL_MMC_BCM2835
bool "SD card support for BCM2835 boards"
select ADK_KERNEL_SCSI
select ADK_KERNEL_MMC
@@ -306,10 +303,7 @@ config ADK_KERNEL_MMC_SDHCI_BCM2708
select ADK_KERNEL_BLK_DEV
select ADK_KERNEL_BLK_DEV_SD
select ADK_KERNEL_MMC_SDHCI
- select ADK_KERNEL_MMC_SDHCI_IO_ACCESSORS
select ADK_KERNEL_MMC_SDHCI_PLTFM
- select ADK_KERNEL_MMC_SDHCI_BCM2708_DMA
- select ADK_KERNEL_MMC_BCM2835
select ADK_KERNEL_MMC_BCM2835_DMA
depends on ADK_TARGET_BOARD_BCM28XX
default y if ADK_TARGET_BOARD_BCM28XX
diff --git a/target/linux/config/Config.in.dma b/target/linux/config/Config.in.dma
index 9d819aca3..010b6b105 100644
--- a/target/linux/config/Config.in.dma
+++ b/target/linux/config/Config.in.dma
@@ -24,7 +24,7 @@ config ADK_KERNEL_CMA
config ADK_KERNEL_CMA_SIZE_MBYTES
int
- default 64
+ default 8
config ADK_KERNEL_DMA_CMA
bool