From 3ca0553a458cd40711b0e8cb895ed9c57a43e4fc Mon Sep 17 00:00:00 2001 From: Daniel Drake Date: Thu, 29 Oct 2026 11:51:06 +0000 Subject: machine/imx93-evk: Allow mainline BSP to be selected The i.MX 93 machine include sets IMX_DEFAULT_BSP = "nxp" in a way that overrides the "mainline" default in imx-base.inc, and also overrides any user preference selected by e.g. enabling the bsp/fslc fragment. This is despite some level of mainline support being available. Instead of the hard override, make "nxp" a soft default, which allows mainline to be selected if desired. Signed-off-by: Daniel Drake --- conf/machine/include/imx93-evk.inc | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/conf/machine/include/imx93-evk.inc b/conf/machine/include/imx93-evk.inc index 9e9108d99..18f7fc293 100644 --- a/conf/machine/include/imx93-evk.inc +++ b/conf/machine/include/imx93-evk.inc @@ -1,5 +1,9 @@ MACHINEOVERRIDES =. "mx93:" +# To avoid unexpected changes for existing users, maintain the historical +# default of the vendor BSP, despite mainline support being available. +IMX_DEFAULT_BSP ?= "nxp" + require conf/machine/include/imx-base.inc require conf/machine/include/arm/armv8-2a/tune-cortexa55.inc @@ -49,5 +53,3 @@ IMX_BOOT_SEEK = "32" # We have to disable SERIAL_CONSOLE due to auto-serial-console SERIAL_CONSOLES = "115200;ttyLP0" - -IMX_DEFAULT_BSP = "nxp" -- cgit v1.2.3-54-g00ecf