apalis/colibri_imx6/-imx6ull/_imx7: update env memory layout

Update the distro config env memory layout for the Apalis iMX6,
Colibri iMX6, Colibri iMX6ULL and Colibri iMX7:

- loadaddr=0x84200000 (resp. 0x14200000 on them i.MX 6) allows for 64MB
  area for uncompressing (ie FIT images)
- fdt_addr_r = loadaddr + 64MB : allows for 64MB kernel
- scriptaddr = fdt_addr_r + 512KB : allows for 512KB fdt
- pxefile_addr_r = scriptaddr + 512KB : allows for 512KB script
- ramdisk_addr_r = pxefile_addr_r + 512KB : allows for 1MB extlinux.conf

Memory layout analogous to 64-bit one from commit fd5c7173ade4
("imx8m{m,n}_venice: update env memory layout") but left pxefile_addr_r
updated according to doc/develop/distro.rst.

This fixes a potential issue caused by the compressed kernel being
relocated on top of the ramdisk causing its corruption.

Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>

diff --git a/configs/apalis_imx6_defconfig b/configs/apalis_imx6_defconfig
index 5960aef698fdc65b974a29d6ccfbfd587f26f89a..2689e8d9846a478ee49fc355120fe80334bcb99e 100644 (file)
--- a/configs/apalis_imx6_defconfig
+++ b/configs/apalis_imx6_defconfig
@@ -22,6 +22,7 @@ CONFIG_SPL_MMC=y
 CONFIG_SPL_SERIAL=y
 CONFIG_SPL=y
 CONFIG_CMD_HDMIDETECT=y
+CONFIG_SYS_LOAD_ADDR=0x14200000
 CONFIG_AHCI=y
 CONFIG_SYS_MEMTEST_START=0x10000000
 CONFIG_SYS_MEMTEST_END=0x10010000

diff --git a/configs/colibri-imx6ull-emmc_defconfig b/configs/colibri-imx6ull-emmc_defconfig
index e6ed9b5fd0f3254365dbcad57b07aa060a5104ff..02b6be0a2b4a2815172bf8fb1a55ce585f076e03 100644 (file)
--- a/configs/colibri-imx6ull-emmc_defconfig
+++ b/configs/colibri-imx6ull-emmc_defconfig
@@ -10,6 +10,7 @@ CONFIG_DM_GPIO=y
 CONFIG_TARGET_COLIBRI_IMX6ULL_EMMC=y
 CONFIG_DEFAULT_DEVICE_TREE="imx6ull-colibri-emmc-eval-v3"
 CONFIG_SYS_PROMPT="Colibri iMX6ULL # "
+CONFIG_SYS_LOAD_ADDR=0x84200000
 CONFIG_SYS_MEMTEST_START=0x80000000
 CONFIG_SYS_MEMTEST_END=0x88000000
 CONFIG_DISTRO_DEFAULTS=y

diff --git a/configs/colibri-imx6ull_defconfig b/configs/colibri-imx6ull_defconfig
index d65f2533ca2c4be7c80ccfee336ea074678c733a..cc0a3473941a8045d644e1fa35cf6566d21f70ad 100644 (file)
--- a/configs/colibri-imx6ull_defconfig
+++ b/configs/colibri-imx6ull_defconfig
@@ -11,6 +11,7 @@ CONFIG_DM_GPIO=y
 CONFIG_TARGET_COLIBRI_IMX6ULL_NAND=y
 CONFIG_DEFAULT_DEVICE_TREE="imx6ull-colibri-eval-v3"
 CONFIG_SYS_PROMPT="Colibri iMX6ULL # "
+CONFIG_SYS_LOAD_ADDR=0x84200000
 CONFIG_SYS_MEMTEST_START=0x80000000
 CONFIG_SYS_MEMTEST_END=0x88000000
 CONFIG_DISTRO_DEFAULTS=y

diff --git a/configs/colibri_imx6_defconfig b/configs/colibri_imx6_defconfig
index 5cf398b09e25a690465ab92f50dda047066f74ba..135095b275dbd62ad3ab9c7fb7d2cdb7b2e30ef3 100644 (file)
--- a/configs/colibri_imx6_defconfig
+++ b/configs/colibri_imx6_defconfig
@@ -22,6 +22,7 @@ CONFIG_SPL_MMC=y
 CONFIG_SPL_SERIAL=y
 CONFIG_SPL=y
 CONFIG_CMD_HDMIDETECT=y
+CONFIG_SYS_LOAD_ADDR=0x14200000
 CONFIG_SYS_MEMTEST_START=0x10000000
 CONFIG_SYS_MEMTEST_END=0x10010000
 CONFIG_DISTRO_DEFAULTS=y

diff --git a/configs/colibri_imx7_defconfig b/configs/colibri_imx7_defconfig
index dfdb74f69b0d547deb7a47f1b10eb2ad1515739c..28872639b61b526c2c012ed669a06998c67ebd23 100644 (file)
--- a/configs/colibri_imx7_defconfig
+++ b/configs/colibri_imx7_defconfig
@@ -11,6 +11,7 @@ CONFIG_SYS_PROMPT="Colibri iMX7 # "
 CONFIG_IMX_RDC=y
 CONFIG_IMX_BOOTAUX=y
 CONFIG_IMX_HAB=y
+CONFIG_SYS_LOAD_ADDR=0x84200000
 CONFIG_OF_BOARD_FIXUP=y
 CONFIG_SYS_MEMTEST_START=0x80000000
 CONFIG_SYS_MEMTEST_END=0x8c000000

diff --git a/configs/colibri_imx7_emmc_defconfig b/configs/colibri_imx7_emmc_defconfig
index 033ce1747bf264bc3a48c304bd71fc50a1fd5aa8..c12717b4f250846b718981ddfd29e3e5d0219022 100644 (file)
--- a/configs/colibri_imx7_emmc_defconfig
+++ b/configs/colibri_imx7_emmc_defconfig
@@ -12,6 +12,7 @@ CONFIG_ARMV7_BOOT_SEC_DEFAULT=y
 CONFIG_IMX_RDC=y
 CONFIG_IMX_BOOTAUX=y
 CONFIG_IMX_HAB=y
+CONFIG_SYS_LOAD_ADDR=0x84200000
 CONFIG_SYS_MEMTEST_START=0x80000000
 CONFIG_SYS_MEMTEST_END=0x8c000000
 CONFIG_DISTRO_DEFAULTS=y

diff --git a/include/configs/apalis_imx6.h b/include/configs/apalis_imx6.h
index 4922b063309e2c5d7b4aaa4d9d319236fd24452b..8f3389434757c975ab5a4bb2dc8acac613de6853 100644 (file)
--- a/include/configs/apalis_imx6.h
+++ b/include/configs/apalis_imx6.h
@@ -70,11 +70,11 @@
 
 #define MEM_LAYOUT_ENV_SETTINGS \
        "bootm_size=0x20000000\0" \
-       "fdt_addr_r=0x12100000\0" \
-       "kernel_addr_r=0x11000000\0" \
-       "pxefile_addr_r=0x17100000\0" \
-       "ramdisk_addr_r=0x12200000\0" \
-       "scriptaddr=0x17000000\0"
+       "fdt_addr_r=0x18200000\0" \
+       "kernel_addr_r=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \
+       "pxefile_addr_r=0x18300000\0" \
+       "ramdisk_addr_r=0x18400000\0" \
+       "scriptaddr=0x18280000\0"
 
 #define CONFIG_EXTRA_ENV_SETTINGS \
        BOOTENV \

diff --git a/include/configs/colibri-imx6ull.h b/include/configs/colibri-imx6ull.h
index 04cde9530adba8393954304956b9b43801b167c8..79b1284cc7a94a5bc74c3b16bcb85582f99d6e03 100644 (file)
--- a/include/configs/colibri-imx6ull.h
+++ b/include/configs/colibri-imx6ull.h
@@ -43,11 +43,11 @@
 
 #define MEM_LAYOUT_ENV_SETTINGS \
        "bootm_size=0x10000000\0" \
-       "fdt_addr_r=0x82100000\0" \
-       "kernel_addr_r=0x81000000\0" \
-       "pxefile_addr_r=0x87100000\0" \
-       "ramdisk_addr_r=0x82200000\0" \
-       "scriptaddr=0x87000000\0"
+       "fdt_addr_r=0x88200000\0" \
+       "kernel_addr_r=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \
+       "pxefile_addr_r=0x88300000\0" \
+       "ramdisk_addr_r=0x88400000\0" \
+       "scriptaddr=0x88280000\0"
 
 #define UBI_BOOTCMD \
        "ubiargs=ubi.mtd=ubi root=ubi0:rootfs rw rootfstype=ubifs " \

diff --git a/include/configs/colibri_imx6.h b/include/configs/colibri_imx6.h
index 3c220e0d6e3ee5e635733bb3d97f3356a0bb4530..d8b873662384d15741b232f4d65ac4102a724211 100644 (file)
--- a/include/configs/colibri_imx6.h
+++ b/include/configs/colibri_imx6.h
@@ -66,11 +66,11 @@
 
 #define MEM_LAYOUT_ENV_SETTINGS \
        "bootm_size=0x10000000\0" \
-       "fdt_addr_r=0x12100000\0" \
-       "kernel_addr_r=0x11000000\0" \
-       "pxefile_addr_r=0x17100000\0" \
-       "ramdisk_addr_r=0x12200000\0" \
-       "scriptaddr=0x17000000\0"
+       "fdt_addr_r=0x18200000\0" \
+       "kernel_addr_r=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \
+       "pxefile_addr_r=0x18300000\0" \
+       "ramdisk_addr_r=0x18400000\0" \
+       "scriptaddr=0x18280000\0"
 
 #define CONFIG_EXTRA_ENV_SETTINGS \
        BOOTENV \

diff --git a/include/configs/colibri_imx7.h b/include/configs/colibri_imx7.h
index 9543e0233ee131d50060b745704282c8bede3132..b8d0dc959a736ec40aa915feb7d4ff8933ac3f03 100644 (file)
--- a/include/configs/colibri_imx7.h
+++ b/include/configs/colibri_imx7.h
@@ -83,11 +83,11 @@
 
 #define MEM_LAYOUT_ENV_SETTINGS \
        "bootm_size=0x10000000\0" \
-       "fdt_addr_r=0x82000000\0" \
-       "kernel_addr_r=0x81000000\0" \
-       "pxefile_addr_r=0x87100000\0" \
-       "ramdisk_addr_r=0x82100000\0" \
-       "scriptaddr=0x87000000\0"
+       "fdt_addr_r=0x88200000\0" \
+       "kernel_addr_r=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \
+       "pxefile_addr_r=0x88300000\0" \
+       "ramdisk_addr_r=0x88400000\0" \
+       "scriptaddr=0x88280000\0"
 
 #define UBI_BOOTCMD    \
        "ubiargs=ubi.mtd=ubi root=ubi0:rootfs rootfstype=ubifs " \