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/imx8dxl-evk.conf | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'conf/machine/imx8dxl-evk.conf') diff --git a/conf/machine/imx8dxl-evk.conf b/conf/machine/imx8dxl-evk.conf index 84ab5315..5d177aa3 100644 --- a/conf/machine/imx8dxl-evk.conf +++ b/conf/machine/imx8dxl-evk.conf @@ -37,8 +37,13 @@ KERNEL_DEVICETREE_append_use-nxp-bsp = " \ ATF_PLATFORM = "imx8dxl" IMX_BOOT_SOC_TARGET = "iMX8DXL" +# 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_MAKE_TARGET = "all" SPL_BINARY = "spl/u-boot-spl.bin" +UBOOT_SUFFIX = "bin" UBOOT_CONFIG ??= "sd" UBOOT_CONFIG[sd] = "imx8dxl_evk_defconfig,sdcard" -- cgit v1.2.3-54-g00ecf