summaryrefslogtreecommitdiff
path: root/arch/arm/configs/apalis_imx6_defconfig
diff options
context:
space:
mode:
Diffstat (limited to 'arch/arm/configs/apalis_imx6_defconfig')
-rw-r--r--arch/arm/configs/apalis_imx6_defconfig4
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/arm/configs/apalis_imx6_defconfig b/arch/arm/configs/apalis_imx6_defconfig
index de5995c1ee91..89eb48d11d1f 100644
--- a/arch/arm/configs/apalis_imx6_defconfig
+++ b/arch/arm/configs/apalis_imx6_defconfig
@@ -83,6 +83,8 @@ CONFIG_RFKILL_GPIO=y
CONFIG_DEVTMPFS=y
CONFIG_DEVTMPFS_MOUNT=y
# CONFIG_STANDALONE is not set
+# CONFIG_FIRMWARE_IN_KERNEL is not set
+# CONFIG_FW_LOADER_USER_HELPER_FALLBACK is not set
CONFIG_DMA_CMA=y
CONFIG_CMA_SIZE_MBYTES=320
CONFIG_CONNECTOR=y
@@ -283,7 +285,7 @@ CONFIG_RTC_INTF_DEV_UIE_EMUL=y
CONFIG_RTC_DRV_DS1307=y
CONFIG_RTC_DRV_SNVS=y
CONFIG_DMADEVICES=y
-CONFIG_IMX_SDMA=y
+CONFIG_IMX_SDMA=m
CONFIG_MXC_PXP_V2=y
# CONFIG_MX3_IPU is not set
CONFIG_STAGING=y