From deac7549930f3bd747d7f23ecc7d2f0fc04fb642 Mon Sep 17 00:00:00 2001 From: Tom Hochstein Date: Mon, 1 Aug 2022 20:34:23 -0500 Subject: 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 (cherry picked from commit 15be26ce8c7e3f5a941601584923131682be45a8) --- conf/machine/imx8mq-evk.conf | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) 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 @@ #@DESCRIPTION: Machine configuration for NXP i.MX 8M Quad Evaluation Kit #@MAINTAINER: Jun Zhu -MACHINEOVERRIDES =. "imx-boot-container:mx8mq:" +MACHINEOVERRIDES =. "mx8mq:" + +# FIXME: u-boot-imx should be converted to `binman` and then we can +# avoid this specific overrides and handle it in a generic way. +MACHINEOVERRIDES =. "${@bb.utils.contains('IMX_DEFAULT_BOOTLOADER', 'u-boot-imx', '', 'imx-boot-container:', d)}" require conf/machine/include/imx-base.inc require conf/machine/include/arm/armv8a/tune-cortexa53.inc -- cgit v1.2.3-54-g00ecf