From: Ken Sloat Date: Tue, 11 Apr 2023 20:05:31 +0000 (-0400) Subject: board: freescale: imx93_evk: Fix MMC environment offset boot conflict. X-Git-Url: http://git.dujemihanovic.xyz/login.html?a=commitdiff_plain;h=dbdf4a06ec4994e1492ae5dbb691509adfb4ce5a;p=u-boot.git board: freescale: imx93_evk: Fix MMC environment offset boot conflict. Currently, the imx93_evk is configured with CONFIG_ENV_IS_IN_MMC and the chosen environment offset in the config is 0x400000. Unless the user programs the associated fuses, this offset is the default secondary boot image offset used by the i.MX 93 ROM bootloader. With certain combinations of environmental variables, the CRC and beginning of the environment can potentially falsely appear as a valid boot image container header. If the expected "sw_version" offset within this mistaken boot image container is greater than the primary's, the ROM bootloader can skip booting of the primary image altogether and attempt to boot with the content of the environment data. This will then hang the system. To fix this, move the environment from 0x400000 to 0x700000 reserving up to 3 MB at 0x400000 for any actual secondary user image container. Signed-off-by: Ken Sloat Reviewed-by: Peng Fan Reviewed-by: Fabio Estevam --- diff --git a/configs/imx93_11x11_evk_defconfig b/configs/imx93_11x11_evk_defconfig index 89edebc4c6..0de563f790 100644 --- a/configs/imx93_11x11_evk_defconfig +++ b/configs/imx93_11x11_evk_defconfig @@ -7,7 +7,7 @@ CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBGENERIC_SUPPORT=y CONFIG_NR_DRAM_BANKS=2 CONFIG_ENV_SIZE=0x4000 -CONFIG_ENV_OFFSET=0x400000 +CONFIG_ENV_OFFSET=0x700000 CONFIG_DM_GPIO=y CONFIG_DEFAULT_DEVICE_TREE="imx93-11x11-evk" CONFIG_SPL_TEXT_BASE=0x2049A000