summaryrefslogtreecommitdiff
path: root/arch/arm/configs/apalis_imx6_defconfig
diff options
context:
space:
mode:
authorPhilippe Schenker <philippe.schenker@toradex.com>2019-07-03 11:24:07 +0200
committerMarcel Ziswiler <marcel.ziswiler@toradex.com>2020-02-11 09:48:23 +0100
commit3994ed223ab67211651ab700f0f2a660531233c6 (patch)
tree24d2435fca8ce85a8b4d2cb9ee3deefe2982163e /arch/arm/configs/apalis_imx6_defconfig
parent84339555a5eca429ff14e32caa7fec2a064e2e2c (diff)
(apalis|colibri)*_defconfig: make IMX_SDMA a module 2
Remove firmware kobject uevent fallback mechanism and make imx_sdma a module so it gets loaded when rootfs is mounted. This prevents the error, that firmware can't be loaded from rootfs There where some defconfigs missed in the commit with the same name before, correct that. Signed-off-by: Philippe Schenker <philippe.schenker@toradex.com>
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