Merge pull request #1487 from MaxKrummenacher/master-fw

imx: fw: allow to build for mainline bsp too
author: Otavio Salvador <otavio@ossystems.com.br> 2023-04-10 07:52:47 -0300
committer: GitHub <noreply@github.com> 2023-04-10 07:52:47 -0300
commit: 76525be515bc5ac9f2ed9b98d4fb0914246baf48 (patch)
tree: fae9c84ca74103d6b95dc7d56406c8e674bf0fed
parent: 590b812628414e7140aabfc04780cd27b2fc8c39 (diff)
parent: 93a4b871a83bb6921df3a5ab12b649daac85600b (diff)
download: meta-freescale-76525be515bc5ac9f2ed9b98d4fb0914246baf48.tar.gz
4 files changed, 15 insertions, 15 deletions
diff --git a/classes/use-imx-security-controller-firmware.bbclass b/classes/use-imx-security-controller-firmware.bbclass
index 9ae58fbc..d3a7de83 100644
--- a/classes/use-imx-security-controller-firmware.bbclass
+++ b/classes/use-imx-security-controller-firmware.bbclass
@@ -17,14 +17,14 @@
 # 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:mx8qm-generic-bsp  ?= "mx8qmb0-ahab-container.img"
-SECO_FIRMWARE_NAME:mx8qxp-nxp-bsp ?= \
+SECO_FIRMWARE_NAME:mx8qxp-generic-bsp ?= \
    "${@bb.utils.contains('MACHINE_FEATURES', 'soc-revb0', 'mx8qxb0-ahab-container.img', \
                                                           'mx8qxc0-ahab-container.img', d)}"
-SECO_FIRMWARE_NAME:mx8dx-nxp-bsp  ?= "mx8qxc0-ahab-container.img"
+SECO_FIRMWARE_NAME:mx8dx-generic-bsp  ?= "mx8qxc0-ahab-container.img"
-SECO_FIRMWARE_NAME:mx8dxl-nxp-bsp ?= "mx8dxla1-ahab-container.img"
+SECO_FIRMWARE_NAME:mx8dxl-generic-bsp ?= "mx8dxla1-ahab-container.img"
-SECO_FIRMWARE_NAME:mx8ulp-nxp-bsp ?= "mx8ulpa1-ahab-container.img"
+SECO_FIRMWARE_NAME:mx8ulp-generic-bsp ?= "mx8ulpa1-ahab-container.img"
-SECO_FIRMWARE_NAME:mx93-nxp-bsp   ?= "mx93a0-ahab-container.img"
+SECO_FIRMWARE_NAME:mx93-generic-bsp   ?= "mx93a0-ahab-container.img"
 python () {
    if "mx8m-generic-bsp" in d.getVar('MACHINEOVERRIDES').split(":"):
diff --git a/recipes-bsp/firmware-imx/firmware-imx-8_8.18.bb b/recipes-bsp/firmware-imx/firmware-imx-8_8.18.bb
index 72a3fb99..588d45ee 100644
--- a/recipes-bsp/firmware-imx/firmware-imx-8_8.18.bb
+++ b/recipes-bsp/firmware-imx/firmware-imx-8_8.18.bb
@@ -34,6 +34,6 @@ addtask deploy after do_install before do_build
 PACKAGE_ARCH = "${MACHINE_SOCARCH}"
-COMPATIBLE_MACHINE      = "(mx8-nxp-bsp|mx9-nxp-bsp)"
+COMPATIBLE_MACHINE      = "(mx8-generic-bsp|mx9-generic-bsp)"
-COMPATIBLE_MACHINE:mx8m-nxp-bsp = "(^$)"
+COMPATIBLE_MACHINE:mx8m-generic-bsp = "(^$)"
-COMPATIBLE_MACHINE:mx8x-nxp-bsp = "(^$)"
+COMPATIBLE_MACHINE:mx8x-generic-bsp = "(^$)"
diff --git a/recipes-bsp/imx-sc-firmware/imx-sc-firmware_1.15.0.bb b/recipes-bsp/imx-sc-firmware/imx-sc-firmware_1.15.0.bb
index 3273c270..7da55ddb 100644
--- a/recipes-bsp/imx-sc-firmware/imx-sc-firmware_1.15.0.bb
+++ b/recipes-bsp/imx-sc-firmware/imx-sc-firmware_1.15.0.bb
@@ -15,10 +15,10 @@ SRC_URI[sha256sum] = "1272ac5c31a88017ef548721f3acf930a7eda6ac73aa9f41b5f0cade9d
 BOARD_TYPE ?= "mek"
 SC_FIRMWARE_NAME ?= "INVALID"
-SC_FIRMWARE_NAME:mx8qm-nxp-bsp = "mx8qm-${BOARD_TYPE}-scfw-tcm.bin"
+SC_FIRMWARE_NAME:mx8qm-generic-bsp = "mx8qm-${BOARD_TYPE}-scfw-tcm.bin"
-SC_FIRMWARE_NAME:mx8qxp-nxp-bsp = "mx8qx-${BOARD_TYPE}-scfw-tcm.bin"
+SC_FIRMWARE_NAME:mx8qxp-generic-bsp = "mx8qx-${BOARD_TYPE}-scfw-tcm.bin"
-SC_FIRMWARE_NAME:mx8dxl-nxp-bsp = "mx8dxl-${BOARD_TYPE}-scfw-tcm.bin"
+SC_FIRMWARE_NAME:mx8dxl-generic-bsp = "mx8dxl-${BOARD_TYPE}-scfw-tcm.bin"
-SC_FIRMWARE_NAME:mx8dx-nxp-bsp = "mx8dx-${BOARD_TYPE}-scfw-tcm.bin"
+SC_FIRMWARE_NAME:mx8dx-generic-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-nxp-bsp|mx8qxp-nxp-bsp|mx8dxl-nxp-bsp|mx8dx-nxp-bsp)"
+COMPATIBLE_MACHINE = "(mx8qm-generic-bsp|mx8qxp-generic-bsp|mx8dxl-generic-bsp|mx8dx-generic-bsp)"
diff --git a/recipes-bsp/imx-seco/imx-seco_5.9.0.bb b/recipes-bsp/imx-seco/imx-seco_5.9.0.bb
index 712be23a..f7dadea5 100644
--- a/recipes-bsp/imx-seco/imx-seco_5.9.0.bb
+++ b/recipes-bsp/imx-seco/imx-seco_5.9.0.bb
@@ -24,4 +24,4 @@ do_deploy () {
    install -m 0644 ${S}/firmware/seco/${SECO_FIRMWARE_NAME} ${DEPLOYDIR}
 }
-COMPATIBLE_MACHINE = "(mx8qm-nxp-bsp|mx8qxp-nxp-bsp|mx8dxl-nxp-bsp|mx8dx-nxp-bsp)"
+COMPATIBLE_MACHINE = "(mx8qm-generic-bsp|mx8qxp-generic-bsp|mx8dxl-generic-bsp|mx8dx-generic-bsp)"
author	Otavio Salvador <otavio@ossystems.com.br>	2023-04-10 07:52:47 -0300
committer	GitHub <noreply@github.com>	2023-04-10 07:52:47 -0300
commit	76525be515bc5ac9f2ed9b98d4fb0914246baf48 (patch)
tree	fae9c84ca74103d6b95dc7d56406c8e674bf0fed
parent	590b812628414e7140aabfc04780cd27b2fc8c39 (diff)
parent	93a4b871a83bb6921df3a5ab12b649daac85600b (diff)
download	meta-freescale-76525be515bc5ac9f2ed9b98d4fb0914246baf48.tar.gz

diff --git a/classes/use-imx-security-controller-firmware.bbclass b/classes/use-imx-security-controller-firmware.bbclass index 9ae58fbc..d3a7de83 100644 --- a/classes/use-imx-security-controller-firmware.bbclass +++ b/classes/use-imx-security-controller-firmware.bbclass
@@ -17,14 +17,14 @@
17	# present in the image file have it properly defined.	17	# present in the image file have it properly defined.
18		18
19	SECO_FIRMWARE_NAME ?= ""	19	SECO_FIRMWARE_NAME ?= ""
20	SECO_FIRMWARE_NAME:mx8qm-nxp-bsp ?= "mx8qmb0-ahab-container.img"	20	SECO_FIRMWARE_NAME:mx8qm-generic-bsp ?= "mx8qmb0-ahab-container.img"
21	SECO_FIRMWARE_NAME:mx8qxp-nxp-bsp ?= \	21	SECO_FIRMWARE_NAME:mx8qxp-generic-bsp ?= \
22	"${@bb.utils.contains('MACHINE_FEATURES', 'soc-revb0', 'mx8qxb0-ahab-container.img', \	22	"${@bb.utils.contains('MACHINE_FEATURES', 'soc-revb0', 'mx8qxb0-ahab-container.img', \
23	'mx8qxc0-ahab-container.img', d)}"	23	'mx8qxc0-ahab-container.img', d)}"
24	SECO_FIRMWARE_NAME:mx8dx-nxp-bsp ?= "mx8qxc0-ahab-container.img"	24	SECO_FIRMWARE_NAME:mx8dx-generic-bsp ?= "mx8qxc0-ahab-container.img"
25	SECO_FIRMWARE_NAME:mx8dxl-nxp-bsp ?= "mx8dxla1-ahab-container.img"	25	SECO_FIRMWARE_NAME:mx8dxl-generic-bsp ?= "mx8dxla1-ahab-container.img"
26	SECO_FIRMWARE_NAME:mx8ulp-nxp-bsp ?= "mx8ulpa1-ahab-container.img"	26	SECO_FIRMWARE_NAME:mx8ulp-generic-bsp ?= "mx8ulpa1-ahab-container.img"
27	SECO_FIRMWARE_NAME:mx93-nxp-bsp ?= "mx93a0-ahab-container.img"	27	SECO_FIRMWARE_NAME:mx93-generic-bsp ?= "mx93a0-ahab-container.img"
28		28
29	python () {	29	python () {
30	if "mx8m-generic-bsp" in d.getVar('MACHINEOVERRIDES').split(":"):	30	if "mx8m-generic-bsp" in d.getVar('MACHINEOVERRIDES').split(":"):


diff --git a/recipes-bsp/firmware-imx/firmware-imx-8_8.18.bb b/recipes-bsp/firmware-imx/firmware-imx-8_8.18.bb index 72a3fb99..588d45ee 100644 --- a/recipes-bsp/firmware-imx/firmware-imx-8_8.18.bb +++ b/recipes-bsp/firmware-imx/firmware-imx-8_8.18.bb
@@ -34,6 +34,6 @@ addtask deploy after do_install before do_build
34		34
35	PACKAGE_ARCH = "${MACHINE_SOCARCH}"	35	PACKAGE_ARCH = "${MACHINE_SOCARCH}"
36		36
37	COMPATIBLE_MACHINE = "(mx8-nxp-bsp\|mx9-nxp-bsp)"	37	COMPATIBLE_MACHINE = "(mx8-generic-bsp\|mx9-generic-bsp)"
38	COMPATIBLE_MACHINE:mx8m-nxp-bsp = "(^$)"	38	COMPATIBLE_MACHINE:mx8m-generic-bsp = "(^$)"
39	COMPATIBLE_MACHINE:mx8x-nxp-bsp = "(^$)"	39	COMPATIBLE_MACHINE:mx8x-generic-bsp = "(^$)"


diff --git a/recipes-bsp/imx-sc-firmware/imx-sc-firmware_1.15.0.bb b/recipes-bsp/imx-sc-firmware/imx-sc-firmware_1.15.0.bb index 3273c270..7da55ddb 100644 --- a/recipes-bsp/imx-sc-firmware/imx-sc-firmware_1.15.0.bb +++ b/recipes-bsp/imx-sc-firmware/imx-sc-firmware_1.15.0.bb
@@ -15,10 +15,10 @@ SRC_URI[sha256sum] = "1272ac5c31a88017ef548721f3acf930a7eda6ac73aa9f41b5f0cade9d
15		15
16	BOARD_TYPE ?= "mek"	16	BOARD_TYPE ?= "mek"
17	SC_FIRMWARE_NAME ?= "INVALID"	17	SC_FIRMWARE_NAME ?= "INVALID"
18	SC_FIRMWARE_NAME:mx8qm-nxp-bsp = "mx8qm-${BOARD_TYPE}-scfw-tcm.bin"	18	SC_FIRMWARE_NAME:mx8qm-generic-bsp = "mx8qm-${BOARD_TYPE}-scfw-tcm.bin"
19	SC_FIRMWARE_NAME:mx8qxp-nxp-bsp = "mx8qx-${BOARD_TYPE}-scfw-tcm.bin"	19	SC_FIRMWARE_NAME:mx8qxp-generic-bsp = "mx8qx-${BOARD_TYPE}-scfw-tcm.bin"
20	SC_FIRMWARE_NAME:mx8dxl-nxp-bsp = "mx8dxl-${BOARD_TYPE}-scfw-tcm.bin"	20	SC_FIRMWARE_NAME:mx8dxl-generic-bsp = "mx8dxl-${BOARD_TYPE}-scfw-tcm.bin"
21	SC_FIRMWARE_NAME:mx8dx-nxp-bsp = "mx8dx-${BOARD_TYPE}-scfw-tcm.bin"	21	SC_FIRMWARE_NAME:mx8dx-generic-bsp = "mx8dx-${BOARD_TYPE}-scfw-tcm.bin"
22		22
23	symlink_name = "scfw_tcm.bin"	23	symlink_name = "scfw_tcm.bin"
24		24
@@ -38,4 +38,4 @@ INHIBIT_PACKAGE_STRIP = "1"
38	INHIBIT_PACKAGE_DEBUG_SPLIT = "1"	38	INHIBIT_PACKAGE_DEBUG_SPLIT = "1"
39	PACKAGE_ARCH = "${MACHINE_ARCH}"	39	PACKAGE_ARCH = "${MACHINE_ARCH}"
40		40
41	COMPATIBLE_MACHINE = "(mx8qm-nxp-bsp\|mx8qxp-nxp-bsp\|mx8dxl-nxp-bsp\|mx8dx-nxp-bsp)"	41	COMPATIBLE_MACHINE = "(mx8qm-generic-bsp\|mx8qxp-generic-bsp\|mx8dxl-generic-bsp\|mx8dx-generic-bsp)"


diff --git a/recipes-bsp/imx-seco/imx-seco_5.9.0.bb b/recipes-bsp/imx-seco/imx-seco_5.9.0.bb index 712be23a..f7dadea5 100644 --- a/recipes-bsp/imx-seco/imx-seco_5.9.0.bb +++ b/recipes-bsp/imx-seco/imx-seco_5.9.0.bb
@@ -24,4 +24,4 @@ do_deploy () {
24	install -m 0644 ${S}/firmware/seco/${SECO_FIRMWARE_NAME} ${DEPLOYDIR}	24	install -m 0644 ${S}/firmware/seco/${SECO_FIRMWARE_NAME} ${DEPLOYDIR}
25	}	25	}
26		26
27	COMPATIBLE_MACHINE = "(mx8qm-nxp-bsp\|mx8qxp-nxp-bsp\|mx8dxl-nxp-bsp\|mx8dx-nxp-bsp)"	27	COMPATIBLE_MACHINE = "(mx8qm-generic-bsp\|mx8qxp-generic-bsp\|mx8dxl-generic-bsp\|mx8dx-generic-bsp)"