Remove fdt_high and initrd_high as they shouldn't be used, this allows the fdt and initrd relocation. This implies to set CONFIG_SYS_BOOTMAPSZ to indicate the amount of memory available to contain kernel, device tree and initrd for relocation.

Signed-off-by: Patrice Chotard patrice.chotard@st.com ---

include/configs/stih410-b2260.h | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/include/configs/stih410-b2260.h b/include/configs/stih410-b2260.h index a8a58f3950..f393aa0264 100644 --- a/include/configs/stih410-b2260.h +++ b/include/configs/stih410-b2260.h @@ -19,6 +19,12 @@

/* Environment */

+/* + * For booting Linux, use the first 256 MB of memory, since this is + * the maximum mapped by the Linux kernel during initialization. + */ +#define CONFIG_SYS_BOOTMAPSZ SZ_256M + #define CONFIG_LOADADDR CONFIG_SYS_LOAD_ADDR #define CONFIG_SYS_BOOTM_LEN SZ_16M

@@ -34,8 +40,6 @@ "fdt_addr_r=0x47000000\0" \ "scriptaddr=0x50000000\0" \ "pxefile_addr_r=0x50100000\0" \ - "fdt_high=0xffffffffffffffff\0" \ - "initrd_high=0xffffffffffffffff\0" \ "ramdisk_addr_r=0x48000000\0" \ BOOTENV