colibri-imx8x: update env memory layout

Update the distro config env memory layout for the Colibri iMX8X:

- kernel_comp_addr_r=0xb0000000 temporary area for uncompressing (ie FIT
images or Image.gz booted using booti)
- kernel_comp_size=0x08000000
- loadaddr=0x95400000 avoiding any reserved areas located before that
- 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

Idea of memory layout taken from commit bf1c94c46d71
("apalis-imx8: update env memory layout").

Note that for our regular BSP Layers and Reference Images for Yocto
Project an updated distro boot script is required (see
meta-toradex-bsp-common/recipes-bsp/u-boot/u-boot-distro-boot).

Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
Signed-off-by: Andrejs Cainikovs <andrejs.cainikovs@toradex.com>

diff --git a/configs/colibri-imx8x_defconfig b/configs/colibri-imx8x_defconfig
index 24ccaa96dbfad18bd367d0db3b8f1c684ad47716..2269ba62cf921cbd48dd9b39aba6063999c4f414 100644 (file)
--- a/configs/colibri-imx8x_defconfig
+++ b/configs/colibri-imx8x_defconfig
@@ -12,7 +12,7 @@ CONFIG_DM_GPIO=y
 CONFIG_DEFAULT_DEVICE_TREE="fsl-imx8qxp-colibri"
 CONFIG_TARGET_COLIBRI_IMX8X=y
 CONFIG_SYS_PROMPT="Colibri iMX8X # "
-CONFIG_SYS_LOAD_ADDR=0x80280000
+CONFIG_SYS_LOAD_ADDR=0x95c00000
 CONFIG_SYS_MEMTEST_START=0x88000000
 CONFIG_SYS_MEMTEST_END=0x89000000
 CONFIG_REMAKE_ELF=y

diff --git a/include/configs/colibri-imx8x.h b/include/configs/colibri-imx8x.h
index b4814bdfbfcf034d24ad9637436074b43fa14409..750336b0eb66def4687cabdec8b7b37caf0de4fb 100644 (file)
--- a/include/configs/colibri-imx8x.h
+++ b/include/configs/colibri-imx8x.h
@@ -10,10 +10,12 @@
 #include <linux/sizes.h>
 
 #define MEM_LAYOUT_ENV_SETTINGS \
-       "fdt_addr_r=0x83000000\0" \
-       "kernel_addr_r=0x81000000\0" \
-       "ramdisk_addr_r=0x83800000\0" \
-       "scriptaddr=0x80800000\0"
+       "fdt_addr_r=0x9d400000\0" \
+       "kernel_addr_r=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \
+       "kernel_comp_addr_r=0xb0000000\0" \
+       "kernel_comp_size=0x08000000\0" \
+       "ramdisk_addr_r=0x9d500000\0" \
+       "scriptaddr=0x9d480000\0"
 
 /* Boot M4 */
 #define M4_BOOT_ENV \