From 913ae7c2fdb8a8458898012c7ea081782de28033 Mon Sep 17 00:00:00 2001 From: Tom Hochstein Date: Thu, 3 Dec 2020 16:03:13 -0600 Subject: [PATCH] imx6ulevk: Add OP-TEE and Broadcom WiFi, remove pci 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 4339 and 43455 WiFi modules. Remove pci which is not supported by 6UL EVK. Signed-off-by: Tom Hochstein --- conf/machine/imx6ulevk.conf | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/conf/machine/imx6ulevk.conf b/conf/machine/imx6ulevk.conf index 18b6b04b..a8acb43d 100644 --- a/conf/machine/imx6ulevk.conf +++ b/conf/machine/imx6ulevk.conf @@ -9,7 +9,7 @@ MACHINEOVERRIDES =. "mx6:mx6ul:" include conf/machine/include/imx-base.inc include conf/machine/include/tune-cortexa7.inc -MACHINE_FEATURES += " pci wifi bluetooth" +MACHINE_FEATURES += "wifi bluetooth bcm4339 bcm43455" KERNEL_DEVICETREE = " \ imx6ul-14x14-evk-btwifi.dtb \ @@ -29,8 +29,14 @@ UBOOT_SUFFIX = "img" SPL_BINARY = "SPL" WKS_FILE = "imx-uboot-spl-bootpart.wks.in" -UBOOT_CONFIG ??= "sd" -UBOOT_CONFIG[sd] = "mx6ul_14x14_evk_config,sdcard" -UBOOT_CONFIG[emmc] = "mx6ul_14x14_evk_emmc_config,sdcard" -UBOOT_CONFIG[qspi1] = "mx6ul_14x14_evk_qspi1_config" -UBOOT_CONFIG[mfgtool] = "mx6ul_14x14_evk_config" +UBOOT_CONFIG ??= " \ + sd \ + ${@bb.utils.contains('MACHINE_FEATURES', 'optee', 'sd-optee', '', d)} \ +" +UBOOT_CONFIG[sd] = "mx6ul_14x14_evk_config,sdcard" +UBOOT_CONFIG[sd-optee] = "mx6ul_14x14_evk_optee_config,sdcard" +UBOOT_CONFIG[emmc] = "mx6ul_14x14_evk_emmc_config,sdcard" +UBOOT_CONFIG[qspi1] = "mx6ul_14x14_evk_qspi1_config" +UBOOT_CONFIG[mfgtool] = "mx6ul_14x14_evk_config" + +OPTEE_BIN_EXT = "6ulevk" -- 2.40.1