board: stm32: remove fdt_high and fdt_highinitrd_high

For stm32 f4, f7 and h7 boards, 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>
Reviewed-by: Patrick DELAUNAY <patrick.delaunay@st.com>

diff --git a/include/configs/stm32f429-evaluation.h b/include/configs/stm32f429-evaluation.h
index f74d027e5d3b91908d9e2213a59999cccd20a3f3..a7150312caa360530049ac589ef4c123a6a53dd7 100644 (file)
--- a/include/configs/stm32f429-evaluation.h
+++ b/include/configs/stm32f429-evaluation.h
@@ -7,6 +7,11 @@
 #ifndef __CONFIG_H
 #define __CONFIG_H
 
+#include <linux/sizes.h>
+
+/* For booting Linux, use the first 16MB of memory */
+#define CONFIG_SYS_BOOTMAPSZ           SZ_16M
+
 #define CONFIG_SYS_FLASH_BASE          0x08000000
 
 #define CONFIG_SYS_INIT_SP_ADDR                0x10010000
@@ -44,8 +49,6 @@
                        "scriptaddr=0x00418000\0"               \
                        "pxefile_addr_r=0x00428000\0" \
                        "ramdisk_addr_r=0x00438000\0"           \
-                       "fdt_high=0xffffffffffffffff\0"         \
-                       "initrd_high=0xffffffffffffffff\0"      \
                        BOOTENV
 
 /*

diff --git a/include/configs/stm32f469-discovery.h b/include/configs/stm32f469-discovery.h
index 23ed02ab5220db1c04a1c4a0ebd4b4167927ee21..8212fb63de077e63d289252cedc506d816a78cc8 100644 (file)
--- a/include/configs/stm32f469-discovery.h
+++ b/include/configs/stm32f469-discovery.h
@@ -7,6 +7,11 @@
 #ifndef __CONFIG_H
 #define __CONFIG_H
 
+#include <linux/sizes.h>
+
+/* For booting Linux, use the first 12MB of memory */
+#define CONFIG_SYS_BOOTMAPSZ           SZ_8M + SZ_4M
+
 #define CONFIG_SYS_FLASH_BASE          0x08000000
 
 #define CONFIG_SYS_INIT_SP_ADDR                0x10010000
@@ -44,8 +49,6 @@
                        "scriptaddr=0x00418000\0"               \
                        "pxefile_addr_r=0x00428000\0" \
                        "ramdisk_addr_r=0x00438000\0"           \
-                       "fdt_high=0xffffffffffffffff\0"         \
-                       "initrd_high=0xffffffffffffffff\0"      \
                        BOOTENV
 
 /*

diff --git a/include/configs/stm32f746-disco.h b/include/configs/stm32f746-disco.h
index 6d82a9cdd1b0abab3145a1e9b063cc1ce9757fb5..45343d2323743e0217b012b4f189a99c3d4ce52a 100644 (file)
--- a/include/configs/stm32f746-disco.h
+++ b/include/configs/stm32f746-disco.h
@@ -7,6 +7,11 @@
 #ifndef __CONFIG_H
 #define __CONFIG_H
 
+#include <linux/sizes.h>
+
+/* For booting Linux, use the first 6MB of memory */
+#define CONFIG_SYS_BOOTMAPSZ           SZ_4M + SZ_2M
+
 #define CONFIG_SYS_FLASH_BASE          0x08000000
 #define CONFIG_SYS_INIT_SP_ADDR                0x20050000
 
@@ -52,8 +57,6 @@
                        "scriptaddr=0xC0418000\0"               \
                        "pxefile_addr_r=0xC0428000\0" \
                        "ramdisk_addr_r=0xC0438000\0"           \
-                       "fdt_high=0xffffffffffffffff\0"         \
-                       "initrd_high=0xffffffffffffffff\0"      \
                        BOOTENV
 
 /*

diff --git a/include/configs/stm32h743-disco.h b/include/configs/stm32h743-disco.h
index 312f2916d112144121e0fcc445c15ecec1e5bf6c..39c93ee6f9f3492042360a87cbc75fff98f915f1 100644 (file)
--- a/include/configs/stm32h743-disco.h
+++ b/include/configs/stm32h743-disco.h
@@ -8,6 +8,10 @@
 #define __CONFIG_H
 
 #include <config.h>
+#include <linux/sizes.h>
+
+/* For booting Linux, use the first 16MB of memory */
+#define CONFIG_SYS_BOOTMAPSZ           SZ_16M
 
 #define CONFIG_SYS_FLASH_BASE          0x08000000
 #define CONFIG_SYS_INIT_SP_ADDR                0x24040000
@@ -39,8 +43,6 @@
                        "scriptaddr=0xD0418000\0"               \
                        "pxefile_addr_r=0xD0428000\0" \
                        "ramdisk_addr_r=0xD0438000\0"           \
-                       "fdt_high=0xffffffffffffffff\0"         \
-                       "initrd_high=0xffffffffffffffff\0"      \
                        BOOTENV
 
 /*

diff --git a/include/configs/stm32h743-eval.h b/include/configs/stm32h743-eval.h
index 9f7194ab0b5f9bde0ecd631915e23406c2ff3178..8eb94c1ad41f07072ad03a3fab5789e03e594511 100644 (file)
--- a/include/configs/stm32h743-eval.h
+++ b/include/configs/stm32h743-eval.h
@@ -8,6 +8,10 @@
 #define __CONFIG_H
 
 #include <config.h>
+#include <linux/sizes.h>
+
+/* For booting Linux, use the first 16MB of memory */
+#define CONFIG_SYS_BOOTMAPSZ           SZ_16M
 
 #define CONFIG_SYS_FLASH_BASE          0x08000000
 #define CONFIG_SYS_INIT_SP_ADDR                0x24040000
@@ -39,8 +43,6 @@
                        "scriptaddr=0xD0418000\0"               \
                        "pxefile_addr_r=0xD0428000\0" \
                        "ramdisk_addr_r=0xD0438000\0"           \
-                       "fdt_high=0xffffffffffffffff\0"         \
-                       "initrd_high=0xffffffffffffffff\0"      \
                        BOOTENV
 
 /*