From 1312a503462ae23b791265af03c588785768bb09 Mon Sep 17 00:00:00 2001 From: Ernest Van Hoecke Date: Tue, 18 Nov 2025 15:48:00 +0100 Subject: [PATCH] configs: colibri-imx7*: set 'fdtfile' generically in PREBOOT In TEZI (Toradex Easy Installer), we use one U-Boot binary for both our NAND and eMMC Colibri iMX7 modules. Currently, CONFIG_PREBOOT sets the environment variable 'fdtfile' depending on which defconfig was used, adding the '-emmc' variant for the emmc defconfig. Since we always build the TEZI recovery U-Boot with the standard (non-emmc) defconfig, fdtfile has to be overwritten later or it will be wrong there. By using '$variant', the fdtfile var is properly constructed at run time for both the NAND and eMMC variants, and we do not have to worry about setting fdtfile again when building the recovery TEZI U-Boot. This also synchronizes these configs with how we handle the iMX6ULL. Fixes: 327381e8b57c ("colibri_imx7: use preboot for fdtfile evaluation") Signed-off-by: Ernest Van Hoecke Reviewed-by: Francesco Dolcini --- configs/colibri_imx7_defconfig | 2 +- configs/colibri_imx7_emmc_defconfig | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/configs/colibri_imx7_defconfig b/configs/colibri_imx7_defconfig index 5a415120bea..2a3cb84c3b6 100644 --- a/configs/colibri_imx7_defconfig +++ b/configs/colibri_imx7_defconfig @@ -22,7 +22,7 @@ CONFIG_BOOTDELAY=1 CONFIG_OF_ENV_SETUP=y CONFIG_BOOTCOMMAND="run ubiboot ; echo ; echo ubiboot failed ; run distro_bootcmd;" CONFIG_USE_PREBOOT=y -CONFIG_PREBOOT="test -n ${fdtfile} || setenv fdtfile ${soc}-colibri-${fdt_board}.dtb " +CONFIG_PREBOOT="test -n ${fdtfile} || setenv fdtfile ${soc}-colibri${variant}-${fdt_board}.dtb " CONFIG_SYS_PBSIZE=544 CONFIG_SYS_CONSOLE_IS_IN_ENV=y # CONFIG_DISPLAY_BOARDINFO is not set diff --git a/configs/colibri_imx7_emmc_defconfig b/configs/colibri_imx7_emmc_defconfig index bae43fe45aa..a95a3214d0c 100644 --- a/configs/colibri_imx7_emmc_defconfig +++ b/configs/colibri_imx7_emmc_defconfig @@ -19,7 +19,7 @@ CONFIG_FIT_VERBOSE=y CONFIG_DISTRO_DEFAULTS=y CONFIG_BOOTDELAY=1 CONFIG_USE_PREBOOT=y -CONFIG_PREBOOT="test -n ${fdtfile} || setenv fdtfile ${soc}-colibri-emmc-${fdt_board}.dtb" +CONFIG_PREBOOT="test -n ${fdtfile} || setenv fdtfile ${soc}-colibri${variant}-${fdt_board}.dtb" CONFIG_SYS_PBSIZE=544 CONFIG_SYS_CONSOLE_IS_IN_ENV=y # CONFIG_DISPLAY_BOARDINFO is not set -- 2.47.3