summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTom Hochstein <tom.hochstein@nxp.com>2022-08-01 20:34:23 -0500
committergithub-actions[bot] <github-actions[bot]@users.noreply.github.com>2022-08-02 11:28:58 +0000
commitdeac7549930f3bd747d7f23ecc7d2f0fc04fb642 (patch)
treeac238166231f3c900825c781bbf9bf6b21808abf
parentd6273f7516d38a75347cd98cc1c0abf3fa1fcfdb (diff)
downloadmeta-freescale-deac7549930f3bd747d7f23ecc7d2f0fc04fb642.tar.gz
imx8mq-evk.conf: Extend fix for `u-boot-imx` and `u-boot-fslc`
Extend the recent fix to properly configure `imx-boot-container` machine overide. Extends: 1650359 Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com> (cherry picked from commit 15be26ce8c7e3f5a941601584923131682be45a8)
-rw-r--r--conf/machine/imx8mq-evk.conf6
1 files changed, 5 insertions, 1 deletions
diff --git a/conf/machine/imx8mq-evk.conf b/conf/machine/imx8mq-evk.conf
index a2a81f4c..ace29424 100644
--- a/conf/machine/imx8mq-evk.conf
+++ b/conf/machine/imx8mq-evk.conf
@@ -4,7 +4,11 @@
4#@DESCRIPTION: Machine configuration for NXP i.MX 8M Quad Evaluation Kit 4#@DESCRIPTION: Machine configuration for NXP i.MX 8M Quad Evaluation Kit
5#@MAINTAINER: Jun Zhu <junzhu@nxp.com> 5#@MAINTAINER: Jun Zhu <junzhu@nxp.com>
6 6
7MACHINEOVERRIDES =. "imx-boot-container:mx8mq:" 7MACHINEOVERRIDES =. "mx8mq:"
8
9# FIXME: u-boot-imx should be converted to `binman` and then we can
10# avoid this specific overrides and handle it in a generic way.
11MACHINEOVERRIDES =. "${@bb.utils.contains('IMX_DEFAULT_BOOTLOADER', 'u-boot-imx', '', 'imx-boot-container:', d)}"
8 12
9require conf/machine/include/imx-base.inc 13require conf/machine/include/imx-base.inc
10require conf/machine/include/arm/armv8a/tune-cortexa53.inc 14require conf/machine/include/arm/armv8a/tune-cortexa53.inc