imx93-*.conf: Fix KERNEL_DEVICETREE

Fix the KERNEL_DEVICETREE assignments for i.MX 93:
- Limit extended device trees to NXP BSP as is customary
- Remove duplicated text `-qsb`

Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>

2 files changed, 30 insertions, 30 deletions

diff --git a/conf/machine/imx93-11x11-lpddr4x-evk.conf b/conf/machine/imx93-11x11-lpddr4x-evk.conf
index d5db4bde..a56b18ec 100644
--- a/conf/machine/imx93-11x11-lpddr4x-evk.conf
+++ b/conf/machine/imx93-11x11-lpddr4x-evk.conf
@@ -10,27 +10,27 @@ require include/imx93-evk.inc
 
 KERNEL_DEVICETREE_BASENAME = "imx93-11x11-evk"
 
-KERNEL_DEVICETREE += " \
-      freescale/${KERNEL_DEVICETREE_BASENAME}-aud-hat.dtb \
-      freescale/${KERNEL_DEVICETREE_BASENAME}-boe-wxga-lvds-panel.dtb \
-      freescale/${KERNEL_DEVICETREE_BASENAME}-flexio-i2c.dtb \
-      freescale/${KERNEL_DEVICETREE_BASENAME}-flexspi-m2.dtb \
-      freescale/${KERNEL_DEVICETREE_BASENAME}-i3c.dtb \
-      freescale/${KERNEL_DEVICETREE_BASENAME}-inmate.dtb \
-      freescale/${KERNEL_DEVICETREE_BASENAME}-lpspi-slave.dtb \
-      freescale/${KERNEL_DEVICETREE_BASENAME}-lpspi.dtb \
-      freescale/${KERNEL_DEVICETREE_BASENAME}-lpuart.dtb \
-      freescale/${KERNEL_DEVICETREE_BASENAME}-mqs.dtb \
-      freescale/${KERNEL_DEVICETREE_BASENAME}-mt9m114.dtb \
-      freescale/${KERNEL_DEVICETREE_BASENAME}-rm67199.dtb \
-      freescale/${KERNEL_DEVICETREE_BASENAME}-root.dtb \
+KERNEL_DEVICETREE:append:use-nxp-bsp = " \
+    freescale/${KERNEL_DEVICETREE_BASENAME}-aud-hat.dtb \
+    freescale/${KERNEL_DEVICETREE_BASENAME}-boe-wxga-lvds-panel.dtb \
+    freescale/${KERNEL_DEVICETREE_BASENAME}-flexio-i2c.dtb \
+    freescale/${KERNEL_DEVICETREE_BASENAME}-flexspi-m2.dtb \
+    freescale/${KERNEL_DEVICETREE_BASENAME}-i3c.dtb \
+    freescale/${KERNEL_DEVICETREE_BASENAME}-inmate.dtb \
+    freescale/${KERNEL_DEVICETREE_BASENAME}-lpspi-slave.dtb \
+    freescale/${KERNEL_DEVICETREE_BASENAME}-lpspi.dtb \
+    freescale/${KERNEL_DEVICETREE_BASENAME}-lpuart.dtb \
+    freescale/${KERNEL_DEVICETREE_BASENAME}-mqs.dtb \
+    freescale/${KERNEL_DEVICETREE_BASENAME}-mt9m114.dtb \
+    freescale/${KERNEL_DEVICETREE_BASENAME}-rm67199.dtb \
+    freescale/${KERNEL_DEVICETREE_BASENAME}-root.dtb \
  "
 
 UBOOT_CONFIG_BASENAME = "imx93_11x11_evk"
 
 DDR_FIRMWARE_NAME = " \
-        lpddr4_dmem_1d_v202201.bin \
-        lpddr4_dmem_2d_v202201.bin \
-        lpddr4_imem_1d_v202201.bin \
-        lpddr4_imem_2d_v202201.bin \
+    lpddr4_dmem_1d_v202201.bin \
+    lpddr4_dmem_2d_v202201.bin \
+    lpddr4_imem_1d_v202201.bin \
+    lpddr4_imem_2d_v202201.bin \
 "
diff --git a/conf/machine/imx93-9x9-lpddr4-qsb.conf b/conf/machine/imx93-9x9-lpddr4-qsb.conf
index bdecab65..01843aca 100644
--- a/conf/machine/imx93-9x9-lpddr4-qsb.conf
+++ b/conf/machine/imx93-9x9-lpddr4-qsb.conf
@@ -10,21 +10,21 @@ require include/imx93-evk.inc
 
 KERNEL_DEVICETREE_BASENAME = "imx93-9x9-qsb"
 
-KERNEL_DEVICETREE += " \
-      freescale/${KERNEL_DEVICETREE_BASENAME}-qsb-can1.dtb \
-      freescale/${KERNEL_DEVICETREE_BASENAME}-qsb-flexspi-m2.dtb \
-      freescale/${KERNEL_DEVICETREE_BASENAME}-qsb-i3c.dtb \
-      freescale/${KERNEL_DEVICETREE_BASENAME}-qsb-lpspi-slave.dtb \
-      freescale/${KERNEL_DEVICETREE_BASENAME}-qsb-lpspi.dtb \
-      freescale/${KERNEL_DEVICETREE_BASENAME}-qsb-mt9m114.dtb \
-      freescale/${KERNEL_DEVICETREE_BASENAME}-qsb-ontat-wvga-panel.dtb \
+KERNEL_DEVICETREE:append:use-nxp-bsp = " \
+    freescale/${KERNEL_DEVICETREE_BASENAME}-can1.dtb \
+    freescale/${KERNEL_DEVICETREE_BASENAME}-flexspi-m2.dtb \
+    freescale/${KERNEL_DEVICETREE_BASENAME}-i3c.dtb \
+    freescale/${KERNEL_DEVICETREE_BASENAME}-lpspi-slave.dtb \
+    freescale/${KERNEL_DEVICETREE_BASENAME}-lpspi.dtb \
+    freescale/${KERNEL_DEVICETREE_BASENAME}-mt9m114.dtb \
+    freescale/${KERNEL_DEVICETREE_BASENAME}-ontat-wvga-panel.dtb \
 "
 
 UBOOT_CONFIG_BASENAME = "imx93_9x9_qsb"
 
 DDR_FIRMWARE_NAME = " \
-        lpddr4_dmem_1d_v202201.bin \
-        lpddr4_dmem_2d_v202201.bin \
-        lpddr4_imem_1d_v202201.bin \
-        lpddr4_imem_2d_v202201.bin \
+    lpddr4_dmem_1d_v202201.bin \
+    lpddr4_dmem_2d_v202201.bin \
+    lpddr4_imem_1d_v202201.bin \
+    lpddr4_imem_2d_v202201.bin \
 "