diff options
| author | Philippe Schenker <philippe.schenker@toradex.com> | 2019-07-03 11:24:07 +0200 |
|---|---|---|
| committer | Oleksandr Suvorov <oleksandr.suvorov@toradex.com> | 2021-01-27 20:36:24 +0200 |
| commit | 6b9d861b0116848cced22b74af26da4eac23d0c7 (patch) | |
| tree | 880080fc547a887d88a83689ef321db91c26d5e6 /arch/arm/configs | |
| parent | 582e859ac4cdc3f0474a2843d93bd568cf1a03ed (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>
(cherry picked from commit 18739ada808c0529fee8d067a402fee4ad779e7f)
Diffstat (limited to 'arch/arm/configs')
| -rw-r--r-- | arch/arm/configs/apalis_imx6_defconfig | 4 | ||||
| -rw-r--r-- | arch/arm/configs/colibri-imx6ull_defconfig | 4 | ||||
| -rw-r--r-- | arch/arm/configs/colibri_imx6_defconfig | 4 |
3 files changed, 9 insertions, 3 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 diff --git a/arch/arm/configs/colibri-imx6ull_defconfig b/arch/arm/configs/colibri-imx6ull_defconfig index 10a516420ce4..ab951db3cba6 100644 --- a/arch/arm/configs/colibri-imx6ull_defconfig +++ b/arch/arm/configs/colibri-imx6ull_defconfig @@ -109,6 +109,8 @@ CONFIG_RFKILL_INPUT=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=256 CONFIG_CMA_SIZE_PERCENTAGE=50 @@ -294,7 +296,7 @@ CONFIG_RTC_CLASS=y CONFIG_RTC_DRV_DS1307=y CONFIG_RTC_DRV_SNVS=y CONFIG_DMADEVICES=y -CONFIG_IMX_SDMA=y +CONFIG_IMX_SDMA=m CONFIG_MXS_DMA=y CONFIG_MXC_PXP_V2=y CONFIG_MXC_PXP_V3=y diff --git a/arch/arm/configs/colibri_imx6_defconfig b/arch/arm/configs/colibri_imx6_defconfig index 7fed8482ce6d..6aac6caade19 100644 --- a/arch/arm/configs/colibri_imx6_defconfig +++ b/arch/arm/configs/colibri_imx6_defconfig @@ -81,6 +81,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=256 CONFIG_CMA_SIZE_PERCENTAGE=50 @@ -275,7 +277,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 |