1 files changed, 12 insertions, 13 deletions
diff --git a/conf/machine/imx6sxsabresd.conf b/conf/machine/imx6sxsabresd.conf
index 9f939ca7..8d597c55 100644
--- a/conf/machine/imx6sxsabresd.conf
+++ b/conf/machine/imx6sxsabresd.conf
@@ -10,19 +10,19 @@ require conf/machine/include/imx-base.inc
 require conf/machine/include/arm/armv7a/tune-cortexa9.inc
 
 KERNEL_DEVICETREE = " \
-    imx6sx-sdb.dtb \
-    imx6sx-sdb-reva.dtb \
-    imx6sx-sdb-sai.dtb \
+    nxp/imx/imx6sx-sdb.dtb \
+    nxp/imx/imx6sx-sdb-reva.dtb \
+    nxp/imx/imx6sx-sdb-sai.dtb \
 "
 KERNEL_DEVICETREE:append:use-nxp-bsp = " \
-    imx6sx-sdb-btwifi.dtb \
-    imx6sx-sdb-emmc.dtb \
-    imx6sx-sdb-lcdif1.dtb \
-    imx6sx-sdb-ldo.dtb \
-    imx6sx-sdb-m4.dtb \
-    imx6sx-sdb-mqs.dtb \
-    imx6sx-sdb-pcie-ep.dtb \
-    imx6sx-sdb-reva-ldo.dtb \
+    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"
@@ -37,7 +37,6 @@ 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"
 
@@ -45,4 +44,4 @@ SERIAL_CONSOLES = "115200;ttymxc0"
 
 MACHINE_FIRMWARE:append:mx6 = " linux-firmware-ath6k"
 
-MACHINE_FEATURES += "pci wifi bluetooth bcm4339 bcm43455"
+MACHINE_FEATURES += "pci wifi bluetooth bcm4339 bcm43455 nxp8987-sdio"