aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSamuli Piippo <samuli.piippo@qt.io>2022-02-28 14:13:35 +0000
committerSamuli Piippo <samuli.piippo@qt.io>2022-03-04 06:42:12 +0000
commite02204f8f39f3bb1f19a5d5d44b6d897b6284baf (patch)
treec8676a5a821b787b5efcca542f9c3a177d5e0d6a
parentf291ba305e421b95e4f27e87aaf51256cad815b8 (diff)
nxp: update imx overrides
meta-freescale layer has updated the machine overrides and because it's using special override extender we have to add extra include file to set the MACHINE_FAMILY correctly. Change-Id: I303960882fa117a055ba27ec0ac0ada063af61dc Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
-rw-r--r--meta-boot2qt-distro/conf/distro/include/machine-settings.inc1
-rw-r--r--meta-boot2qt-distro/conf/machine/include/imx-base-extend.inc1
-rw-r--r--meta-boot2qt-distro/dynamic-layers/toradex-nxp-layer/recipes-qt/boot2qt-addons/qbsp-readme/mx8-generic-bsp/README (renamed from meta-boot2qt-distro/dynamic-layers/toradex-nxp-layer/recipes-qt/boot2qt-addons/qbsp-readme/mx8/README)0
3 files changed, 1 insertions, 1 deletions
diff --git a/meta-boot2qt-distro/conf/distro/include/machine-settings.inc b/meta-boot2qt-distro/conf/distro/include/machine-settings.inc
index 681a2733..9f123fb9 100644
--- a/meta-boot2qt-distro/conf/distro/include/machine-settings.inc
+++ b/meta-boot2qt-distro/conf/distro/include/machine-settings.inc
@@ -28,7 +28,6 @@
############################################################################
MACHINE_FAMILY ??= "empty"
-MACHINE_FAMILY:imx = "fsl"
MACHINE_FAMILY:intel-x86-common = "intel"
MACHINE_FAMILY:qemuall = "qemu"
MACHINE_FAMILY:rpi = "raspberrypi"
diff --git a/meta-boot2qt-distro/conf/machine/include/imx-base-extend.inc b/meta-boot2qt-distro/conf/machine/include/imx-base-extend.inc
new file mode 100644
index 00000000..258e5efa
--- /dev/null
+++ b/meta-boot2qt-distro/conf/machine/include/imx-base-extend.inc
@@ -0,0 +1 @@
+MACHINE_FAMILY = "fsl"
diff --git a/meta-boot2qt-distro/dynamic-layers/toradex-nxp-layer/recipes-qt/boot2qt-addons/qbsp-readme/mx8/README b/meta-boot2qt-distro/dynamic-layers/toradex-nxp-layer/recipes-qt/boot2qt-addons/qbsp-readme/mx8-generic-bsp/README
index b1f8b744..b1f8b744 100644
--- a/meta-boot2qt-distro/dynamic-layers/toradex-nxp-layer/recipes-qt/boot2qt-addons/qbsp-readme/mx8/README
+++ b/meta-boot2qt-distro/dynamic-layers/toradex-nxp-layer/recipes-qt/boot2qt-addons/qbsp-readme/mx8-generic-bsp/README