1 files changed, 28 insertions, 18 deletions
diff --git a/conf/machine/imx7ulpevk.conf b/conf/machine/imx7ulpevk.conf
index d9d2a559..2e39a0c7 100644
--- a/conf/machine/imx7ulpevk.conf
+++ b/conf/machine/imx7ulpevk.conf
@@ -7,29 +7,39 @@
 MACHINEOVERRIDES =. "mx7:mx7ulp:"
 
 require conf/machine/include/imx-base.inc
-require conf/machine/include/tune-cortexa7.inc
+include conf/machine/include/arm/armv7a/tune-cortexa7.inc
 
-MACHINE_FEATURES += " pci wifi bluetooth qca9377"
+MACHINE_FEATURES += "pci wifi bluetooth bcm43430 nxp8987-sdio"
 
 KERNEL_DEVICETREE = " \
-	imx7ulp-evkb.dtb \
-	imx7ulp-evkb-emmc.dtb \
-	imx7ulp-evkb-lpuart.dtb \
-	imx7ulp-evkb-mipi.dtb \
-	imx7ulp-evkb-rm68191-qhd.dtb \
-	imx7ulp-evkb-rm68200-wxga.dtb \
-	imx7ulp-evkb-sd1.dtb \
-	imx7ulp-evkb-sensors-to-i2c5.dtb \
-	imx7ulp-evkb-spi-slave.dtb \
-	imx7ulp-evk.dtb \
-	imx7ulp-evk-ft5416.dtb \
-	imx7ulp-evk-mipi.dtb \
+	nxp/imx/imx7ulp-evk.dtb \
 "
+KERNEL_DEVICETREE:append:use-nxp-bsp = " \
+	nxp/imx/imx7ulp-evk-ft5416.dtb \
+	nxp/imx/imx7ulp-evk-mipi.dtb \
+	nxp/imx/imx7ulp-evkb.dtb \
+	nxp/imx/imx7ulp-evkb-emmc.dtb \
+	nxp/imx/imx7ulp-evkb-lpuart.dtb \
+	nxp/imx/imx7ulp-evkb-mipi.dtb \
+	nxp/imx/imx7ulp-evkb-rm68191-qhd.dtb \
+	nxp/imx/imx7ulp-evkb-rm68200-wxga.dtb \
+	nxp/imx/imx7ulp-evkb-sd1.dtb \
+	nxp/imx/imx7ulp-evkb-sensors-to-i2c5.dtb \
+	nxp/imx/imx7ulp-evkb-spi-slave.dtb \
+"
+
+UBOOT_MAKE_TARGET = "u-boot.imx"
+UBOOT_SUFFIX = "imx"
+
+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 ??= "sd"
-UBOOT_CONFIG[sd] = "mx7ulp_evk_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"