Merge tag 'efi-2020-07-rc2-4' of https://gitlab.denx.de/u-boot/custodians/u-boot-efi

[oweals/u-boot.git] / include / configs / stm32f469-discovery.h

diff --git a/include/configs/stm32f469-discovery.h b/include/configs/stm32f469-discovery.h
index 1c7efd13b8353a0ba71f9f7bfd79c3830b2a9fdf..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
@@ -20,10 +25,6 @@
 #define CONFIG_SYS_MAX_FLASH_SECT      12
 #define CONFIG_SYS_MAX_FLASH_BANKS     2
 
-#define CONFIG_ENV_OFFSET              (256 << 10)
-#define CONFIG_ENV_SECT_SIZE           (128 << 10)
-#define CONFIG_ENV_SIZE                        (8 << 10)
-
 #define CONFIG_STM32_FLASH
 
 #define CONFIG_SYS_HZ_CLOCK            1000000 /* Timer is clocked at 1MHz */
@@ -44,12 +45,10 @@
 #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_high=0xffffffffffffffff\0"         \
-                       "initrd_high=0xffffffffffffffff\0"      \
-                       "ramdisk_addr_r=0x00900000\0"           \
+                       "fdt_addr_r=0x00408000\0"               \
+                       "scriptaddr=0x00418000\0"               \
+                       "pxefile_addr_r=0x00428000\0" \
+                       "ramdisk_addr_r=0x00438000\0"           \
                        BOOTENV
 
 /*