1 files changed, 34 insertions, 16 deletions
diff --git a/conf/machine/imx6sxsabresd.conf b/conf/machine/imx6sxsabresd.conf
index 5793a0b0..8d597c55 100644
--- a/conf/machine/imx6sxsabresd.conf
+++ b/conf/machine/imx6sxsabresd.conf
@@ -4,26 +4,44 @@
 #@DESCRIPTION: Machine configuration for NXP i.MX6SoloX Sabre SD
 #@MAINTAINER: Lauren Post <Lauren.Post@nxp.com>
 
-MACHINEOVERRIDES =. "mx6:mx6sx:"
+MACHINEOVERRIDES =. "mx6sx:"
 
 require conf/machine/include/imx-base.inc
-require conf/machine/include/tune-cortexa9.inc
-
-KERNEL_DEVICETREE = "imx6sx-sdb.dtb imx6sx-sdb-emmc.dtb imx6sx-sdb-m4.dtb \
-                     imx6sx-sdb-sai.dtb imx6sx-sdb-lcdif1.dtb imx6sx-sdb-ldo.dtb \
-                     imx6sx-sdb-reva-ldo.dtb imx6sx-sdb-reva.dtb \
-                     imx6sx-sdb-btwifi.dtb imx6sx-sdb-mqs.dtb"
-KERNEL_DEVICETREE_use-mainline-bsp = "imx6sx-sdb.dtb imx6sx-sdb-sai.dtb imx6sx-sdb-reva.dtb"
-
-UBOOT_CONFIG ??= "sd"
-UBOOT_CONFIG[sd] = "mx6sxsabresd_config,sdcard"
-UBOOT_CONFIG[emmc] = "mx6sxsabresd_emmc_config,sdcard"
-UBOOT_CONFIG[qspi2] = "mx6sxsabresd_qspi2_config"
+require conf/machine/include/arm/armv7a/tune-cortexa9.inc
+
+KERNEL_DEVICETREE = " \
+    nxp/imx/imx6sx-sdb.dtb \
+    nxp/imx/imx6sx-sdb-reva.dtb \
+    nxp/imx/imx6sx-sdb-sai.dtb \
+"
+KERNEL_DEVICETREE:append:use-nxp-bsp = " \
+    nxp/imx/imx6sx-sdb-btwifi.dtb \
+    nxp/imx/imx6sx-sdb-emmc.dtb \
+    nxp/imx/imx6sx-sdb-lcdif1.dtb \
+    nxp/imx/imx6sx-sdb-ldo.dtb \
+    nxp/imx/imx6sx-sdb-m4.dtb \
+    nxp/imx/imx6sx-sdb-mqs.dtb \
+    nxp/imx/imx6sx-sdb-pcie-ep.dtb \
+    nxp/imx/imx6sx-sdb-reva-ldo.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]       = "mx6sxsabresd_config,sdcard"
+UBOOT_CONFIG[sd-optee] = "mx6sxsabresd_optee_config,sdcard"
+UBOOT_CONFIG[emmc]     = "mx6sxsabresd_emmc_config,sdcard"
+UBOOT_CONFIG[qspi2]    = "mx6sxsabresd_qspi2_config"
 UBOOT_CONFIG[m4fastup] = "mx6sxsabresd_m4fastup_config"
-UBOOT_CONFIG[mfgtool] = "mx6sxsabresd_config"
+
+OPTEE_BIN_EXT = "6sxsdb"
 
 SERIAL_CONSOLES = "115200;ttymxc0"
 
-MACHINE_FIRMWARE_append_mx6 = " linux-firmware-ath6k"
+MACHINE_FIRMWARE:append:mx6 = " linux-firmware-ath6k"
 
-MACHINE_FEATURES += " pci wifi bluetooth"
+MACHINE_FEATURES += "pci wifi bluetooth bcm4339 bcm43455 nxp8987-sdio"