include/configs: ls1012a: Remove fdt_high env variable

Remove "fdt_high" environment variable to use the bootm_size
to safely contain a kernel, device tree and initrd for
relocation.

Signed-off-by: Udit Agarwal <udit.agarwal@nxp.com>
Reviewed-by: Priyanka Jain <priyanka.jain@nxp.com>

diff --git a/include/configs/ls1012a2g5rdb.h b/include/configs/ls1012a2g5rdb.h
index 86cc4b6..bbc3ffd 100644 (file)
--- a/include/configs/ls1012a2g5rdb.h
+++ b/include/configs/ls1012a2g5rdb.h
@@ -33,7 +33,6 @@
 #undef CONFIG_EXTRA_ENV_SETTINGS
 #define CONFIG_EXTRA_ENV_SETTINGS              \
        "verify=no\0"                           \
-       "fdt_high=0xffffffffffffffff\0"         \
        "initrd_high=0xffffffffffffffff\0"      \
        "fdt_addr=0x00f00000\0"                 \
        "kernel_addr=0x01000000\0"              \
@@ -47,6 +46,7 @@
        "load_addr=0xa0000000\0"                \
        "kernel_size=0x2800000\0"               \
        "kernelheader_size=0x40000\0"           \
+       "bootm_size=0x10000000\0"               \
        "console=ttyS0,115200\0"                \
        BOOTENV                                 \
        "boot_scripts=ls1012ardb_boot.scr\0"    \

diff --git a/include/configs/ls1012a_common.h b/include/configs/ls1012a_common.h
index 06af8bf..b3fe722 100644 (file)
--- a/include/configs/ls1012a_common.h
+++ b/include/configs/ls1012a_common.h
@@ -86,11 +86,11 @@
        "verify=no\0"                           \
        "loadaddr=0x80100000\0"                 \
        "kernel_addr=0x100000\0"                \
-       "fdt_high=0xffffffffffffffff\0"         \
        "initrd_high=0xffffffffffffffff\0"      \
        "kernel_start=0x1000000\0"              \
        "kernel_load=0xa0000000\0"              \
        "kernel_size=0x2800000\0"               \
+       "bootm_size=0x10000000\0"               \
 
 #undef CONFIG_BOOTCOMMAND
 #ifdef CONFIG_TFABOOT

diff --git a/include/configs/ls1012afrdm.h b/include/configs/ls1012afrdm.h
index f8cb97b..8de20e3 100644 (file)
--- a/include/configs/ls1012afrdm.h
+++ b/include/configs/ls1012afrdm.h
@@ -24,7 +24,6 @@
 #define CONFIG_EXTRA_ENV_SETTINGS              \
        "verify=no\0"                           \
        "fdt_high=0xffffffffffffffff\0"         \
-       "initrd_high=0xffffffffffffffff\0"      \
        "fdt_addr=0x00f00000\0"                 \
        "kernel_addr=0x01000000\0"              \
        "scriptaddr=0x80000000\0"               \
@@ -34,6 +33,7 @@
        "fdt_addr_r=0x90000000\0"               \
        "load_addr=0x96000000\0"                \
        "kernel_size=0x2800000\0"               \
+       "bootm_size=0x10000000\0"               \
        "console=ttyS0,115200\0"                \
        BOOTENV                                 \
        "boot_scripts=ls1012afrdm_boot.scr\0"   \

diff --git a/include/configs/ls1012afrwy.h b/include/configs/ls1012afrwy.h
index 2e20e11..29c344c 100644 (file)
--- a/include/configs/ls1012afrwy.h
+++ b/include/configs/ls1012afrwy.h
@@ -45,7 +45,6 @@
 #undef CONFIG_EXTRA_ENV_SETTINGS
 #define CONFIG_EXTRA_ENV_SETTINGS              \
        "verify=no\0"                           \
-       "fdt_high=0xffffffffffffffff\0"         \
        "initrd_high=0xffffffffffffffff\0"      \
        "fdt_addr=0x00f00000\0"                 \
        "kernel_addr=0x01000000\0"              \
@@ -65,6 +64,7 @@
        "load_addr=0x92000000\0"                \
        "kernel_size=0x2800000\0"               \
        "kernelheader_size=0x40000\0"           \
+       "bootm_size=0x10000000\0"               \
        "console=ttyS0,115200\0"                \
        "BOARD=ls1012afrwy\0"                   \
        BOOTENV                                 \

diff --git a/include/configs/ls1012ardb.h b/include/configs/ls1012ardb.h
index 7eb1ec9..94e742e 100644 (file)
--- a/include/configs/ls1012ardb.h
+++ b/include/configs/ls1012ardb.h
@@ -51,7 +51,6 @@
 #undef CONFIG_EXTRA_ENV_SETTINGS
 #define CONFIG_EXTRA_ENV_SETTINGS              \
        "verify=no\0"                           \
-       "fdt_high=0xffffffffffffffff\0"         \
        "initrd_high=0xffffffffffffffff\0"      \
        "fdt_addr=0x00f00000\0"                 \
        "kernel_addr=0x01000000\0"              \
@@ -65,6 +64,7 @@
        "load_addr=0xa0000000\0"                \
        "kernel_size=0x2800000\0"               \
        "kernelheader_size=0x40000\0"           \
+       "bootm_size=0x10000000\0"               \
        "console=ttyS0,115200\0"                \
        BOOTENV                                 \
        "boot_scripts=ls1012ardb_boot.scr\0"    \