From c1c5780dc536f2d405f3c9bfafbaeebfc68801f7 Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Fri, 19 Mar 2021 18:51:30 -0300 Subject: Rework the u-boot-fslc and u-boot-imx settings logic We need to make it more obvious what is in use, when we support both bootloaders and for it we are now using the _pn suffix for both. This also fixes the WIC_FILE depending on the choice otherwise image build fails. Signed-off-by: Otavio Salvador --- conf/machine/include/imx8x-mek.inc | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'conf/machine/include/imx8x-mek.inc') diff --git a/conf/machine/include/imx8x-mek.inc b/conf/machine/include/imx8x-mek.inc index 490e00db..814a34c1 100644 --- a/conf/machine/include/imx8x-mek.inc +++ b/conf/machine/include/imx8x-mek.inc @@ -54,6 +54,11 @@ UBOOT_CONFIG[fspi] = "${UBOOT_CONFIG_BASENAME}_fspi_defconfig" IMX_BOOT_SEEK = "32" +# This machine is not supported by u-boot-fslc, so we force it to use +# u-boot-imx here. +IMX_DEFAULT_BOOTLOADER = "u-boot-imx" +UBOOT_SUFFIX = "bin" + # Set ATF platform name ATF_PLATFORM = "imx8qx" -- cgit v1.2.3-54-g00ecf