From 37f919f0a8c265939abf6b9b80693f2329cfcb16 Mon Sep 17 00:00:00 2001 From: Tom Hochstein Date: Thu, 16 Feb 2023 16:03:01 -0700 Subject: imx-base.inc: Add 8ULP machine feature overrides for NXP BSP The SOC has DRM, GPU, and Vulkan support. Signed-off-by: Tom Hochstein --- conf/machine/include/imx-base.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/machine/include/imx-base.inc b/conf/machine/include/imx-base.inc index b2ca0ef8..6dfaf719 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" -- cgit v1.2.3-54-g00ecf From bfd03047b7e48235f3e9b6b9cf330971259cda73 Mon Sep 17 00:00:00 2001 From: Tom Hochstein Date: Thu, 16 Feb 2023 16:16:02 -0700 Subject: imx8ulp-lpddr4-evk: Limit extended device trees Limit extended device trees to NXP BSP as is customary Signed-off-by: Tom Hochstein --- conf/machine/imx8ulp-lpddr4-evk.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 \ -- cgit v1.2.3-54-g00ecf From bb2d96bd16a868bc4ae8ea91c1f89b6b07a3c082 Mon Sep 17 00:00:00 2001 From: Tom Hochstein Date: Thu, 16 Feb 2023 16:01:01 -0700 Subject: imx-pxp-g2d: Add PXP implementation of G2D Used by i.MX 93. Signed-off-by: Tom Hochstein --- conf/machine/include/imx-base.inc | 1 + recipes-graphics/imx-g2d/imx-pxp-g2d_git.bb | 28 ++++++++++++++++++++++++++++ 2 files changed, 29 insertions(+) create mode 100644 recipes-graphics/imx-g2d/imx-pxp-g2d_git.bb diff --git a/conf/machine/include/imx-base.inc b/conf/machine/include/imx-base.inc index 6dfaf719..e59c5bee 100644 --- a/conf/machine/include/imx-base.inc +++ b/conf/machine/include/imx-base.inc @@ -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" diff --git a/recipes-graphics/imx-g2d/imx-pxp-g2d_git.bb b/recipes-graphics/imx-g2d/imx-pxp-g2d_git.bb new file mode 100644 index 00000000..fbf56e0c --- /dev/null +++ b/recipes-graphics/imx-g2d/imx-pxp-g2d_git.bb @@ -0,0 +1,28 @@ +# Copyright (C) 2016 Freescale Semiconductor +# Copyright 2017-2022 NXP +# Released under the MIT license (see COPYING.MIT for the terms) + +DESCRIPTION = "G2D library using i.MX PXP" +LICENSE = "Proprietary" +LIC_FILES_CHKSUM = "file://EULA.txt;md5=d3c315c6eaa43e07d8c130dc3a04a011" + +PROVIDES += "virtual/libg2d" + +PV = "2.1.0+git${SRCPV}" + +SRC_URI = "${IMX_PXP_G2D_SRC};branch=${SRCBRANCH}" +IMX_PXP_G2D_SRC ?= "git://github.com/nxp-imx/imx-g2d-pxp.git;protocol=https" +SRCBRANCH ?= "imx_2.1" +SRCREV = "178970dc7cdba69b94c2219b5bade46d67adb640" + +S = "${WORKDIR}/git" + +inherit use-imx-headers + +EXTRA_OEMAKE = "PLATFORM=IMX93 INCLUDE='-I${STAGING_INCDIR_IMX}' DEST_DIR=${D}" + +do_install() { + oe_runmake install +} + +COMPATIBLE_MACHINE = "(mx93-nxp-bsp)" -- cgit v1.2.3-54-g00ecf From 8c881e12793cbde96670a7878ca41da10e6347d1 Mon Sep 17 00:00:00 2001 From: Tom Hochstein Date: Thu, 16 Feb 2023 16:08:59 -0700 Subject: 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 --- conf/machine/imx93-11x11-lpddr4x-evk.conf | 36 +++++++++++++++---------------- conf/machine/imx93-9x9-lpddr4-qsb.conf | 24 ++++++++++----------- 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 \ " -- cgit v1.2.3-54-g00ecf