diff options
author | Philippe Schenker <philippe.schenker@toradex.com> | 2019-07-03 11:32:03 +0200 |
---|---|---|
committer | Philippe Schenker <philippe.schenker@toradex.com> | 2019-07-03 11:32:03 +0200 |
commit | 82b8a7b70bc4158a070d1bc482c9484548dba0bb (patch) | |
tree | 55b473d31157a6133dbbcc2fe745935cada2c9ee | |
parent | 6807577c7cda8dcfa23fb5608bd10aee3cd231e5 (diff) |
(apalis|colibri)*_defconfig: make IMX_SDMA a module
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
Signed-off-by: Philippe Schenker <philippe.schenker@toradex.com>
4 files changed, 12 insertions, 4 deletions
diff --git a/recipes-kernel/linux/linux-toradex-4.14-2.0.x/apalis-imx6/defconfig b/recipes-kernel/linux/linux-toradex-4.14-2.0.x/apalis-imx6/defconfig index de5995c..89eb48d 100644 --- a/recipes-kernel/linux/linux-toradex-4.14-2.0.x/apalis-imx6/defconfig +++ b/recipes-kernel/linux/linux-toradex-4.14-2.0.x/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/recipes-kernel/linux/linux-toradex-4.14-2.0.x/colibri-imx6/defconfig b/recipes-kernel/linux/linux-toradex-4.14-2.0.x/colibri-imx6/defconfig index 7fed848..6aac6ca 100644 --- a/recipes-kernel/linux/linux-toradex-4.14-2.0.x/colibri-imx6/defconfig +++ b/recipes-kernel/linux/linux-toradex-4.14-2.0.x/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 diff --git a/recipes-kernel/linux/linux-toradex-4.14-2.0.x/colibri-imx6ull/defconfig b/recipes-kernel/linux/linux-toradex-4.14-2.0.x/colibri-imx6ull/defconfig index 10a5164..ab951db 100644 --- a/recipes-kernel/linux/linux-toradex-4.14-2.0.x/colibri-imx6ull/defconfig +++ b/recipes-kernel/linux/linux-toradex-4.14-2.0.x/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/recipes-kernel/linux/linux-toradex-4.14-2.0.x/mx7/defconfig b/recipes-kernel/linux/linux-toradex-4.14-2.0.x/mx7/defconfig index 42e4869..46bb5a8 100644 --- a/recipes-kernel/linux/linux-toradex-4.14-2.0.x/mx7/defconfig +++ b/recipes-kernel/linux/linux-toradex-4.14-2.0.x/mx7/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 @@ -298,7 +300,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 |