From dbd0f0ae908a6b287488707cfe9f2d464b9b02d5 Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Fri, 18 Feb 2022 21:49:11 -0300 Subject: [PATCH] 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 --- recipes-bsp/alsa-state/alsa-state.bbappend | 12 +++--------- .../{imx-nxp-bsp => imx-generic-bsp}/asound.conf | 0 .../{imx-nxp-bsp => imx-generic-bsp}/asound.state | 0 recipes-bsp/firmware-imx/firmware-imx_8.14.bb | 2 +- recipes-bsp/imx-kobs/imx-kobs_git.bb | 2 +- recipes-bsp/imx-test/imx-test_00.00.00.bb | 2 +- recipes-bsp/imx-uuc/imx-uuc_git.bb | 2 +- recipes-bsp/u-boot/u-boot-fslc_2022.01.bb | 2 +- recipes-devtools/uuu/uuu_git.bb | 2 +- .../packagegroups/packagegroup-fsl-mfgtool.bb | 2 +- recipes-kernel/linux/linux-fslc-lts_5.10.bb | 2 +- recipes-kernel/linux/linux-fslc_5.15.bb | 2 +- 12 files changed, 12 insertions(+), 18 deletions(-) rename recipes-bsp/alsa-state/alsa-state/{imx-nxp-bsp => imx-generic-bsp}/asound.conf (100%) rename recipes-bsp/alsa-state/alsa-state/{imx-nxp-bsp => imx-generic-bsp}/asound.state (100%) diff --git a/recipes-bsp/alsa-state/alsa-state.bbappend b/recipes-bsp/alsa-state/alsa-state.bbappend index 4d766139..b4b1eddf 100644 --- 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 5186a1a8..cfc98a73 100644 --- 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 a14c314e..f13299d0 100644 --- 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 2feb9b3a..1850a16a 100644 --- 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 3c66088b..6d7adf33 100644 --- 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 6f9a251b..ec5298b6 100644 --- 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 1868d9ae..caa349b2 100644 --- 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 04241420..d0367fdb 100644 --- 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 ab2ee4b7..4320280e 100644 --- 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 40d44b8b..23fc62ac 100644 --- 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)" -- 2.40.1