aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Harvey <tharvey@gateworks.com>2022-04-13 08:25:10 -0700
committerStefano Babic <sbabic@denx.de>2022-04-21 12:44:23 +0200
commitfd5c7173ade4ea35370741aa38aab93215cdb546 (patch)
tree509a1e05346627cb2298c2750fd4d21492d87377
parent3f7d518accc6f44fccba18f9d091c8f51cf5b6b7 (diff)
downloadu-boot-fd5c7173ade4ea35370741aa38aab93215cdb546.zip
u-boot-fd5c7173ade4ea35370741aa38aab93215cdb546.tar.gz
u-boot-fd5c7173ade4ea35370741aa38aab93215cdb546.tar.bz2
imx8m{m,n}_venice: update env memory layout
Update distro config env memory layout: - loadaddr=0x48200000 allows for 130MB area for uncompressing (ie FIT images, kernel_comp_addr_r) - fdt_addr_r = loadaddr + 128MB - allows for 128MB kernel - scriptaddr = fdt_addr_r + 512KB - allows for 512KB fdt - ramdisk_addr_r = scriptaddr + 512KB - allows for 512KB script Signed-off-by: Tim Harvey <tharvey@gateworks.com> Reviewed-by: Fabio Estevam <festevam@denx.de>
-rw-r--r--configs/imx8mm_venice_defconfig2
-rw-r--r--configs/imx8mn_venice_defconfig2
-rw-r--r--include/configs/imx8mm_venice.h9
-rw-r--r--include/configs/imx8mn_venice.h9
4 files changed, 12 insertions, 10 deletions
diff --git a/configs/imx8mm_venice_defconfig b/configs/imx8mm_venice_defconfig
index 7e6bb68..c68c150 100644
--- a/configs/imx8mm_venice_defconfig
+++ b/configs/imx8mm_venice_defconfig
@@ -16,7 +16,7 @@ CONFIG_SPL_SERIAL=y
CONFIG_SPL_DRIVERS_MISC=y
CONFIG_SPL=y
CONFIG_ENV_OFFSET_REDUND=0xff8000
-CONFIG_SYS_LOAD_ADDR=0x40480000
+CONFIG_SYS_LOAD_ADDR=0x48200000
CONFIG_SYS_MEMTEST_START=0x40000000
CONFIG_SYS_MEMTEST_END=0x80000000
CONFIG_LTO=y
diff --git a/configs/imx8mn_venice_defconfig b/configs/imx8mn_venice_defconfig
index 02d79fb..72e8f3e 100644
--- a/configs/imx8mn_venice_defconfig
+++ b/configs/imx8mn_venice_defconfig
@@ -16,7 +16,7 @@ CONFIG_SPL_SERIAL=y
CONFIG_SPL=y
CONFIG_ENV_OFFSET_REDUND=0xff8000
CONFIG_SPL_IMX_ROMAPI_LOADADDR=0x48000000
-CONFIG_SYS_LOAD_ADDR=0x40480000
+CONFIG_SYS_LOAD_ADDR=0x48200000
CONFIG_SYS_MEMTEST_START=0x40000000
CONFIG_SYS_MEMTEST_END=0x80000000
CONFIG_LTO=y
diff --git a/include/configs/imx8mm_venice.h b/include/configs/imx8mm_venice.h
index eee59a4..4b7dcf3 100644
--- a/include/configs/imx8mm_venice.h
+++ b/include/configs/imx8mm_venice.h
@@ -29,10 +29,11 @@
#endif
#define MEM_LAYOUT_ENV_SETTINGS \
- "fdt_addr_r=0x44000000\0" \
- "kernel_addr_r=0x42000000\0" \
- "ramdisk_addr_r=0x46400000\0" \
- "scriptaddr=0x46000000\0"
+ "kernel_addr_r=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \
+ "fdt_addr_r=0x50200000\0" \
+ "scriptaddr=0x50280000\0" \
+ "ramdisk_addr_r=0x50300000\0" \
+ "kernel_comp_addr_r=0x40200000\0"
/* Enable Distro Boot */
#ifndef CONFIG_SPL_BUILD
diff --git a/include/configs/imx8mn_venice.h b/include/configs/imx8mn_venice.h
index d977d32..d59a739 100644
--- a/include/configs/imx8mn_venice.h
+++ b/include/configs/imx8mn_venice.h
@@ -26,10 +26,11 @@
#endif
#define MEM_LAYOUT_ENV_SETTINGS \
- "fdt_addr_r=0x44000000\0" \
- "kernel_addr_r=0x42000000\0" \
- "ramdisk_addr_r=0x46400000\0" \
- "scriptaddr=0x46000000\0"
+ "kernel_addr_r=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \
+ "fdt_addr_r=0x50200000\0" \
+ "scriptaddr=0x50280000\0" \
+ "ramdisk_addr_r=0x50300000\0" \
+ "kernel_comp_addr_r=0x40200000\0"
/* Enable Distro Boot */
#ifndef CONFIG_SPL_BUILD