ARM: imx: imx8mn-evk: change environment address variables
PATCH 1/1 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 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.
--- configs/imx8mn_ddr4_evk_defconfig | 2 +- configs/imx8mn_evk_defconfig | 2 +- include/configs/imx8mn_evk.h | 18 ++++++++++++++---- 3 files changed, 16 insertions(+), 6 deletions(-)
configs/imx8mn_ddr4_evk_defconfig +1 -1
@@ -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
configs/imx8mn_evk_defconfig +1 -1
@@ -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
include/configs/imx8mn_evk.h +14 -4
@@ -38,20 +38,30 @@#include <config_distro_bootcmd.h> #endif + +/* 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/* Link Definitions */
Signature · 1 line
2.30.2
Quoted 5 lines
Subject: [PATCH] ARM: imx: imx8mn-evk: change environment address variables
Currently the space between
kernel_addr_rand thefdt_addr_ris only 32MB. To have enought
s/enought/enough/
space to load kernel images bigger than 32MB change the
Quoted 45 lines
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_ADDRvalue is set to0x42000000. With that we have the same value as for thekernel_addr_r.Signed-off-by Heiko Thiery <[email protected]>--- configs/imx8mn_ddr4_evk_defconfig | 2 +- configs/imx8mn_evk_defconfig | 2 +- include/configs/imx8mn_evk.h | 18 ++++++++++++++---- 3 files changed, 16 insertions(+), 6 deletions(-)configs/imx8mn_ddr4_evk_defconfig +1
-1@@ -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=yconfigs/imx8mn_evk_defconfig +1
-1@@ -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=yinclude/configs/imx8mn_evk.h +0
-0
include/configs/imx8mn_evk.h line 42
Quoted 5 lines
include/configs/imx8mn_evk.h +2
-0@@ -38,20 +38,30 @@#include <config_distro_bootcmd.h> #endif + +
Empty line.
Quoted 16 lines
include/configs/imx8mn_evk.h +11
-1/* 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" \
include/configs/imx8mn_evk.h line 64
Quoted 10 lines
include/configs/imx8mn_evk.h +1
-3- "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:
Quoted 5 lines
include/configs/imx8mn_evk.h +0
-1/* Link Definitions */ --2.30.2