imx8m: config: convert to bootm_size

Restrict the memory range available for image processing in the
"bootm" to 256 MiB so the kernel can access it and FDT or initrd are
not overwritten on ARM64.

Signed-off-by: Grygorii Tertychnyi <grygorii.tertychnyi@leica-geosystems.com>
Cc: Peng Fan <peng.fan@nxp.com>
Cc: Marek Vasut <marex@denx.de>
Cc: Andrey Zhizhikin <andrey.zhizhikin@leica-geosystems.com>
Reviewed-by: Tom Rini <trini@konsulko.com>

diff --git a/include/configs/imx8mm_evk.h b/include/configs/imx8mm_evk.h
index 57971ca71428399d3eec5b84158b8e14b748686f..83521ad401d82da7e13e2f970473801ed672b51b 100644 (file)
--- a/include/configs/imx8mm_evk.h
+++ b/include/configs/imx8mm_evk.h
@@ -38,11 +38,10 @@
        "image=Image\0" \
        "console=ttymxc1,115200\0" \
        "fdt_addr=0x43000000\0"                 \
-       "fdt_high=0xffffffffffffffff\0"         \
        "boot_fit=no\0" \
        "fdt_file=imx8mm-evk.dtb\0" \
        "initrd_addr=0x43800000\0"              \
-       "initrd_high=0xffffffffffffffff\0" \
+       "bootm_size=0x10000000\0" \
        "mmcdev="__stringify(CONFIG_SYS_MMC_ENV_DEV)"\0" \
        "mmcpart=" __stringify(CONFIG_SYS_MMC_IMG_LOAD_PART) "\0" \
        "mmcroot=" CONFIG_MMCROOT " rootwait rw\0" \

diff --git a/include/configs/imx8mn_evk.h b/include/configs/imx8mn_evk.h
index d819266f99e70e58d6f0fb2d71e5e5018cfc129e..a6333085fe24226fefa50776a38ce9caed915f12 100644 (file)
--- a/include/configs/imx8mn_evk.h
+++ b/include/configs/imx8mn_evk.h
@@ -42,11 +42,10 @@
        "image=Image.itb\0" \
        "console=ttymxc1,115200\0" \
        "fdt_addr=0x43000000\0"                 \
-       "fdt_high=0xffffffffffffffff\0"         \
        "boot_fit=try\0" \
        "fdt_file=" CONFIG_DEFAULT_FDT_FILE "\0" \
        "initrd_addr=0x43800000\0"              \
-       "initrd_high=0xffffffffffffffff\0" \
+       "bootm_size=0x10000000\0" \
        "mmcdev="__stringify(CONFIG_SYS_MMC_ENV_DEV)"\0" \
        "mmcpart=" __stringify(CONFIG_SYS_MMC_IMG_LOAD_PART) "\0" \
        "mmcroot=" CONFIG_MMCROOT " rootwait rw\0" \

diff --git a/include/configs/imx8mp_evk.h b/include/configs/imx8mp_evk.h
index ded0717ddb7be6e5cfe335788822ba2ba011a5a7..8253c6aa2f37a1f648028db89ddeb76ed0640e7e 100644 (file)
--- a/include/configs/imx8mp_evk.h
+++ b/include/configs/imx8mp_evk.h
@@ -50,11 +50,10 @@
        "image=Image\0" \
        "console=ttymxc1,115200 earlycon=ec_imx6q,0x30890000,115200\0" \
        "fdt_addr=0x43000000\0"                 \
-       "fdt_high=0xffffffffffffffff\0"         \
        "boot_fdt=try\0" \
        "fdt_file=" CONFIG_DEFAULT_FDT_FILE "\0" \
        "initrd_addr=0x43800000\0"              \
-       "initrd_high=0xffffffffffffffff\0" \
+       "bootm_size=0x10000000\0" \
        "mmcdev="__stringify(CONFIG_SYS_MMC_ENV_DEV)"\0" \
        "mmcpart=" __stringify(CONFIG_SYS_MMC_IMG_LOAD_PART) "\0" \
        "mmcroot=" CONFIG_MMCROOT " rootwait rw\0" \

diff --git a/include/configs/imx8mq_evk.h b/include/configs/imx8mq_evk.h
index d98f9263ca9afb01a6064982aaee13fcd2c0489f..3f9a3bc100be5387777ce1b8e8748ecafd0ec588 100644 (file)
--- a/include/configs/imx8mq_evk.h
+++ b/include/configs/imx8mq_evk.h
@@ -83,7 +83,6 @@
                "clk_ignore_unused "\
                "\0" \
        "initrd_addr=0x43800000\0" \
-       "initrd_high=0xffffffff\0" \
        "bootcmd_mfg=run mfgtool_args;booti ${loadaddr} ${initrd_addr} ${fdt_addr};\0" \
 /* Initial environment variables */
 #define CONFIG_EXTRA_ENV_SETTINGS              \
@@ -92,11 +91,10 @@
        "image=Image\0" \
        "console=ttymxc0,115200\0" \
        "fdt_addr=0x43000000\0"                 \
-       "fdt_high=0xffffffffffffffff\0"         \
        "boot_fdt=try\0" \
        "fdt_file=imx8mq-evk.dtb\0" \
        "initrd_addr=0x43800000\0"              \
-       "initrd_high=0xffffffffffffffff\0" \
+       "bootm_size=0x10000000\0" \
        "mmcdev="__stringify(CONFIG_SYS_MMC_ENV_DEV)"\0" \
        "mmcpart=" __stringify(CONFIG_SYS_MMC_IMG_LOAD_PART) "\0" \
        "mmcroot=" CONFIG_MMCROOT " rootwait rw\0" \