Merge branch 'master' into next

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

diff --git a/include/configs/stm32f469-discovery.h b/include/configs/stm32f469-discovery.h
index a069308..62a7e9a 100644 (file)
--- a/include/configs/stm32f469-discovery.h
+++ b/include/configs/stm32f469-discovery.h
@@ -10,37 +10,21 @@
 #include <linux/sizes.h>
 
 /* For booting Linux, use the first 12MB of memory */
-#define CONFIG_SYS_BOOTMAPSZ           SZ_8M + SZ_4M
+#define CFG_SYS_BOOTMAPSZ              SZ_8M + SZ_4M
 
-#define CONFIG_SYS_FLASH_BASE          0x08000000
-
-#define CONFIG_SYS_INIT_SP_ADDR                0x10010000
+#define CFG_SYS_FLASH_BASE             0x08000000
 
 /*
  * Configuration of the external SDRAM memory
  */
 
-#define CONFIG_SYS_MAX_FLASH_SECT      12
-#define CONFIG_SYS_MAX_FLASH_BANKS     2
-
-#define CONFIG_STM32_FLASH
-
-#define CONFIG_SYS_HZ_CLOCK            1000000 /* Timer is clocked at 1MHz */
-
-#define CONFIG_CMDLINE_TAG
-#define CONFIG_SETUP_MEMORY_TAGS
-#define CONFIG_INITRD_TAG
-#define CONFIG_REVISION_TAG
-
-#define CONFIG_SYS_CBSIZE              1024
-
-#define CONFIG_SYS_MALLOC_LEN          (1 * 1024 * 1024)
+#define CFG_SYS_HZ_CLOCK               1000000 /* Timer is clocked at 1MHz */
 
 #define BOOT_TARGET_DEVICES(func) \
        func(MMC, mmc, 0)
 
 #include <config_distro_bootcmd.h>
-#define CONFIG_EXTRA_ENV_SETTINGS                              \
+#define CFG_EXTRA_ENV_SETTINGS                         \
                        "kernel_addr_r=0x00008000\0"            \
                        "fdtfile=stm32f469-disco.dtb\0" \
                        "fdt_addr_r=0x00408000\0"               \