From 3b0fea0d1be4d2bd63563ff1d7ce93cab96bcc62 Mon Sep 17 00:00:00 2001 From: Tom Hochstein Date: Thu, 3 Dec 2020 16:51:53 -0600 Subject: [PATCH] imx7ulpevk: Add OP-TEE and Broadcom WiFi, drop QCA 9377 Add OP-TEE support. Add optee to MACHINE_FEATURES to enable OP-TEE in u-boot-imx. OP-TEE is currently not supported by u-boot-fslc. Enable Broadcom 43430 WiFi module. Drop QCA 9377 as it is not supported for 7ULP EVK since 4.14 kernel. Signed-off-by: Tom Hochstein --- conf/machine/imx7ulpevk.conf | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/conf/machine/imx7ulpevk.conf b/conf/machine/imx7ulpevk.conf index d9d2a559..d3b816b5 100644 --- a/conf/machine/imx7ulpevk.conf +++ b/conf/machine/imx7ulpevk.conf @@ -9,7 +9,7 @@ MACHINEOVERRIDES =. "mx7:mx7ulp:" require conf/machine/include/imx-base.inc require conf/machine/include/tune-cortexa7.inc -MACHINE_FEATURES += " pci wifi bluetooth qca9377" +MACHINE_FEATURES += "pci wifi bluetooth bcm43430" KERNEL_DEVICETREE = " \ imx7ulp-evkb.dtb \ @@ -26,10 +26,16 @@ KERNEL_DEVICETREE = " \ imx7ulp-evk-mipi.dtb \ " -UBOOT_CONFIG ??= "sd" -UBOOT_CONFIG[sd] = "mx7ulp_evk_config,sdcard" -UBOOT_CONFIG[emmc] = "mx7ulp_evk_emmc_config,sdcard" -UBOOT_CONFIG[mfgtool] = "mx7ulp_evk_config" +UBOOT_CONFIG ??= " \ + sd \ + ${@bb.utils.contains('MACHINE_FEATURES', 'optee', 'sd-optee', '', d)} \ +" +UBOOT_CONFIG[sd] = "mx7ulp_evk_config,sdcard" +UBOOT_CONFIG[sd-optee] = "mx7ulp_evk_optee_config,sdcard" +UBOOT_CONFIG[emmc] = "mx7ulp_evk_emmc_config,sdcard" +UBOOT_CONFIG[mfgtool] = "mx7ulp_evk_config" + +OPTEE_BIN_EXT = "7ulp" # Set Serial console SERIAL_CONSOLES = "115200;ttyLP0" -- 2.40.1