1 files changed, 11 insertions, 5 deletions

diff --git a/conf/machine/imx7ulpevk.conf b/conf/machine/imx7ulpevk.conf
index d9d2a5592..d3b816b58 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"