Merge pull request #1430 from thochstein/imx93

Updates for i.MX 8ULP and i.MX 93

4 files changed, 33 insertions, 32 deletions

diff --git a/conf/machine/imx8ulp-lpddr4-evk.conf b/conf/machine/imx8ulp-lpddr4-evk.conf
index 707597d2..273e1569 100644
--- a/conf/machine/imx8ulp-lpddr4-evk.conf
+++ b/conf/machine/imx8ulp-lpddr4-evk.conf
@@ -8,7 +8,7 @@ require include/imx8ulp-evk.inc
 
 KERNEL_DEVICETREE_BASENAME = "imx8ulp-evk"
 
-KERNEL_DEVICETREE += " \
+KERNEL_DEVICETREE:append:use-nxp-bsp = " \
     freescale/${KERNEL_DEVICETREE_BASENAME}-epdc.dtb \
     freescale/${KERNEL_DEVICETREE_BASENAME}-flexio-i2c.dtb \
     freescale/${KERNEL_DEVICETREE_BASENAME}-i3c.dtb \
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 \
 "
diff --git a/conf/machine/include/imx-base.inc b/conf/machine/include/imx-base.inc
index b2ca0ef8..e59c5bee 100644
--- a/conf/machine/include/imx-base.inc
+++ b/conf/machine/include/imx-base.inc
@@ -200,7 +200,7 @@ MACHINEOVERRIDES_EXTENDER:mx8qxp:use-nxp-bsp = "imx-generic-bsp:imx-nxp-bsp:imxd
 MACHINEOVERRIDES_EXTENDER:mx8dx:use-nxp-bsp  = "imx-generic-bsp:imx-nxp-bsp:imxdrm:imxdpu:imxgpu:imxgpu2d:imxgpu3d:imxvulkan:mx8-generic-bsp:mx8-nxp-bsp:mx8x-generic-bsp:mx8x-nxp-bsp:mx8dx-generic-bsp:mx8dx-nxp-bsp"
 MACHINEOVERRIDES_EXTENDER:mx8dxl:use-nxp-bsp = "imx-generic-bsp:imx-nxp-bsp:imxfbdev:mx8dxl-generic-bsp:mx8-generic-bsp:mx8-nxp-bsp:mx8x-generic-bsp:mx8x-nxp-bsp:mx8dxl-nxp-bsp"
 
-MACHINEOVERRIDES_EXTENDER:mx8ulp:use-nxp-bsp = "imx-generic-bsp:imx-nxp-bsp:mx8-generic-bsp:mx8-nxp-bsp:mx8ulp-generic-bsp:mx8ulp-nxp-bsp"
+MACHINEOVERRIDES_EXTENDER:mx8ulp:use-nxp-bsp = "imx-generic-bsp:imx-nxp-bsp:imxdrm:imxgpu:imxgpu2d:imxgpu3d:imxvulkan:mx8-generic-bsp:mx8-nxp-bsp:mx8ulp-generic-bsp:mx8ulp-nxp-bsp"
 
 MACHINEOVERRIDES_EXTENDER:mx93:use-nxp-bsp  = "imx-generic-bsp:imx-nxp-bsp:imxdrm:imxpxp:mx9-generic-bsp:mx9-nxp-bsp:mx93-generic-bsp:mx93-nxp-bsp"
 
@@ -495,6 +495,7 @@ PREFERRED_PROVIDER_virtual/libgles2:imxgpu3d ?= "imx-gpu-viv"
 PREFERRED_PROVIDER_virtual/libgles3:imxgpu3d ?= "imx-gpu-viv"
 PREFERRED_PROVIDER_virtual/libg2d            ?= "imx-gpu-g2d"
 PREFERRED_PROVIDER_virtual/libg2d:imxdpu     ?= "imx-dpu-g2d"
+PREFERRED_PROVIDER_virtual/libg2d:mx93-nxp-bsp ?= "imx-pxp-g2d"
 PREFERRED_PROVIDER_opencl-clhpp:imxgpu       ?= "imx-gpu-viv"
 PREFERRED_PROVIDER_opencl-headers:imxgpu     ?= "imx-gpu-viv"
 PREFERRED_PROVIDER_opencl-icd-loader:imxgpu  ?= "imx-gpu-viv"