1 files changed, 12 insertions, 6 deletions

diff --git a/conf/machine/imx6ulevk.conf b/conf/machine/imx6ulevk.conf
index 18b6b04b6..a8acb43dc 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"