1 files changed, 31 insertions, 14 deletions
diff --git a/conf/machine/imx7dsabresd.conf b/conf/machine/imx7dsabresd.conf
index 2a4f8e6c..4b4a6012 100644
--- a/conf/machine/imx7dsabresd.conf
+++ b/conf/machine/imx7dsabresd.conf
@@ -7,21 +7,38 @@
 MACHINEOVERRIDES =. "mx7:mx7d:"
 
 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"
+MACHINE_FEATURES += "pci wifi bluetooth bcm4339 bcm43455 nxp8987-sdio"
 
-KERNEL_DEVICETREE = "imx7d-sdb.dtb imx7d-sdb-epdc.dtb imx7d-sdb-gpmi-weim.dtb \
-                     imx7d-sdb-m4.dtb imx7d-sdb-mipi-dsi.dtb imx7d-sdb-qspi.dtb \
-                     imx7d-sdb-reva.dtb imx7d-sdb-reva-epdc.dtb imx7d-sdb-reva-gpmi-weim.dtb \
-                     imx7d-sdb-reva-hdmi-audio.dtb imx7d-sdb-reva-m4.dtb imx7d-sdb-reva-qspi.dtb \
-                     imx7d-sdb-reva-touch.dtb imx7d-sdb-reva-wm8960.dtb"
-KERNEL_DEVICETREE_use-mainline-bsp = "imx7d-sdb.dtb"
+KERNEL_DEVICETREE = "nxp/imx/imx7d-sdb.dtb"
+KERNEL_DEVICETREE:append:use-nxp-bsp = " \
+    nxp/imx/imx7d-sdb-epdc.dtb \
+    nxp/imx/imx7d-sdb-gpmi-weim.dtb \
+    nxp/imx/imx7d-sdb-m4.dtb \
+    nxp/imx/imx7d-sdb-mipi-dsi.dtb \
+    nxp/imx/imx7d-sdb-mqs.dtb \
+    nxp/imx/imx7d-sdb-pcie-ep.dtb \
+    nxp/imx/imx7d-sdb-qspi.dtb \
+    nxp/imx/imx7d-sdb-reva.dtb \
+    nxp/imx/imx7d-sdb-sht11.dtb \
+    nxp/imx/imx7d-sdb-usd-wifi.dtb \
+"
 
-UBOOT_CONFIG ??= "sd"
-UBOOT_CONFIG[sd] = "mx7dsabresd_config,sdcard"
-UBOOT_CONFIG[qspi1] = "mx7dsabresd_qspi1_config"
-UBOOT_CONFIG[nand] = "mx7dsabresd_nand_config,ubifs"
-UBOOT_CONFIG[epdc] = "mx7dsabresd_epdc_config"
-UBOOT_CONFIG[mfgtool] = "mx7dsabresd_config"
+UBOOT_MAKE_TARGET = "u-boot.imx"
+UBOOT_SUFFIX = "imx"
 
+UBOOT_CONFIG ??= " \
+    sd \
+    ${@bb.utils.contains('MACHINE_FEATURES', 'optee', 'sd-optee', '', d)} \
+"
+UBOOT_CONFIG[sd]       = "mx7dsabresd_config,sdcard"
+UBOOT_CONFIG[sd-optee] = "mx7dsabresd_optee_config,sdcard"
+UBOOT_CONFIG[nonsec]   = "mx7dsabresd_nonsec_config,sdcard"
+UBOOT_CONFIG[qspi1]    = "mx7dsabresd_qspi1_config"
+UBOOT_CONFIG[nand]     = "mx7dsabresd_nand_config,ubifs"
+UBOOT_CONFIG[epdc]     = "mx7dsabresd_epdc_config"
+
+OPTEE_BIN_EXT = "7dsdb"
+
+XSERVER += "mesa-driver-swrast"