From d93b387a8740bc5f6e61dac13888e9cc0f1cefa2 Mon Sep 17 00:00:00 2001 From: Tom Hochstein Date: Thu, 31 Mar 2022 17:39:35 -0500 Subject: mx8dx: Normalize MACHINEOVERRIDES implementation The imx8dx-mek machine is similar to imx8qxp-mek and so the mx8qxp override was included in the MACHINEOVERRIDES hierarchy. This is non-standard, and the rework of the SOC overrides didn't handle it properly, leading to a build break: ``` Log data follows: | DEBUG: Executing shell function do_compile | NOTE: 8QX boot binary build | cp: failed to access '/home/aquino/src/ossystems/oel-platform/build/tmp/work/imx8dx_mek-oel-linux/imx-boot/1.0-r0/git/iMX8DX/scfw_tcm.bin': Not a directory | WARNING: /home/aquino/src/ossystems/oel-platform/build/tmp/work/imx8dx_mek-oel-linux/imx-boot/1.0-r0/temp/run.do_compile.1809636:179 exit 1 from 'cp /home/aquino/src/ossystems/oel-platform/build/tmp/deploy/images/imx8dx-mek/imx-boot$ tools/scfw_tcm.bin /home/aquino/src/ossystems/oel-platform/build/tmp/work/imx8dx_mek-oel-linux/imx-boot/1.0-r0/git/iMX8DX/scfw_tcm.bin' | WARNING: Backtrace (BB generated script): | #1: compile_mx8x, /home/aquino/src/ossystems/oel-platform/build/tmp/work/imx8dx_mek-oel-linux/imx-boot/1.0-r0/temp/run.do_compile.1809636, line 179 | #2: do_compile, /home/aquino/src/ossystems/oel-platform/build/tmp/work/imx8dx_mek-oel-linux/imx-boot/1.0-r0/temp/run.do_compile.1809636, line 151 | #3: main, /home/aquino/src/ossystems/oel-platform/build/tmp/work/imx8dx_mek-oel-linux/imx-boot/1.0-r0/temp/run.do_compile.1809636, line 189 ERROR: Task (/home/aquino/src/ossystems/oel-platform/sources/meta-freescale/recipes-bsp/imx-mkimage/imx-boot_1.0.bb:do_compile) failed with exit code '1' ``` Fix the problem by removing mx8qxp from the mx8dx hierarchy and adapting existing mx8qxp overrides appropriately. Fixes: #1027 Signed-off-by: Tom Hochstein --- classes/use-imx-security-controller-firmware.bbclass | 10 +++++----- conf/machine/imx8dx-mek.conf | 2 +- conf/machine/include/imx-base.inc | 6 ++++++ recipes-bsp/imx-mkimage/imx-boot_1.0.bb | 1 + recipes-graphics/imx-gpu-viv/imx-gpu-viv-6.inc | 3 ++- recipes-graphics/wayland/weston-init.bbappend | 5 +++-- recipes-multimedia/gstreamer/imx-gst1.0-plugin_4.6.1.bb | 5 +++-- recipes-multimedia/imx-dsp/imx-dsp-codec-ext_1.2.0.bb | 2 +- recipes-multimedia/imx-dsp/imx-dsp_1.2.0.bb | 2 +- recipes-security/optee-imx/optee-os_3.15.0.imx.bb | 16 ++++++++-------- 10 files changed, 31 insertions(+), 21 deletions(-) diff --git a/classes/use-imx-security-controller-firmware.bbclass b/classes/use-imx-security-controller-firmware.bbclass index bdbf3684..dfd708e4 100644 --- a/classes/use-imx-security-controller-firmware.bbclass +++ b/classes/use-imx-security-controller-firmware.bbclass @@ -16,13 +16,13 @@ # This behavior ensures that derivatives which requires SECO Firmware to be # present in the image file have it properly defined. -SECO_FIRMWARE_NAME ?= "" - -SECO_FIRMWARE_NAME:mx8qm-nxp-bsp = "mx8qmb0-ahab-container.img" -SECO_FIRMWARE_NAME:mx8qxp-nxp-bsp = \ +SECO_FIRMWARE_NAME ?= "" +SECO_FIRMWARE_NAME:mx8qm-nxp-bsp = "mx8qmb0-ahab-container.img" +SECO_FIRMWARE_NAME:mx8qxp-nxp-bsp = \ "${@bb.utils.contains('MACHINE_FEATURES', 'soc-revb0', 'mx8qxb0-ahab-container.img', \ 'mx8qxc0-ahab-container.img', d)}" -SECO_FIRMWARE_NAME:mx8dxl-nxp-bsp = "mx8dxla1-ahab-container.img" +SECO_FIRMWARE_NAME:mx8dx-nxp-bsp = "mx8qxc0-ahab-container.img" +SECO_FIRMWARE_NAME:mx8dxl-nxp-bsp = "mx8dxla1-ahab-container.img" python () { if "mx8m-nxp-bsp" in d.getVar('MACHINEOVERRIDES').split(":"): diff --git a/conf/machine/imx8dx-mek.conf b/conf/machine/imx8dx-mek.conf index d1aaa8ee..8e8bdee0 100644 --- a/conf/machine/imx8dx-mek.conf +++ b/conf/machine/imx8dx-mek.conf @@ -3,7 +3,7 @@ #@DESCRIPTION: i.MX 8DualXPlus Multisensory Enablement Kit board #@MAINTAINER: Lauren Post -MACHINEOVERRIDES =. "mx8qxp:mx8dx:" +MACHINEOVERRIDES =. "mx8dx:" require include/imx8x-mek.inc diff --git a/conf/machine/include/imx-base.inc b/conf/machine/include/imx-base.inc index dc997443..cba47a0a 100644 --- a/conf/machine/include/imx-base.inc +++ b/conf/machine/include/imx-base.inc @@ -159,6 +159,7 @@ MACHINEOVERRIDES_EXTENDER:mx8mp:use-nxp-bsp = "imx-generic-bsp:imx-nxp-bsp:imxd MACHINEOVERRIDES_EXTENDER:mx8mq:use-nxp-bsp = "imx-generic-bsp:imx-nxp-bsp:imxdrm:imxvpu:imxgpu:imxgpu3d:mx8-generic-bsp:mx8-nxp-bsp:mx8m-generic-bsp:mx8m-nxp-bsp:mx8mq-generic-bsp:mx8mq-nxp-bsp" MACHINEOVERRIDES_EXTENDER:mx8qxp:use-nxp-bsp = "imx-generic-bsp:imx-nxp-bsp:imxdrm:imxdpu:imxgpu:imxgpu2d:imxgpu3d:mx8-generic-bsp:mx8-nxp-bsp:mx8x-generic-bsp:mx8x-nxp-bsp:mx8qxp-generic-bsp:mx8qxp-nxp-bsp" +MACHINEOVERRIDES_EXTENDER:mx8dx:use-nxp-bsp = "imx-generic-bsp:imx-nxp-bsp:imxdrm:imxdpu:imxgpu:imxgpu2d:imxgpu3d: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" ####### @@ -196,6 +197,7 @@ MACHINEOVERRIDES_EXTENDER:mx8mp:use-mainline-bsp = "imx-generic-bsp:imx-mainlin MACHINEOVERRIDES_EXTENDER:mx8mq:use-mainline-bsp = "imx-generic-bsp:imx-mainline-bsp:mx8-generic-bsp:mx8-mainline-bsp:mx8m-generic-bsp:mx8m-mainline-bsp:mx8mq-generic-bsp:mx8mq-mainline-bsp" MACHINEOVERRIDES_EXTENDER:mx8qxp:use-mainline-bsp = "imx-generic-bsp:imx-mainline-bsp:mx8-generic-bsp:mx8-mainline-bsp:mx8x-generic-bsp:mx8x-mainline-bsp:mx8qxp-generic-bsp:mx8qxp-mainline-bsp" +MACHINEOVERRIDES_EXTENDER:mx8dx:use-mainline-bsp = "imx-generic-bsp:imx-mainline-bsp:mx8-generic-bsp:mx8-mainline-bsp:mx8x-generic-bsp:mx8x-mainline-bsp:mx8dx-generic-bsp:mx8dx-mainline-bsp" MACHINEOVERRIDES_EXTENDER:mx8dxl:use-mainline-bsp = "imx-generic-bsp:imx-mainline-bsp:mx8-generic-bsp:mx8-mainline-bsp:mx8x-generic-bsp:mx8x-mainline-bsp:mx8dxl-generic-bsp:mx8dxl-mainline-bsp" MACHINEOVERRIDES_EXTENDER_FILTER_OUT = " \ @@ -221,6 +223,7 @@ MACHINEOVERRIDES_EXTENDER_FILTER_OUT = " \ mx8mp \ mx8mq \ mx8qxp \ + mx8dx \ mx8dxl \ " @@ -246,6 +249,7 @@ MACHINE_SOCARCH_SUFFIX:mx8mn-nxp-bsp = "-mx8mn" MACHINE_SOCARCH_SUFFIX:mx8mp-nxp-bsp = "-mx8mp" MACHINE_SOCARCH_SUFFIX:mx8mq-nxp-bsp = "-mx8m" MACHINE_SOCARCH_SUFFIX:mx8qxp-nxp-bsp = "-mx8" +MACHINE_SOCARCH_SUFFIX:mx8dx-nxp-bsp = "-mx8" MACHINE_SOCARCH_SUFFIX:mx8dxl-nxp-bsp = "-mx8dxl" # For Mainline we use a single SoC suffix as we don't have different build options @@ -335,6 +339,7 @@ MACHINE_FIRMWARE:append:mx8mp-generic-bsp = " linux-firmware-imx-sdma-imx7d fir MACHINE_FIRMWARE:append:mx8mq-generic-bsp = " linux-firmware-imx-sdma-imx7d" MACHINE_FIRMWARE:append:mx8qm-generic-bsp = " firmware-imx-vpu-imx8" MACHINE_FIRMWARE:append:mx8qxp-generic-bsp = " firmware-imx-vpu-imx8" +MACHINE_FIRMWARE:append:mx8dx-generic-bsp = " firmware-imx-vpu-imx8" MACHINE_FIRMWARE:append:imx-mainline-bsp = " linux-firmware-imx-sdma-imx6q linux-firmware-imx-sdma-imx7d firmware-imx-vpu-imx6q firmware-imx-vpu-imx6d" MACHINE_EXTRA_RRECOMMENDS += "${MACHINE_FIRMWARE}" @@ -383,6 +388,7 @@ MACHINE_GSTREAMER_1_0_PLUGIN:mx8mp-nxp-bsp ?= "imx-gst1.0-plugin" MACHINE_GSTREAMER_1_0_PLUGIN:mx8mq-nxp-bsp ?= "imx-gst1.0-plugin" MACHINE_GSTREAMER_1_0_PLUGIN:mx8qm-nxp-bsp ?= "imx-gst1.0-plugin" MACHINE_GSTREAMER_1_0_PLUGIN:mx8qxp-nxp-bsp ?= "imx-gst1.0-plugin" +MACHINE_GSTREAMER_1_0_PLUGIN:mx8dx-nxp-bsp ?= "imx-gst1.0-plugin" PREFERRED_VERSION_gstreamer1.0:mx8-nxp-bsp ?= "1.18.0.imx" PREFERRED_VERSION_gstreamer1.0-plugins-base:mx8-nxp-bsp ?= "1.18.0.imx" diff --git a/recipes-bsp/imx-mkimage/imx-boot_1.0.bb b/recipes-bsp/imx-mkimage/imx-boot_1.0.bb index d5330897..88689ead 100644 --- a/recipes-bsp/imx-mkimage/imx-boot_1.0.bb +++ b/recipes-bsp/imx-mkimage/imx-boot_1.0.bb @@ -73,6 +73,7 @@ REV_OPTION ?= "" REV_OPTION:mx8qxp-nxp-bsp = \ "${@bb.utils.contains('MACHINE_FEATURES', 'soc-revb0', '', \ 'REV=C0', d)}" +REV_OPTION:mx8dx-nxp-bsp = "REV=C0" compile_mx8m() { bbnote 8MQ/8MM/8MN/8MP boot binary build diff --git a/recipes-graphics/imx-gpu-viv/imx-gpu-viv-6.inc b/recipes-graphics/imx-gpu-viv/imx-gpu-viv-6.inc index 3dd2f55c..7816ec40 100644 --- a/recipes-graphics/imx-gpu-viv/imx-gpu-viv-6.inc +++ b/recipes-graphics/imx-gpu-viv/imx-gpu-viv-6.inc @@ -147,9 +147,10 @@ HAS_GBM:mx8-nxp-bsp = "true" IMX_SOC = "IMX_SOC_NOT_SET" IMX_SOC:mx8qm-nxp-bsp = "mx8qm" +IMX_SOC:mx8qxp-nxp-bsp = "mx8qxp" +IMX_SOC:mx8dx-nxp-bsp = "mx8qxp" IMX_SOC:mx8mp-nxp-bsp = "mx8mp" IMX_SOC:mx8mq-nxp-bsp = "mx8mq" -IMX_SOC:mx8qxp-nxp-bsp = "mx8qxp" IMX_SOC:mx8mn-nxp-bsp = "mx8mn" IMX_SOC:mx8ulp-nxp-bsp = "mx8ulp" diff --git a/recipes-graphics/wayland/weston-init.bbappend b/recipes-graphics/wayland/weston-init.bbappend index 7aceb6b1..4ba6cba7 100644 --- a/recipes-graphics/wayland/weston-init.bbappend +++ b/recipes-graphics/wayland/weston-init.bbappend @@ -27,9 +27,10 @@ INI_UNCOMMENT_ASSIGNMENTS:append:mx8mq-nxp-bsp = " \ # FIXME: The 8QM and 8QXP SoCs have better performance without G2D so don't enable it # Ideally, this should be seamless and Vivante ought to handle it internally and take the fastest # rendering code. -INI_UNCOMMENT_USE_G2D:imxgpu2d ?= "use-g2d=1" -INI_UNCOMMENT_USE_G2D:mx8qm-nxp-bsp = "" +INI_UNCOMMENT_USE_G2D:imxgpu2d ?= "use-g2d=1" +INI_UNCOMMENT_USE_G2D:mx8qm-nxp-bsp = "" INI_UNCOMMENT_USE_G2D:mx8qxp-nxp-bsp = "" +INI_UNCOMMENT_USE_G2D:mx8dx-nxp-bsp = "" INI_UNCOMMENT_ASSIGNMENTS:append:imxgpu2d = " \ ${INI_UNCOMMENT_USE_G2D} \ " diff --git a/recipes-multimedia/gstreamer/imx-gst1.0-plugin_4.6.1.bb b/recipes-multimedia/gstreamer/imx-gst1.0-plugin_4.6.1.bb index f53de1fa..160a9ea5 100644 --- a/recipes-multimedia/gstreamer/imx-gst1.0-plugin_4.6.1.bb +++ b/recipes-multimedia/gstreamer/imx-gst1.0-plugin_4.6.1.bb @@ -49,9 +49,10 @@ PACKAGES =+ "${PN}-gplay ${PN}-libgplaycore ${PN}-libgstfsl ${PN}-grecorder ${PN # Add codec list that the beep plugin run-time depended BEEP_RDEPENDS = "imx-codec-aac imx-codec-mp3 imx-codec-oggvorbis" RDEPENDS:${PN} += "imx-parser ${BEEP_RDEPENDS} gstreamer1.0-plugins-good-id3demux " -RDEPENDS:${PN}:append:mx8qm-nxp-bsp = " imx-dsp" +RDEPENDS:${PN}:append:mx8qm-nxp-bsp = " imx-dsp" RDEPENDS:${PN}:append:mx8qxp-nxp-bsp = " imx-dsp" -RDEPENDS:${PN}:append:mx8mp-nxp-bsp = " imx-dsp" +RDEPENDS:${PN}:append:mx8dx-nxp-bsp = " imx-dsp" +RDEPENDS:${PN}:append:mx8mp-nxp-bsp = " imx-dsp" RDEPENDS:${PN}:append:mx8ulp-nxp-bsp = " imx-dsp" # overlaysink rely on G2D, diff --git a/recipes-multimedia/imx-dsp/imx-dsp-codec-ext_1.2.0.bb b/recipes-multimedia/imx-dsp/imx-dsp-codec-ext_1.2.0.bb index f34c466c..470fb7fa 100644 --- a/recipes-multimedia/imx-dsp/imx-dsp-codec-ext_1.2.0.bb +++ b/recipes-multimedia/imx-dsp/imx-dsp-codec-ext_1.2.0.bb @@ -18,4 +18,4 @@ INHIBIT_PACKAGE_DEBUG_SPLIT = "1" INSANE_SKIP:${PN} = "arch dev-so" FILES:${PN} += "${libdir}/imx-mm/audio-codec ${datadir}/imx-mm" -COMPATIBLE_MACHINE = "(mx8qm-nxp-bsp|mx8qxp-nxp-bsp|mx8mp-nxp-bsp|mx8ulp-nxp-bsp)" +COMPATIBLE_MACHINE = "(mx8qm-nxp-bsp|mx8qxp-nxp-bsp|mx8dx-nxp-bsp|mx8mp-nxp-bsp|mx8ulp-nxp-bsp)" diff --git a/recipes-multimedia/imx-dsp/imx-dsp_1.2.0.bb b/recipes-multimedia/imx-dsp/imx-dsp_1.2.0.bb index eb90f17f..bfa279a0 100644 --- a/recipes-multimedia/imx-dsp/imx-dsp_1.2.0.bb +++ b/recipes-multimedia/imx-dsp/imx-dsp_1.2.0.bb @@ -42,4 +42,4 @@ INHIBIT_PACKAGE_DEBUG_SPLIT = "1" INHIBIT_SYSROOT_STRIP = "1" PACKAGE_ARCH = "${MACHINE_ARCH}" -COMPATIBLE_MACHINE = "(mx8qm-nxp-bsp|mx8qxp-nxp-bsp|mx8mp-nxp-bsp|mx8ulp-nxp-bsp)" +COMPATIBLE_MACHINE = "(mx8qm-nxp-bsp|mx8qxp-nxp-bsp|mx8dx-nxp-bsp|mx8mp-nxp-bsp|mx8ulp-nxp-bsp)" diff --git a/recipes-security/optee-imx/optee-os_3.15.0.imx.bb b/recipes-security/optee-imx/optee-os_3.15.0.imx.bb index e3eea2b4..3fca3dbf 100644 --- a/recipes-security/optee-imx/optee-os_3.15.0.imx.bb +++ b/recipes-security/optee-imx/optee-os_3.15.0.imx.bb @@ -31,14 +31,14 @@ PLATFORM_FLAVOR:imx6ul = "mx6ulevk" PLATFORM_FLAVOR:imx6ull = "mx6ullevk" PLATFORM_FLAVOR:imx6ull = "mx6ullevk" PLATFORM_FLAVOR:imx6ulz = "mx6ulzevk" -PLATFORM_FLAVOR:mx8mq-nxp-bsp = "mx8mqevk" -PLATFORM_FLAVOR:mx8mm-nxp-bsp = "mx8mmevk" -PLATFORM_FLAVOR:mx8mn-nxp-bsp = "mx8mnevk" -PLATFORM_FLAVOR:mx8mp-nxp-bsp = "mx8mpevk" -PLATFORM_FLAVOR:mx8qm-nxp-bsp = "mx8qmmek" -PLATFORM_FLAVOR:mx8qxp-nxp-bsp = "mx8qxpmek" -PLATFORM_FLAVOR:mx8dx-nxp-bsp = "mx8dxmek" -PLATFORM_FLAVOR:mx8dxl-nxp-bsp = "mx8dxlevk" +PLATFORM_FLAVOR:mx8mq-nxp-bsp = "mx8mqevk" +PLATFORM_FLAVOR:mx8mm-nxp-bsp = "mx8mmevk" +PLATFORM_FLAVOR:mx8mn-nxp-bsp = "mx8mnevk" +PLATFORM_FLAVOR:mx8mp-nxp-bsp = "mx8mpevk" +PLATFORM_FLAVOR:mx8qm-nxp-bsp = "mx8qmmek" +PLATFORM_FLAVOR:mx8qxp-nxp-bsp = "mx8qxpmek" +PLATFORM_FLAVOR:mx8dx-nxp-bsp = "mx8dxmek" +PLATFORM_FLAVOR:mx8dxl-nxp-bsp = "mx8dxlevk" OPTEE_ARCH ?= "arm32" OPTEE_ARCH:armv7a = "arm32" -- cgit v1.2.3-54-g00ecf From eb5a7835a726073ed0cf0055aabb9c3fdeb6d947 Mon Sep 17 00:00:00 2001 From: Tom Hochstein Date: Thu, 31 Mar 2022 17:51:07 -0500 Subject: imx-base.inc: Fix MACHINE_SOCARCH_SUFFIX for 8XLite The architecture is independent of the number of cores, so update the 8XLite suffix from mx8dxl to mx8xl. 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 cba47a0a..e73e3270 100644 --- a/conf/machine/include/imx-base.inc +++ b/conf/machine/include/imx-base.inc @@ -250,7 +250,7 @@ MACHINE_SOCARCH_SUFFIX:mx8mp-nxp-bsp = "-mx8mp" MACHINE_SOCARCH_SUFFIX:mx8mq-nxp-bsp = "-mx8m" MACHINE_SOCARCH_SUFFIX:mx8qxp-nxp-bsp = "-mx8" MACHINE_SOCARCH_SUFFIX:mx8dx-nxp-bsp = "-mx8" -MACHINE_SOCARCH_SUFFIX:mx8dxl-nxp-bsp = "-mx8dxl" +MACHINE_SOCARCH_SUFFIX:mx8dxl-nxp-bsp = "-mx8xl" # For Mainline we use a single SoC suffix as we don't have different build options MACHINE_SOCARCH_SUFFIX:imx-mainline-bsp = "-imx" -- cgit v1.2.3-54-g00ecf