Merge tag 'u-boot-imx-20190426' of git://git.denx.de/u-boot-imx

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

diff --git a/include/configs/stm32f469-discovery.h b/include/configs/stm32f469-discovery.h
index 990653beb8f9ac1dbf0f5d0a7d2eb504fd0e9778..1c7efd13b8353a0ba71f9f7bfd79c3830b2a9fdf 100644 (file)
--- a/include/configs/stm32f469-discovery.h
+++ b/include/configs/stm32f469-discovery.h
@@ -1,29 +1,19 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
 /*
  * Copyright (C) STMicroelectronics SA 2017
  * Author(s): Patrice CHOTARD, <patrice.chotard@st.com> for STMicroelectronics.
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #ifndef __CONFIG_H
 #define __CONFIG_H
 
-#define CONFIG_MISC_INIT_R
-
 #define CONFIG_SYS_FLASH_BASE          0x08000000
 
 #define CONFIG_SYS_INIT_SP_ADDR                0x10010000
 
-#define CONFIG_SYS_ICACHE_OFF
-#define CONFIG_SYS_DCACHE_OFF
-
 /*
  * Configuration of the external SDRAM memory
  */
-#define CONFIG_NR_DRAM_BANKS           1
-#define CONFIG_SYS_RAM_FREQ_DIV                2
-#define CONFIG_SYS_RAM_BASE            0x00000000
-#define CONFIG_SYS_SDRAM_BASE          CONFIG_SYS_RAM_BASE
 #define CONFIG_SYS_LOAD_ADDR           0x00400000
 #define CONFIG_LOADADDR                        0x00400000
 
@@ -36,7 +26,6 @@
 
 #define CONFIG_STM32_FLASH
 
-#define CONFIG_SYS_CLK_FREQ            180000000 /* 180 MHz */
 #define CONFIG_SYS_HZ_CLOCK            1000000 /* Timer is clocked at 1MHz */
 
 #define CONFIG_CMDLINE_TAG
@@ -48,11 +37,20 @@
 
 #define CONFIG_SYS_MALLOC_LEN          (1 * 1024 * 1024)
 
-#define CONFIG_BOOTCOMMAND                                             \
-       "run boot_sd"
-
-#define CONFIG_EXTRA_ENV_SETTINGS \
-       "boot_sd=mmc dev 0;fatload mmc 0 0x00700000 stm32f469-disco.dtb; fatload mmc 0 0x00008000 zImage; icache off; bootz 0x00008000 - 0x00700000"
+#define BOOT_TARGET_DEVICES(func) \
+       func(MMC, mmc, 0)
+
+#include <config_distro_bootcmd.h>
+#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"           \
+                       BOOTENV
 
 /*
  * Command line configuration.