From 3a4927effd8e6c17c2fae03125e86a61b23a9c6f Mon Sep 17 00:00:00 2001 From: Max Krummenacher Date: Tue, 26 Apr 2022 09:26:25 +0200 Subject: imx-boot: don't restrict to the nxp bsp only Choosing if the boot container FIT image is built with imx-mkimage/ imx-boot or the U-Boot provided binman can be done with the imx-boot-container MACHINEOVERRIDES. Change the used overrides from *nxp-bsp to *generic-bsp. Signed-off-by: Max Krummenacher --- .../use-imx-security-controller-firmware.bbclass | 2 +- recipes-bsp/imx-mkimage/imx-boot_1.0.bb | 22 +++++++++++----------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/classes/use-imx-security-controller-firmware.bbclass b/classes/use-imx-security-controller-firmware.bbclass index dfd708e4..eb88fb99 100644 --- a/classes/use-imx-security-controller-firmware.bbclass +++ b/classes/use-imx-security-controller-firmware.bbclass @@ -25,7 +25,7 @@ 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(":"): + if "mx8m-generic-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') diff --git a/recipes-bsp/imx-mkimage/imx-boot_1.0.bb b/recipes-bsp/imx-mkimage/imx-boot_1.0.bb index 88689ead..4e1b860a 100644 --- a/recipes-bsp/imx-mkimage/imx-boot_1.0.bb +++ b/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-nxp-bsp = "firmware-imx-8m" -IMX_EXTRA_FIRMWARE:mx8x-nxp-bsp = "imx-sc-firmware imx-seco" +IMX_EXTRA_FIRMWARE:mx8m-generic-bsp = "firmware-imx-8m" +IMX_EXTRA_FIRMWARE:mx8x-generic-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-nxp-bsp = " u-boot-mkimage-native dtc-native" +DEPENDS:append:mx8m-generic-bsp = " u-boot-mkimage-native dtc-native" BOOT_NAME = "imx-boot" PROVIDES = "${BOOT_NAME}" @@ -61,19 +61,19 @@ IMXBOOT_TARGETS ?= \ 'flash_multi_cores flash_dcd', d), d)}" BOOT_STAGING = "${S}/${IMX_BOOT_SOC_TARGET}" -BOOT_STAGING:mx8m-nxp-bsp = "${S}/iMX8M" -BOOT_STAGING:mx8dx-nxp-bsp = "${S}/iMX8QX" +BOOT_STAGING:mx8m-generic-bsp = "${S}/iMX8M" +BOOT_STAGING:mx8dx-generic-bsp = "${S}/iMX8QX" SOC_FAMILY = "INVALID" -SOC_FAMILY:mx8-nxp-bsp = "mx8" -SOC_FAMILY:mx8m-nxp-bsp = "mx8m" -SOC_FAMILY:mx8x-nxp-bsp = "mx8x" +SOC_FAMILY:mx8-generic-bsp = "mx8" +SOC_FAMILY:mx8m-generic-bsp = "mx8m" +SOC_FAMILY:mx8x-generic-bsp = "mx8x" REV_OPTION ?= "" -REV_OPTION:mx8qxp-nxp-bsp = \ +REV_OPTION:mx8qxp-generic-bsp = \ "${@bb.utils.contains('MACHINE_FEATURES', 'soc-revb0', '', \ 'REV=C0', d)}" -REV_OPTION:mx8dx-nxp-bsp = "REV=C0" +REV_OPTION:mx8dx-generic-bsp = "REV=C0" compile_mx8m() { bbnote 8MQ/8MM/8MN/8MP boot binary build @@ -202,4 +202,4 @@ addtask deploy before do_build after do_compile PACKAGE_ARCH = "${MACHINE_ARCH}" FILES:${PN} = "/boot" -COMPATIBLE_MACHINE = "(mx8-nxp-bsp)" +COMPATIBLE_MACHINE = "(mx8-generic-bsp)" -- cgit v1.2.3-54-g00ecf