Subject: [PATCH] ARM: imx: imx8mn-evk: change environment address variables

Currently the space between kernel_addr_r and the fdt_addr_r is only 32MB. To have enought

s/enought/enough/

space to load kernel images bigger than 32MB change the

variables to a feasible value.

The new environment variables layout is based on the scheme from "include/configs/ti_armv7_common.h".

The CONFIG_SYS_LOAD_ADDR value is set to 0x42000000. With that we have the same value as for the kernel_addr_r.

Signed-off-by: Heiko Thiery heiko.thiery@gmail.com

configs/imx8mn_ddr4_evk_defconfig | 2 +- configs/imx8mn_evk_defconfig | 2 +- include/configs/imx8mn_evk.h | 18 ++++++++++++++---- 3 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/configs/imx8mn_ddr4_evk_defconfig b/configs/imx8mn_ddr4_evk_defconfig index 27bf5ec05a..c13885ab5e 100644 --- a/configs/imx8mn_ddr4_evk_defconfig +++ b/configs/imx8mn_ddr4_evk_defconfig @@ -18,7 +18,7 @@ CONFIG_SPL_DRIVERS_MISC=y CONFIG_SPL=y CONFIG_SPL_IMX_ROMAPI_LOADADDR=0x48000000 CONFIG_DISTRO_DEFAULTS=y -CONFIG_SYS_LOAD_ADDR=0x40480000 +CONFIG_SYS_LOAD_ADDR=0x42000000 CONFIG_FIT=y CONFIG_FIT_EXTERNAL_OFFSET=0x3000 CONFIG_SPL_LOAD_FIT=y diff --git a/configs/imx8mn_evk_defconfig b/configs/imx8mn_evk_defconfig index 807d126b21..95ac6f85fa 100644 --- a/configs/imx8mn_evk_defconfig +++ b/configs/imx8mn_evk_defconfig @@ -20,7 +20,7 @@ CONFIG_SPL_DRIVERS_MISC=y CONFIG_SPL=y CONFIG_SPL_IMX_ROMAPI_LOADADDR=0x48000000 CONFIG_DISTRO_DEFAULTS=y -CONFIG_SYS_LOAD_ADDR=0x40480000 +CONFIG_SYS_LOAD_ADDR=0x42000000 CONFIG_FIT=y CONFIG_FIT_EXTERNAL_OFFSET=0x3000 CONFIG_SPL_LOAD_FIT=y diff --git a/include/configs/imx8mn_evk.h b/include/configs/imx8mn_evk.h index 142fc3e4ff..d51f87f57d 100644 --- a/include/configs/imx8mn_evk.h +++ b/include/configs/imx8mn_evk.h @@ -38,20 +38,30 @@ #include <config_distro_bootcmd.h> #endif

Empty line.

/* Initial environment variables */ +/* see include/configs/ti_armv7_common.h */ #define +ENV_MEM_LAYOUT_SETTINGS \

• "loadaddr=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \
• "kernel_addr_r=0x42000000\0" \
• "fdt_addr_r=0x48000000\0" \
• "fdtoverlay_addr_r=0x49000000\0" \
• "ramdisk_addr_r=0x48080000\0" \
• "initrd_addr=0x48080000\0" \
• "scriptaddr=0x40000000\0" \
• "pxefile_addr_r=0x40100000\0"

#define CONFIG_EXTRA_ENV_SETTINGS \ "image=Image\0" \ BOOTENV \

• "scriptaddr=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \
• "kernel_addr_r=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \ "console=ttymxc1,115200\0" \
• "fdt_addr_r=0x43000000\0" \ "boot_fit=no\0" \ "fdtfile=" CONFIG_DEFAULT_FDT_FILE "\0" \
• "initrd_addr=0x43800000\0" \ "bootm_size=0x10000000\0" \ "mmcpart=1\0" \ "mmcroot=" CONFIG_MMCROOT " rootwait rw\0" \

• ENV_MEM_LAYOUT_SETTINGS

Else: Reviewed-by: Peng Fan peng.fan@nxp.com

/* Link Definitions */

-- 2.30.2