Generalize overrides subsystem for NXP and Mainline support

Essentially, we extend the overrides to a generic-bsp, nxp-bsp, and
mainline-bsp.

So, for example, the mx8mq override is split into:

- imx-generic-bsp: compatible with every i.MX SoC and both BSP variants
- imx-nxp-bsp: compatible with every i.MX SoC but specific to NXP BSP
- imx-mainline-bsp: compatible with every i.MX SoC but specific to Mainline BSP

- mx8-generic-bsp: compatible with every i.MX8 SoC and both BSP variants
- mx8-nxp-bsp: compatible with every i.MX8 SoC but specific to NXP BSP
- mx8-mainline-bsp: compatible with every i.MX8 SoC but specific to Mainline BSP

- mx8m-generic-bsp: compatible with every i.MX8M SoC and both BSP variants
- mx8m-nxp-bsp: compatible with every i.MX8M SoC but specific to NXP BSP
- mx8m-mainline-bsp: compatible with every i.MX8M SoC but specific to Mainline BSP

- mx8mq-generic-bsp: compatible with every i.MX8MQ SoC and both BSP variants
- mx8mq-nxp-bsp: compatible with every i.MX8MQ SoC8 but specific to NXP BSP
- mx8mq-mainline-bsp: compatible with every i.MX8MQ SoC but specific to Mainline BSP

The extender mechanism is responsible for extending the override list to
include the generic overrides. We can then use the three different
variants to handle the metadata correctly.

Generically speaking, the conversion mainly was automated (with a lot of
back and forth until getting it right).

To convert an existing layer, the following script can be used:

```sh
  git ls-files classes recipes-* \
      | xargs sed -i \
              -e 's,:\(mx[6-8]\w*\),:\1-nxp-bsp,g' \
              -e 's,(\(mx[6-8]\w*\)),(\1-nxp-bsp),g' \
              -e 's,\(mx[6-8]\w*\)|,\1-nxp-bsp|,g' \
              -e 's,|\(mx[6-8]\w*\)),|\1-nxp-bsp),g' \
              \
              -e 's,:\(mx[5s]\w*\),:\1-generic-bsp,g' \
              -e 's,(\(mx[5s]\w*\)),(\1-generic-bsp),g' \
              -e 's,\(mx[5s]\w*\)|,\1-generic-bsp|,g' \
              -e 's,|\(mx[5s]\w*\)),|\1-generic-bsp),g' \
              \
              -e 's,:\(vf\w*\),:\1-generic-bsp,g' \
              -e 's,:\(vf[56]0\w*\),:\1-generic-bsp,g' \
              -e 's,\(vf\w*\)|,\1-generic-bsp|,g' \
              -e 's,|\(vf\w*\)),|\1-generic-bsp),g' \
              -e 's,\(vf[56]0\w*\)|,\1-generic-bsp|,g' \
              -e 's,|\(vf[56]0\w*\)),|\1-generic-bsp),g' \
              \
              -e 's,:\(imx\) ,:\1-nxp-bsp ,g' \
              -e 's,(\(imx\)),(\1-nxp-bsp),g' \
              -e 's,\(imx\)|,\1-nxp-bsp|,g' \
              -e 's,|\(imx\)),|\1-nxp-bsp),g'

  for d in $(find -type d | egrep '/mx[6-8]w*'); do
      git mv $d $d-nxp-bsp
  done

  for d in $(find -type d | egrep '/imx$'); do
      git mv $d $d-nxp-bsp
  done

  for d in $(find -type d | egrep '/mx[5s]w*'); do
      git mv $d $d-generic-bsp
  done
```

Fixes: #791.
Signed-off-by: Otavio Salvador <[email protected]>

classes/image_types_fsl.bbclass

@@ -37,7 +37,7 @@ do_image_wic[depends] += " \
 "
 
 # We need to apply a fixup inside of the partition table
-IMAGE_CMD:wic:append:mxs() {
+IMAGE_CMD:wic:append:mxs-generic-bsp() {
 	# Change partition type for mxs processor family
 	bbnote "Setting partition type to 0x53 as required for mxs' SoC family."
 	echo -n S | dd of=$out${IMAGE_NAME_SUFFIX}.wic bs=1 count=1 seek=450 conv=notrunc

classes/mfgtool-initramfs-image.bbclass

@@ -13,7 +13,7 @@ FEATURE_PACKAGES_extfs = "packagegroup-fsl-mfgtool-extfs"
 FEATURE_PACKAGES_f2fs = "packagegroup-fsl-mfgtool-f2fs"
 
 IMAGE_FSTYPES = "cpio.gz.u-boot"
-IMAGE_FSTYPES:mxs = "cpio.gz.u-boot"
+IMAGE_FSTYPES:mxs-generic-bsp = "cpio.gz.u-boot"
 IMAGE_ROOTFS_SIZE ?= "8192"
 
 # Filesystems enabled by default

classes/use-imx-headers.bbclass

@@ -13,14 +13,14 @@
 #
 # Copyright 2018 (C) O.S. Systems Software LTDA.
 
-DEPENDS:append:imx = " linux-imx-headers"
+DEPENDS:append:imx-nxp-bsp = " linux-imx-headers"
 
 # Set runtime dependency of -dev for package inheriting this class to
 # linux-imx-headers-dev package. This is required in order to propagate
 # headers into the SDK
 RDEPENDS:${PN}-dev += "linux-imx-headers-dev"
 
-PACKAGE_ARCH:imx ?= "${MACHINE_SOCARCH}"
+PACKAGE_ARCH:imx-nxp-bsp ?= "${MACHINE_SOCARCH}"
 
 STAGING_INCDIR_IMX = "${STAGING_INCDIR}/imx"
 

classes/use-imx-security-controller-firmware.bbclass

@@ -18,14 +18,14 @@
 
 SECO_FIRMWARE_NAME              ?= ""
 
-SECO_FIRMWARE_NAME:mx8qm         = "mx8qmb0-ahab-container.img"
-SECO_FIRMWARE_NAME:mx8qxp        = \
+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        = "mx8dxla1-ahab-container.img"
+SECO_FIRMWARE_NAME:mx8dxl-nxp-bsp        = "mx8dxla1-ahab-container.img"
 
 python () {
-    if "mx8m" in d.getVar('MACHINEOVERRIDES').split(":"):
+    if "mx8m-nxp-bsp" in d.getVar('MACHINEOVERRIDES').split(":"):
         return # We need to allow the recipes to be parsed for this case
 
     seco_firmware = d.getVar('SECO_FIRMWARE_NAME')

recipes-bsp/alsa-state/alsa-state.bbappend

@@ -1,10 +1,10 @@
 # Append path for freescale layer to include alsa-state asound.conf
-FILESEXTRAPATHS:prepend:mx6 := "${THISDIR}/${PN}/imx:"
-FILESEXTRAPATHS:prepend:mx7 := "${THISDIR}/${PN}/imx:"
-FILESEXTRAPATHS:prepend:mx8 := "${THISDIR}/${PN}/imx:"
-FILESEXTRAPATHS:prepend:use-mainline-bsp := "${THISDIR}/${PN}/imx:"
+FILESEXTRAPATHS:prepend:mx6-nxp-bsp := "${THISDIR}/${PN}/imx-nxp-bsp"
+FILESEXTRAPATHS:prepend:mx7-nxp-bsp := "${THISDIR}/${PN}/imx-nxp-bsp"
+FILESEXTRAPATHS:prepend:mx8-nxp-bsp := "${THISDIR}/${PN}/imx-nxp-bsp"
+FILESEXTRAPATHS:prepend:use-mainline-bsp := "${THISDIR}/${PN}/imx-nxp-bsp"
 
-PACKAGE_ARCH:mx6 = "${MACHINE_ARCH}"
-PACKAGE_ARCH:mx7 = "${MACHINE_ARCH}"
-PACKAGE_ARCH:mx8 = "${MACHINE_ARCH}"
+PACKAGE_ARCH:mx6-nxp-bsp = "${MACHINE_ARCH}"
+PACKAGE_ARCH:mx7-nxp-bsp = "${MACHINE_ARCH}"
+PACKAGE_ARCH:mx8-nxp-bsp = "${MACHINE_ARCH}"
 PACKAGE_ARCH:use-mainline-bsp = "${MACHINE_ARCH}"

recipes-bsp/firmware-imx/firmware-imx-8_8.14.bb

@@ -18,6 +18,6 @@ addtask deploy after do_install before do_build
 
 PACKAGE_ARCH = "${MACHINE_SOCARCH}"
 
-COMPATIBLE_MACHINE      = "(mx8)"
-COMPATIBLE_MACHINE:mx8m = "(^$)"
-COMPATIBLE_MACHINE:mx8x = "(^$)"
+COMPATIBLE_MACHINE      = "(mx8-nxp-bsp)"
+COMPATIBLE_MACHINE:mx8m-nxp-bsp = "(^$)"
+COMPATIBLE_MACHINE:mx8x-nxp-bsp = "(^$)"

recipes-bsp/firmware-imx/firmware-imx-8m_8.14.bb

@@ -21,4 +21,4 @@ addtask deploy after do_install before do_build
 
 PACKAGE_ARCH = "${MACHINE_SOCARCH}"
 
-COMPATIBLE_MACHINE = "(mx8m|imx-boot-container)"
+COMPATIBLE_MACHINE = "(mx8m-nxp-bsp|imx-boot-container)"

recipes-bsp/firmware-imx/firmware-imx_8.14.bb

@@ -129,4 +129,4 @@ FILES:${PN}-hdmi = " \
     ${nonarch_base_libdir}/firmware/dpfw.bin \
 "
 
-COMPATIBLE_MACHINE = "(imx|use-mainline-bsp)"
+COMPATIBLE_MACHINE = "(imx-nxp-bsp|use-mainline-bsp)"

recipes-bsp/imx-atf/imx-atf_2.4.bb

@@ -67,4 +67,4 @@ do_deploy() {
 addtask deploy after do_compile
 
 PACKAGE_ARCH = "${MACHINE_SOCARCH}"
-COMPATIBLE_MACHINE = "(mx8|imx-boot-container)"
+COMPATIBLE_MACHINE = "(mx8-nxp-bsp|imx-boot-container)"

recipes-bsp/imx-kobs/imx-kobs_git.bb

@@ -15,4 +15,4 @@ S = "${WORKDIR}/git"
 
 inherit autotools pkgconfig
 
-COMPATIBLE_MACHINE = "(imx|use-mainline-bsp)"
+COMPATIBLE_MACHINE = "(imx-nxp-bsp|use-mainline-bsp)"

recipes-bsp/imx-lib/imx-lib_git.bb

@@ -21,16 +21,16 @@ S = "${WORKDIR}/git"
 
 inherit use-imx-headers
 
-PLATFORM:mx6q  = "IMX6Q"
-PLATFORM:mx6dl = "IMX6Q"
-PLATFORM:mx6sl = "IMX6S"
-PLATFORM:mx6sll = "IMX6UL"
-PLATFORM:mx6sx = "IMX6S"
-PLATFORM:mx6ul = "IMX6UL"
-PLATFORM:mx6ull = "IMX6UL"
-PLATFORM:mx7d  = "IMX7"
-PLATFORM:mx7ulp = "IMX7"
-PLATFORM:mx8ulp = "IMX8ULP"
+PLATFORM:mx6q-nxp-bsp  = "IMX6Q"
+PLATFORM:mx6dl-nxp-bsp = "IMX6Q"
+PLATFORM:mx6sl-nxp-bsp = "IMX6S"
+PLATFORM:mx6sll-nxp-bsp = "IMX6UL"
+PLATFORM:mx6sx-nxp-bsp = "IMX6S"
+PLATFORM:mx6ul-nxp-bsp = "IMX6UL"
+PLATFORM:mx6ull-nxp-bsp = "IMX6UL"
+PLATFORM:mx7d-nxp-bsp  = "IMX7"
+PLATFORM:mx7ulp-nxp-bsp = "IMX7"
+PLATFORM:mx8ulp-nxp-bsp = "IMX8ULP"
 
 PARALLEL_MAKE="-j 1"
 EXTRA_OEMAKE = ""
@@ -47,4 +47,4 @@ do_install () {
     find ${D}/ -name *.go -exec rm {} \;
 }
 
-COMPATIBLE_MACHINE = "(mx6|mx7|mx8ulp)"
+COMPATIBLE_MACHINE = "(mx6-nxp-bsp|mx7-nxp-bsp|mx8ulp-nxp-bsp)"

recipes-bsp/imx-mkimage/imx-boot_1.0.bb

@@ -10,8 +10,8 @@ SECTION = "BSP"
 inherit use-imx-security-controller-firmware
 
 IMX_EXTRA_FIRMWARE      = "firmware-imx-8 imx-sc-firmware imx-seco"
-IMX_EXTRA_FIRMWARE:mx8m = "firmware-imx-8m"
-IMX_EXTRA_FIRMWARE:mx8x = "imx-sc-firmware imx-seco"
+IMX_EXTRA_FIRMWARE:mx8m-nxp-bsp = "firmware-imx-8m"
+IMX_EXTRA_FIRMWARE:mx8x-nxp-bsp = "imx-sc-firmware imx-seco"
 DEPENDS += " \
     u-boot \
     ${IMX_EXTRA_FIRMWARE} \
@@ -20,7 +20,7 @@ DEPENDS += " \
 "
 # xxd is a dependency of fspi_packer.sh
 DEPENDS += "xxd-native"
-DEPENDS:append:mx8m = " u-boot-mkimage-native dtc-native"
+DEPENDS:append:mx8m-nxp-bsp = " u-boot-mkimage-native dtc-native"
 BOOT_NAME = "imx-boot"
 PROVIDES = "${BOOT_NAME}"
 
@@ -61,16 +61,16 @@ IMXBOOT_TARGETS ?= \
                                                   'flash_multi_cores flash_dcd', d), d)}"
 
 BOOT_STAGING       = "${S}/${IMX_BOOT_SOC_TARGET}"
-BOOT_STAGING:mx8m  = "${S}/iMX8M"
-BOOT_STAGING:mx8dx = "${S}/iMX8QX"
+BOOT_STAGING:mx8m-nxp-bsp  = "${S}/iMX8M"
+BOOT_STAGING:mx8dx-nxp-bsp = "${S}/iMX8QX"
 
 SOC_FAMILY      = "INVALID"
-SOC_FAMILY:mx8  = "mx8"
-SOC_FAMILY:mx8m = "mx8m"
-SOC_FAMILY:mx8x = "mx8x"
+SOC_FAMILY:mx8-nxp-bsp  = "mx8"
+SOC_FAMILY:mx8m-nxp-bsp = "mx8m"
+SOC_FAMILY:mx8x-nxp-bsp = "mx8x"
 
 REV_OPTION ?= ""
-REV_OPTION:mx8qxp = \
+REV_OPTION:mx8qxp-nxp-bsp = \
     "${@bb.utils.contains('MACHINE_FEATURES', 'soc-revb0', '', \
                                                            'REV=C0', d)}"
 
@@ -201,4 +201,4 @@ addtask deploy before do_build after do_compile
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 FILES:${PN} = "/boot"
 
-COMPATIBLE_MACHINE = "(mx8)"
+COMPATIBLE_MACHINE = "(mx8-nxp-bsp)"

recipes-bsp/imx-sc-firmware/imx-sc-firmware_1.11.0.bb

@@ -15,10 +15,10 @@ SRC_URI[sha256sum] = "4ad2999088098c7d95837b7dc88adceda319c2102c8bdf55bf6e945365
 
 BOARD_TYPE ?= "mek"
 SC_FIRMWARE_NAME ?= "INVALID"
-SC_FIRMWARE_NAME:mx8qm = "mx8qm-${BOARD_TYPE}-scfw-tcm.bin"
-SC_FIRMWARE_NAME:mx8qxp = "mx8qx-${BOARD_TYPE}-scfw-tcm.bin"
-SC_FIRMWARE_NAME:mx8dxl = "mx8dxl-${BOARD_TYPE}-scfw-tcm.bin"
-SC_FIRMWARE_NAME:mx8dx = "mx8dx-${BOARD_TYPE}-scfw-tcm.bin"
+SC_FIRMWARE_NAME:mx8qm-nxp-bsp = "mx8qm-${BOARD_TYPE}-scfw-tcm.bin"
+SC_FIRMWARE_NAME:mx8qxp-nxp-bsp = "mx8qx-${BOARD_TYPE}-scfw-tcm.bin"
+SC_FIRMWARE_NAME:mx8dxl-nxp-bsp = "mx8dxl-${BOARD_TYPE}-scfw-tcm.bin"
+SC_FIRMWARE_NAME:mx8dx-nxp-bsp = "mx8dx-${BOARD_TYPE}-scfw-tcm.bin"
 
 symlink_name = "scfw_tcm.bin"
 
@@ -38,4 +38,4 @@ INHIBIT_PACKAGE_STRIP = "1"
 INHIBIT_PACKAGE_DEBUG_SPLIT = "1"
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
-COMPATIBLE_MACHINE = "(mx8qm|mx8qxp|mx8dxl|mx8dx)"
+COMPATIBLE_MACHINE = "(mx8qm-nxp-bsp|mx8qxp-nxp-bsp|mx8dxl-nxp-bsp|mx8dx-nxp-bsp)"

recipes-bsp/imx-seco/imx-seco-libs_git.bb

@@ -21,4 +21,4 @@ do_install () {
 	oe_runmake DESTDIR=${D} install
 }
 
-COMPATIBLE_MACHINE = "(mx8qm|mx8qxp|mx8dxl|mx8dx)"
+COMPATIBLE_MACHINE = "(mx8qm-nxp-bsp|mx8qxp-nxp-bsp|mx8dxl-nxp-bsp|mx8dx-nxp-bsp)"

recipes-bsp/imx-seco/imx-seco_3.8.4.bb

@@ -23,4 +23,4 @@ do_deploy () {
     install -m 0644 ${S}/firmware/seco/${SECO_FIRMWARE_NAME} ${DEPLOYDIR}
 }
 
-COMPATIBLE_MACHINE = "(mx8qm|mx8qxp|mx8dxl|mx8dx)"
+COMPATIBLE_MACHINE = "(mx8qm-nxp-bsp|mx8qxp-nxp-bsp|mx8dxl-nxp-bsp|mx8dx-nxp-bsp)"

recipes-bsp/imx-test/imx-test_00.00.00.bb

@@ -7,4 +7,4 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/MIT;md5=0835ad
 ALLOW_EMPTY:${PN} = "1"
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
-COMPATIBLE_MACHINE = "(mxs|mx5|mx6|vf50|vf60)"
+COMPATIBLE_MACHINE = "(mxs-generic-bsp|mx5-generic-bsp|mx6-nxp-bsp|vf50-generic-bsp|vf60-generic-bsp)"

recipes-bsp/imx-test/imx-test_git.bb

@@ -9,8 +9,8 @@ LICENSE = "GPLv2+"
 LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/GPL-2.0-or-later;md5=fed54355545ffd980b814dab4a3b312c"
 
 DEPENDS = "alsa-lib libdrm"
-DEPENDS:append:mx6 = " imx-lib"
-DEPENDS:append:mx7 = " imx-lib"
+DEPENDS:append:mx6-nxp-bsp = " imx-lib"
+DEPENDS:append:mx7-nxp-bsp = " imx-lib"
 DEPENDS:append:imxvpu = " virtual/imxvpu"
 
 PE = "1"
@@ -29,22 +29,22 @@ inherit module-base use-imx-headers
 INHIBIT_PACKAGE_STRIP = "1"
 INHIBIT_PACKAGE_DEBUG_SPLIT = "1"
 
-PLATFORM:mx6q  = "IMX6Q"
-PLATFORM:mx6dl = "IMX6Q"
-PLATFORM:mx6sl = "IMX6SL"
-PLATFORM:mx6sll = "IMX6SL"
-PLATFORM:mx6sx = "IMX6SX"
-PLATFORM:mx6ul = "IMX6UL"
-PLATFORM:mx7d  = "IMX7D"
-PLATFORM:mx7ulp = "IMX7D"
-PLATFORM:mx8 = "IMX8"
+PLATFORM:mx6q-nxp-bsp  = "IMX6Q"
+PLATFORM:mx6dl-nxp-bsp = "IMX6Q"
+PLATFORM:mx6sl-nxp-bsp = "IMX6SL"
+PLATFORM:mx6sll-nxp-bsp = "IMX6SL"
+PLATFORM:mx6sx-nxp-bsp = "IMX6SX"
+PLATFORM:mx6ul-nxp-bsp = "IMX6UL"
+PLATFORM:mx7d-nxp-bsp  = "IMX7D"
+PLATFORM:mx7ulp-nxp-bsp = "IMX7D"
+PLATFORM:mx8-nxp-bsp = "IMX8"
 
 PARALLEL_MAKE = "-j 1"
 EXTRA_OEMAKE += "${PACKAGECONFIG_CONFARGS}"
 
 PACKAGECONFIG = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}"
 PACKAGECONFIG:append:imxvpu = " vpu"
-PACKAGECONFIG:append:mx8m   = " swpdm"
+PACKAGECONFIG:append:mx8m-nxp-bsp   = " swpdm"
 
 PACKAGECONFIG[x11] = ",,libx11 libxdamage libxrender libxrandr"
 PACKAGECONFIG[vpu] = "HAS_VPU=true,HAS_VPU=false,virtual/imxvpu"

recipes-bsp/imx-uuc/imx-uuc_git.bb

@@ -18,4 +18,4 @@ S = "${WORKDIR}/git"
 
 FILES:${PN} += "/linuxrc /fat"
 
-COMPATIBLE_MACHINE = "(imx|use-mainline-bsp)"
+COMPATIBLE_MACHINE = "(imx-nxp-bsp|use-mainline-bsp)"

recipes-bsp/imx-vpu-hantro-vc/imx-vpu-hantro-vc_1.6.0.bb

@@ -32,4 +32,4 @@ do_install () {
 
 FILES:${PN} = "/"
 
-COMPATIBLE_MACHINE = "(mx8mp)"
+COMPATIBLE_MACHINE = "(mx8mp-nxp-bsp)"

recipes-bsp/imx-vpu-hantro/imx-vpu-hantro-daemon_1.1.1.bb

@@ -4,17 +4,17 @@ LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=cd8bc2a79509c22fc9c1782a151210b1"
 
 DEPENDS = "imx-vpu-hantro"
-DEPENDS:append:mx8mp = " imx-vpu-hantro-vc"
+DEPENDS:append:mx8mp-nxp-bsp = " imx-vpu-hantro-vc"
 
 SRC_URI = " \
     ${FSL_MIRROR}/${BP}.tar.gz \
 "
 SRC_URI[md5sum] = "99e96b2e00516d56a78a95a80851076b"
 SRC_URI[sha256sum] = "e7b3d55f72e233179b1b28c03628139b463d1994d140fed3c3e0796c66e917c8"
 
-PLATFORM:mx8mm = "IMX8MM"
-PLATFORM:mx8mq = "IMX8MQ"
-PLATFORM:mx8mp = "IMX8MP"
+PLATFORM:mx8mm-nxp-bsp = "IMX8MM"
+PLATFORM:mx8mq-nxp-bsp = "IMX8MQ"
+PLATFORM:mx8mp-nxp-bsp = "IMX8MP"
 
 EXTRA_OEMAKE = " \
     CROSS_COMPILE="${HOST_PREFIX}" \
@@ -28,4 +28,4 @@ do_install () {
 }
 
 PACKAGE_ARCH = "${MACHINE_SOCARCH}"
-COMPATIBLE_MACHINE = "(mx8mq|mx8mm|mx8mp)"
+COMPATIBLE_MACHINE = "(mx8mq-nxp-bsp|mx8mm-nxp-bsp|mx8mp-nxp-bsp)"

recipes-bsp/imx-vpu-hantro/imx-vpu-hantro_1.24.0.bb

@@ -14,9 +14,9 @@ inherit fsl-eula-unpack use-imx-headers
 
 PARALLEL_MAKE="-j 1"
 
-PLATFORM:mx8mm = "IMX8MM"
-PLATFORM:mx8mq = "IMX8MQ"
-PLATFORM:mx8mp = "IMX8MP"
+PLATFORM:mx8mm-nxp-bsp = "IMX8MM"
+PLATFORM:mx8mq-nxp-bsp = "IMX8MQ"
+PLATFORM:mx8mp-nxp-bsp = "IMX8MP"
 
 EXTRA_OEMAKE = " \
     CROSS_COMPILE="${HOST_PREFIX}" \
@@ -32,4 +32,4 @@ FILES:${PN} += "/unit_tests"
 
 RDEPENDS:${PN} += "imx-vpu-hantro-daemon"
 
-COMPATIBLE_MACHINE = "(mx8mq|mx8mm|mx8mp)"
+COMPATIBLE_MACHINE = "(mx8mq-nxp-bsp|mx8mm-nxp-bsp|mx8mp-nxp-bsp)"

recipes-bsp/imx-vpu/imx-vpu_5.4.39.3.bb

@@ -29,4 +29,4 @@ do_install() {
 }
 
 # Compatible only for i.MX with Chips&Media VPU
-COMPATIBLE_MACHINE = "(mx6q|mx6dl)"
+COMPATIBLE_MACHINE = "(mx6q-nxp-bsp|mx6dl-nxp-bsp)"

recipes-bsp/isp-imx/basler-camera_4.2.2.16.0.bb

@@ -24,4 +24,4 @@ SYSTEMD_AUTO_ENABLE = "enable"
 FILES:${PN} = "${libdir} /opt"
 INSANE_SKIP:${PN} = "file-rdeps already-stripped"
 
-COMPATIBLE_MACHINE = "(mx8mp)"
+COMPATIBLE_MACHINE = "(mx8mp-nxp-bsp)"

recipes-bsp/isp-imx/isp-imx_4.2.2.16.0.bb

@@ -88,4 +88,4 @@ INSANE_SKIP:${PN} = "rpaths"
 
 RDEPENDS:${PN} = "libdrm libpython3"
 
-COMPATIBLE_MACHINE = "(mx8mp)"
+COMPATIBLE_MACHINE = "(mx8mp-nxp-bsp)"

recipes-bsp/libimxdmabuffer/libimxdmabuffer_1.0.1.bb

@@ -32,9 +32,9 @@ PACKAGECONFIG ?= " "
 PACKAGECONFIG:append:imxgpu2d = " ${LIBG2D_PACKAGECONFIG}"
 PACKAGECONFIG:append:imxipu   = " ipu"
 PACKAGECONFIG:append:imxpxp   = " pxp"
-PACKAGECONFIG:append:mx8m     = " ion dwl"
-PACKAGECONFIG:append:mx8qm    = " ion"
-PACKAGECONFIG:append:mx8qxp   = " ion"
+PACKAGECONFIG:append:mx8m-nxp-bsp     = " ion dwl"
+PACKAGECONFIG:append:mx8qm-nxp-bsp    = " ion"
+PACKAGECONFIG:append:mx8qxp-nxp-bsp   = " ion"
 
 HANTRO_CONF = "--hantro-headers-path=${STAGING_INCDIR}/hantro_dec --hantro-decoder-version=G2"
 
@@ -51,4 +51,4 @@ do_install_ptest_base() {
     install -m 0755 ${B}/test-alloc ${D}${PTEST_PATH}
 }
 
-COMPATIBLE_MACHINE = "(mx6|mx7|mx8)"
+COMPATIBLE_MACHINE = "(mx6-nxp-bsp|mx7-nxp-bsp|mx8-nxp-bsp)"

recipes-bsp/u-boot/u-boot-fslc-mxsboot_2022.01.bb

@@ -27,6 +27,6 @@ do_install () {
     ln -sf uboot-mxsboot ${D}${bindir}/mxsboot
 }
 
-COMPATIBLE_MACHINE:class-target = "(mxs|mx5|mx6|mx7|vf|use-mainline-bsp)"
+COMPATIBLE_MACHINE:class-target = "(mxs-generic-bsp|mx5-generic-bsp|mx6-nxp-bsp|mx7-nxp-bsp|vf-generic-bsp|use-mainline-bsp)"
 
 BBCLASSEXTEND = "native nativesdk"

recipes-bsp/u-boot/u-boot-fslc_2022.01.bb

@@ -12,7 +12,7 @@ DEPENDS += "bc-native dtc-native python3-setuptools-native lzop-native"
 
 # Location known to imx-boot component, where U-Boot artifacts
 # should be additionally deployed.
-# See below note above do_deploy:append:mx8m for the purpose of
+# See below note above do_deploy:append:mx8m-nxp-bsp for the purpose of
 # this delopyment location
 BOOT_TOOLS = "imx-boot-tools"
 
@@ -28,4 +28,4 @@ EXTRA_OEMAKE += 'HOSTCC="${BUILD_CC} ${BUILD_CPPFLAGS}" \
                  HOSTSTRIP=true'
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
-COMPATIBLE_MACHINE = "(mxs|mx5|mx6|mx7|vf|use-mainline-bsp)"
+COMPATIBLE_MACHINE = "(mxs-generic-bsp|mx5-generic-bsp|mx6-nxp-bsp|mx7-nxp-bsp|vf-generic-bsp|use-mainline-bsp)"

recipes-bsp/u-boot/u-boot-imx-mfgtool_2021.04.bb

@@ -8,5 +8,5 @@ require u-boot-imx_${PV}.bb
 require u-boot-mfgtool.inc
 
 UUU_BOOTLOADER_TAGGED     = ""
-UUU_BOOTLOADER_TAGGED:mx6 = "u-boot-mfgtool-tagged.${UBOOT_SUFFIX}"
-UUU_BOOTLOADER_TAGGED:mx7 = "u-boot-mfgtool-tagged.${UBOOT_SUFFIX}"
+UUU_BOOTLOADER_TAGGED:mx6-nxp-bsp = "u-boot-mfgtool-tagged.${UBOOT_SUFFIX}"
+UUU_BOOTLOADER_TAGGED:mx7-nxp-bsp = "u-boot-mfgtool-tagged.${UBOOT_SUFFIX}"