1 files changed, 13 insertions, 6 deletions

diff --git a/conf/machine/imx6ullevk.conf b/conf/machine/imx6ullevk.conf
index bcaeede7..7d5f62d1 100644
--- a/conf/machine/imx6ullevk.conf
+++ b/conf/machine/imx6ullevk.conf
@@ -9,6 +9,8 @@ MACHINEOVERRIDES =. "mx6:mx6ull:"
 include conf/machine/include/imx-base.inc
 include conf/machine/include/tune-cortexa7.inc
 
+MACHINE_FEATURES += "wifi bluetooth bcm4339 bcm43455"
+
 KERNEL_DEVICETREE = " \
         imx6ull-14x14-evk.dtb \
 "
@@ -20,10 +22,15 @@ KERNEL_DEVICETREE_append_use-nxp-bsp = " \
         imx6ull-14x14-evk-gpmi-weim.dtb \
 "
 
-UBOOT_CONFIG ??= "sd"
-UBOOT_CONFIG[sd] = "mx6ull_14x14_evk_config,sdcard"
-UBOOT_CONFIG[mfgtool] = "mx6ull_14x14_evk_config"
-
-SERIAL_CONSOLES = "115200;ttymxc0"
+UBOOT_CONFIG ??= " \
+    sd \
+    ${@bb.utils.contains('MACHINE_FEATURES', 'optee', 'sd-optee', '', d)} \
+"
+UBOOT_CONFIG[sd]       = "mx6ull_14x14_evk_config,sdcard"
+UBOOT_CONFIG[sd-optee] = "mx6ull_14x14_evk_optee_config,sdcard"
+UBOOT_CONFIG[emmc]     = "mx6ull_14x14_evk_emmc_config,sdcard"
+UBOOT_CONFIG[nand]     = "mx6ull_14x14_evk_nand_config,ubifs"
+UBOOT_CONFIG[qspi1]    = "mx6ull_14x14_evk_qspi1_config"
+UBOOT_CONFIG[mfgtool]  = "mx6ull_14x14_evk_config"
 
-MACHINE_FEATURES += "wifi bluetooth"
+OPTEE_BIN_EXT = "6ullevk"