board: stm32: fix extra env setings addresses

For stm32f4, f7 and h7 boards, reserve:
 - 4MB for kernel
 - 64KB for fdt, boot script, pxefile
 - the remaining memory for ramdisk

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 7a17222d7b81311ae0f1f3945e9d15a0c2661671..f74d027e5d3b91908d9e2213a59999cccd20a3f3 100644 (file)
--- a/include/configs/stm32f429-evaluation.h
+++ b/include/configs/stm32f429-evaluation.h
@@ -40,12 +40,12 @@
 #define CONFIG_EXTRA_ENV_SETTINGS                              \
                        "kernel_addr_r=0x00008000\0"            \
                        "fdtfile=stm32429i-eval.dtb\0"  \
-                       "fdt_addr_r=0x00700000\0"               \
-                       "scriptaddr=0x00800000\0"               \
-                       "pxefile_addr_r=0x00800000\0" \
+                       "fdt_addr_r=0x00408000\0"               \
+                       "scriptaddr=0x00418000\0"               \
+                       "pxefile_addr_r=0x00428000\0" \
+                       "ramdisk_addr_r=0x00438000\0"           \
                        "fdt_high=0xffffffffffffffff\0"         \
                        "initrd_high=0xffffffffffffffff\0"      \
-                       "ramdisk_addr_r=0x00900000\0"           \
                        BOOTENV
 
 /*

diff --git a/include/configs/stm32f469-discovery.h b/include/configs/stm32f469-discovery.h
index 463f1c4396d04b27516aa04637d12e4b2802dabd..23ed02ab5220db1c04a1c4a0ebd4b4167927ee21 100644 (file)
--- a/include/configs/stm32f469-discovery.h
+++ b/include/configs/stm32f469-discovery.h
@@ -40,12 +40,12 @@
 #define CONFIG_EXTRA_ENV_SETTINGS                              \
                        "kernel_addr_r=0x00008000\0"            \
                        "fdtfile=stm32f469-disco.dtb\0" \
-                       "fdt_addr_r=0x00700000\0"               \
-                       "scriptaddr=0x00800000\0"               \
-                       "pxefile_addr_r=0x00800000\0" \
+                       "fdt_addr_r=0x00408000\0"               \
+                       "scriptaddr=0x00418000\0"               \
+                       "pxefile_addr_r=0x00428000\0" \
+                       "ramdisk_addr_r=0x00438000\0"           \
                        "fdt_high=0xffffffffffffffff\0"         \
                        "initrd_high=0xffffffffffffffff\0"      \
-                       "ramdisk_addr_r=0x00900000\0"           \
                        BOOTENV
 
 /*

diff --git a/include/configs/stm32f746-disco.h b/include/configs/stm32f746-disco.h
index 337b99977b807eab40ad52f82b0737232bf3faf3..6d82a9cdd1b0abab3145a1e9b063cc1ce9757fb5 100644 (file)
--- a/include/configs/stm32f746-disco.h
+++ b/include/configs/stm32f746-disco.h
@@ -48,12 +48,12 @@
 #define CONFIG_EXTRA_ENV_SETTINGS                              \
                        "kernel_addr_r=0xC0008000\0"            \
                        "fdtfile=stm32f746-disco.dtb\0" \
-                       "fdt_addr_r=0xC0500000\0"               \
-                       "scriptaddr=0xC0008000\0"               \
-                       "pxefile_addr_r=0xC0008000\0" \
+                       "fdt_addr_r=0xC0408000\0"               \
+                       "scriptaddr=0xC0418000\0"               \
+                       "pxefile_addr_r=0xC0428000\0" \
+                       "ramdisk_addr_r=0xC0438000\0"           \
                        "fdt_high=0xffffffffffffffff\0"         \
                        "initrd_high=0xffffffffffffffff\0"      \
-                       "ramdisk_addr_r=0xC0600000\0"           \
                        BOOTENV
 
 /*

diff --git a/include/configs/stm32h743-disco.h b/include/configs/stm32h743-disco.h
index 74c69eba39d3e46462590e82098ccd9547ad94fe..312f2916d112144121e0fcc445c15ecec1e5bf6c 100644 (file)
--- a/include/configs/stm32h743-disco.h
+++ b/include/configs/stm32h743-disco.h
@@ -35,12 +35,12 @@
 #define CONFIG_EXTRA_ENV_SETTINGS                              \
                        "kernel_addr_r=0xD0008000\0"            \
                        "fdtfile=stm32h743i-disco.dtb\0"        \
-                       "fdt_addr_r=0xD0700000\0"               \
-                       "scriptaddr=0xD0800000\0"               \
-                       "pxefile_addr_r=0xD0800000\0" \
+                       "fdt_addr_r=0xD0408000\0"               \
+                       "scriptaddr=0xD0418000\0"               \
+                       "pxefile_addr_r=0xD0428000\0" \
+                       "ramdisk_addr_r=0xD0438000\0"           \
                        "fdt_high=0xffffffffffffffff\0"         \
                        "initrd_high=0xffffffffffffffff\0"      \
-                       "ramdisk_addr_r=0xD0900000\0"           \
                        BOOTENV
 
 /*

diff --git a/include/configs/stm32h743-eval.h b/include/configs/stm32h743-eval.h
index b7c84922ab84f01ed7677d07e71e922fd64ba064..9f7194ab0b5f9bde0ecd631915e23406c2ff3178 100644 (file)
--- a/include/configs/stm32h743-eval.h
+++ b/include/configs/stm32h743-eval.h
@@ -35,12 +35,12 @@
 #define CONFIG_EXTRA_ENV_SETTINGS                              \
                        "kernel_addr_r=0xD0008000\0"            \
                        "fdtfile=stm32h743i-eval.dtb\0" \
-                       "fdt_addr_r=0xD0700000\0"               \
-                       "scriptaddr=0xD0800000\0"               \
-                       "pxefile_addr_r=0xD0800000\0" \
+                       "fdt_addr_r=0xD0408000\0"               \
+                       "scriptaddr=0xD0418000\0"               \
+                       "pxefile_addr_r=0xD0428000\0" \
+                       "ramdisk_addr_r=0xD0438000\0"           \
                        "fdt_high=0xffffffffffffffff\0"         \
                        "initrd_high=0xffffffffffffffff\0"      \
-                       "ramdisk_addr_r=0xD0900000\0"           \
                        BOOTENV
 
 /*