From 2cc93b353c62e6f7402dd152cdaf8c22b4f61a25 Mon Sep 17 00:00:00 2001 From: Javier Viguera Date: Tue, 7 Mar 2017 17:01:29 +0100 Subject: [PATCH] ccimx6ul: synchronize kernel defconfig Loading firmware by userspace helpers has been deprecated from device managers (like udev, eudev, etc). Firmware loading is supposed to be performed by the kernel. This fixes the loading of an external kernel module (qualcomm wlan.ko) that was failing to load because of a missing firmware file. In that case the kernel was requesting the firmware load from userspace: ar6k_wlan mmc0:0001:1: Direct firmware load for qsetup30.bin failed with error -2 ar6k_wlan mmc0:0001:1: Falling back to user helper The device manager we are using in DEY-2.2 (eudev) does not support firmware loading and is not giving an error return value to the kernel either, so at one point the kernel throws an oops: Hardware name: Freescale i.MX6 Ultralite (Device Tree) task: 88228000 ti: 88cbe000 task.ti: 88cbe000 PC is at 0x7f183758 LR is at request_firmware+0x38/0x40 pc : [<7f183758>] lr : [<802f80bc>] psr: 600f0013 sp : 88cbfdb8 ip : 00000000 fp : 88644c00 r10: 0000dac0 r9 : 88cbfefc r8 : 0000000c r7 : 00007d08 r6 : 88cbfde4 r5 : 88644ea2 r4 : 00000005 r3 : 88cbfde4 r2 : 00000080 r1 : 00000000 r0 : fffffff5 and the wireless driver is not loaded. https://jira.digi.com/browse/DEL-3856 Signed-off-by: Javier Viguera --- .../recipes-kernel/linux/linux-dey-4.1/ccimx6ul/defconfig | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/meta-digi-arm/recipes-kernel/linux/linux-dey-4.1/ccimx6ul/defconfig b/meta-digi-arm/recipes-kernel/linux/linux-dey-4.1/ccimx6ul/defconfig index d76179acb..cd0491b2e 100644 --- a/meta-digi-arm/recipes-kernel/linux/linux-dey-4.1/ccimx6ul/defconfig +++ b/meta-digi-arm/recipes-kernel/linux/linux-dey-4.1/ccimx6ul/defconfig @@ -82,6 +82,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=0 CONFIG_IMX_WEIM=y @@ -360,7 +362,6 @@ CONFIG_CRYPTO_TWOFISH=y CONFIG_CRYPTO_DEV_FSL_CAAM=y CONFIG_CRYPTO_DEV_FSL_CAAM_SM=y CONFIG_CRYPTO_DEV_FSL_CAAM_SECVIO=y -CONFIG_CRC_CCITT=m CONFIG_CRC_T10DIF=y CONFIG_CRC_ITU_T=m CONFIG_CRC7=m