projects
/
platform
/
kernel
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
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
2d8b2d2
..
62a7e9a
100644
(file)
--- a/
include/configs/stm32f469-discovery.h
+++ b/
include/configs/stm32f469-discovery.h
@@
-10,23
+10,21
@@
#include <linux/sizes.h>
/* For booting Linux, use the first 12MB of memory */
#include <linux/sizes.h>
/* For booting Linux, use the first 12MB of memory */
-#define C
ONFIG_SYS_BOOTMAPSZ
SZ_8M + SZ_4M
+#define C
FG_SYS_BOOTMAPSZ
SZ_8M + SZ_4M
-#define C
ONFIG_SYS_FLASH_BASE
0x08000000
+#define C
FG_SYS_FLASH_BASE
0x08000000
/*
* Configuration of the external SDRAM memory
*/
/*
* Configuration of the external SDRAM memory
*/
-#define CONFIG_SYS_MAX_FLASH_SECT 12
-
-#define CONFIG_SYS_HZ_CLOCK 1000000 /* Timer is clocked at 1MHz */
+#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 BOOT_TARGET_DEVICES(func) \
func(MMC, mmc, 0)
#include <config_distro_bootcmd.h>
-#define C
ONFIG_EXTRA_ENV_SETTINGS
\
+#define C
FG_EXTRA_ENV_SETTINGS
\
"kernel_addr_r=0x00008000\0" \
"fdtfile=stm32f469-disco.dtb\0" \
"fdt_addr_r=0x00408000\0" \
"kernel_addr_r=0x00008000\0" \
"fdtfile=stm32f469-disco.dtb\0" \
"fdt_addr_r=0x00408000\0" \