aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcel Ziswiler2023-03-03 14:26:37 +0100
committerStefano Babic2023-03-30 10:52:34 +0200
commit2f7f6645b893405e0e2a5e48cdb87d2221b23d6a (patch)
tree13bf369b4da4061e09c5d823ee1a1c91f6b4dfb2
parentaa61f28b19448b1695de71f10db32775709a6d31 (diff)
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 a9f1e35bedc4 ("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>
-rw-r--r--configs/colibri-imx8x_defconfig2
-rw-r--r--include/configs/colibri-imx8x.h10
2 files changed, 7 insertions, 5 deletions
diff --git a/configs/colibri-imx8x_defconfig b/configs/colibri-imx8x_defconfig
index 24ccaa96dbf..2269ba62cf9 100644
--- 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 b4814bdfbfc..750336b0eb6 100644
--- 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 \