Rework recipes to use imx-generic-bsp more extensively

This rework the recipes making use of new imx-generic-bsp override; it
has been applied to:

 - alsa-state
 - firmware-imx
 - imx-kobs
 - imx-test
 - imx-uuc
 - linux-fslc
 - linux-fslc-lts
 - packagegroup-fsl-mfgtool
 - u-boot-fslc
 - uuu

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>

diff --git a/recipes-bsp/alsa-state/alsa-state.bbappend b/recipes-bsp/alsa-state/alsa-state.bbappend
index 4d7661397a2c5e9f3eb5dcdfe1bc70a629b47f07..b4b1eddf672fa1c740b2bca61fa5b73f0369690b 100644 (file)
--- a/recipes-bsp/alsa-state/alsa-state.bbappend
+++ b/recipes-bsp/alsa-state/alsa-state.bbappend
@@ -1,10 +1,4 @@
-# Append path for freescale layer to include alsa-state asound.conf
-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"
+FILESEXTRAPATHS:prepend:imx-generic-bsp := "${THISDIR}/${PN}/imx-generic-bsp:"
 
-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}"
+# Append path for freescale layer
+PACKAGE_ARCH:imx-generic-bsp = "${MACHINE_ARCH}"

diff --git a/recipes-bsp/alsa-state/alsa-state/imx-nxp-bsp/asound.conf b/recipes-bsp/alsa-state/alsa-state/imx-generic-bsp/asound.conf
similarity index 100%
rename from recipes-bsp/alsa-state/alsa-state/imx-nxp-bsp/asound.conf
rename to recipes-bsp/alsa-state/alsa-state/imx-generic-bsp/asound.conf

diff --git a/recipes-bsp/alsa-state/alsa-state/imx-nxp-bsp/asound.state b/recipes-bsp/alsa-state/alsa-state/imx-generic-bsp/asound.state
similarity index 100%
rename from recipes-bsp/alsa-state/alsa-state/imx-nxp-bsp/asound.state
rename to recipes-bsp/alsa-state/alsa-state/imx-generic-bsp/asound.state

diff --git a/recipes-bsp/firmware-imx/firmware-imx_8.14.bb b/recipes-bsp/firmware-imx/firmware-imx_8.14.bb
index 5186a1a8b3ac35e7646ee93bb9fe13a0fcbb68ae..cfc98a7332d66fd85932ded69a7f4fd8ffc7f762 100644 (file)
--- a/recipes-bsp/firmware-imx/firmware-imx_8.14.bb
+++ b/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-nxp-bsp|use-mainline-bsp)"
+COMPATIBLE_MACHINE = "(imx-generic-bsp)"

diff --git a/recipes-bsp/imx-kobs/imx-kobs_git.bb b/recipes-bsp/imx-kobs/imx-kobs_git.bb
index a14c314e3fc7570f2f746ee16da180fe2eadf15c..f13299d0c024972c6f7a2e3ae0251e6c0dbcd166 100644 (file)
--- a/recipes-bsp/imx-kobs/imx-kobs_git.bb
+++ b/recipes-bsp/imx-kobs/imx-kobs_git.bb
@@ -15,4 +15,4 @@ S = "${WORKDIR}/git"
 
 inherit autotools pkgconfig
 
-COMPATIBLE_MACHINE = "(imx-nxp-bsp|use-mainline-bsp)"
+COMPATIBLE_MACHINE = "(imx-generic-bsp)"

diff --git a/recipes-bsp/imx-test/imx-test_00.00.00.bb b/recipes-bsp/imx-test/imx-test_00.00.00.bb
index 2feb9b3a5d9e29eb16a41545240e1b2d850103d9..1850a16aebf820ffb76da7bc970b3f9dc2d753ef 100644 (file)
--- a/recipes-bsp/imx-test/imx-test_00.00.00.bb
+++ b/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-generic-bsp|mx5-generic-bsp|mx6-nxp-bsp|vf50-generic-bsp|vf60-generic-bsp)"
+COMPATIBLE_MACHINE = "(imx-generic-bsp)"

diff --git a/recipes-bsp/imx-uuc/imx-uuc_git.bb b/recipes-bsp/imx-uuc/imx-uuc_git.bb
index 3c66088bf563a0d4e3e852ca198d17215bb8ec08..6d7adf33ae9018e2774c37ee38a29d4b248fa5cd 100644 (file)
--- a/recipes-bsp/imx-uuc/imx-uuc_git.bb
+++ b/recipes-bsp/imx-uuc/imx-uuc_git.bb
@@ -18,4 +18,4 @@ S = "${WORKDIR}/git"
 
 FILES:${PN} += "/linuxrc /fat"
 
-COMPATIBLE_MACHINE = "(imx-nxp-bsp|use-mainline-bsp)"
+COMPATIBLE_MACHINE = "(imx-generic-bsp)"

diff --git a/recipes-bsp/u-boot/u-boot-fslc_2022.01.bb b/recipes-bsp/u-boot/u-boot-fslc_2022.01.bb
index 6f9a251b8780f7ade8641b5e041c2bbc8277ef4a..ec5298b67d9a3985f476972c775567bad532b378 100644 (file)
--- a/recipes-bsp/u-boot/u-boot-fslc_2022.01.bb
+++ b/recipes-bsp/u-boot/u-boot-fslc_2022.01.bb
@@ -28,4 +28,4 @@ EXTRA_OEMAKE += 'HOSTCC="${BUILD_CC} ${BUILD_CPPFLAGS}" \
                  HOSTSTRIP=true'
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
-COMPATIBLE_MACHINE = "(mxs-generic-bsp|mx5-generic-bsp|mx6-nxp-bsp|mx7-nxp-bsp|vf-generic-bsp|use-mainline-bsp)"
+COMPATIBLE_MACHINE = "(imx-generic-bsp)"

diff --git a/recipes-devtools/uuu/uuu_git.bb b/recipes-devtools/uuu/uuu_git.bb
index 1868d9ae93147f274e3d5e130db7089cc279002d..caa349b20a923e5cfcf7dc0dc5d26264e5e4c5e2 100644 (file)
--- a/recipes-devtools/uuu/uuu_git.bb
+++ b/recipes-devtools/uuu/uuu_git.bb
@@ -17,6 +17,6 @@ S = "${WORKDIR}/git"
 
 DEPENDS = "libusb zlib bzip2 openssl"
 
-COMPATIBLE_MACHINE   = "(imx-nxp-bsp)"
+COMPATIBLE_MACHINE   = "(imx-generic-bsp)"
 
 BBCLASSEXTEND = "native nativesdk"

diff --git a/recipes-fsl/packagegroups/packagegroup-fsl-mfgtool.bb b/recipes-fsl/packagegroups/packagegroup-fsl-mfgtool.bb
index 04241420b79df84b9751d41599688c7b42f5210d..d0367fdb78a0aa503be1b0ee1489243ca3b6b749 100644 (file)
--- a/recipes-fsl/packagegroups/packagegroup-fsl-mfgtool.bb
+++ b/recipes-fsl/packagegroups/packagegroup-fsl-mfgtool.bb
@@ -46,4 +46,4 @@ RDEPENDS:${PN}-extfs = " \
     e2fsprogs-mke2fs \
     e2fsprogs-e2fsck \
 "
-COMPATIBLE_MACHINE = "(imx-nxp-bsp|use-mainline-bsp)"
+COMPATIBLE_MACHINE = "(imx-generic-bsp)"

diff --git a/recipes-kernel/linux/linux-fslc-lts_5.10.bb b/recipes-kernel/linux/linux-fslc-lts_5.10.bb
index ab2ee4b7c76e48da560c3b94924caa731dc0eec4..4320280e369234e75f7feaf31416a52b04ddda5a 100644 (file)
--- a/recipes-kernel/linux/linux-fslc-lts_5.10.bb
+++ b/recipes-kernel/linux/linux-fslc-lts_5.10.bb
@@ -24,4 +24,4 @@ LINUX_VERSION = "5.10.93"
 KBRANCH = "5.10.x+fslc"
 SRCREV = "de6a8455baae279feddb56c99056aa075175cd68"
 
-COMPATIBLE_MACHINE = "(mxs-generic-bsp|mx5-generic-bsp|mx6-nxp-bsp|vf-generic-bsp|use-mainline-bsp)"
+COMPATIBLE_MACHINE = "(imx-generic-bsp)"

diff --git a/recipes-kernel/linux/linux-fslc_5.15.bb b/recipes-kernel/linux/linux-fslc_5.15.bb
index 40d44b8bdc8b747d77babe9084c8072789f1e2db..23fc62ac72f0768f3addab5581d1af12c211c610 100644 (file)
--- a/recipes-kernel/linux/linux-fslc_5.15.bb
+++ b/recipes-kernel/linux/linux-fslc_5.15.bb
@@ -24,4 +24,4 @@ LINUX_VERSION = "5.15.16"
 KBRANCH = "5.15.x+fslc"
 SRCREV = "d084d166324389d09f73d8f2e91b989d69432335"
 
-COMPATIBLE_MACHINE = "(mxs-generic-bsp|mx5-generic-bsp|mx6-nxp-bsp|vf-generic-bsp|use-mainline-bsp)"
+COMPATIBLE_MACHINE = "(imx-generic-bsp)"