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' of git://git.denx.de/u-boot-net
[platform/kernel/u-boot.git]
/
include
/
configs
/
stm32f429-discovery.h
diff --git
a/include/configs/stm32f429-discovery.h
b/include/configs/stm32f429-discovery.h
index
85d492d
..
f05c1aa
100644
(file)
--- a/
include/configs/stm32f429-discovery.h
+++ b/
include/configs/stm32f429-discovery.h
@@
-11,8
+11,6
@@
#define CONFIG_SYS_THUMB_BUILD
#define CONFIG_STM32F4DISCOVERY
#define CONFIG_SYS_THUMB_BUILD
#define CONFIG_STM32F4DISCOVERY
-#define CONFIG_OF_LIBFDT
-
#define CONFIG_BOARD_EARLY_INIT_F
#define CONFIG_MISC_INIT_R
#define CONFIG_BOARD_EARLY_INIT_F
#define CONFIG_MISC_INIT_R
@@
-49,6
+47,7
@@
#define CONFIG_GREEN_LED 109
#define CONFIG_STM32_GPIO
#define CONFIG_GREEN_LED 109
#define CONFIG_STM32_GPIO
+#define CONFIG_STM32_FLASH
#define CONFIG_STM32_SERIAL
#define CONFIG_STM32_HSE_HZ 8000000
#define CONFIG_STM32_SERIAL
#define CONFIG_STM32_HSE_HZ 8000000
@@
-83,18
+82,13
@@
"bootcmd_romfs=setenv bootargs ${bootargs} ${bootargs_romfs};" \
"bootm 0x08044000 - 0x08042000\0"
"bootcmd_romfs=setenv bootargs ${bootargs} ${bootargs_romfs};" \
"bootm 0x08044000 - 0x08042000\0"
-#define CONFIG_BOOTDELAY 3
-#define CONFIG_AUTOBOOT
-
/*
* Command line configuration.
*/
#define CONFIG_SYS_LONGHELP
/*
* Command line configuration.
*/
#define CONFIG_SYS_LONGHELP
-#define CONFIG_SYS_HUSH_PARSER
#define CONFIG_AUTO_COMPLETE
#define CONFIG_CMDLINE_EDITING
#define CONFIG_CMD_MEM
#define CONFIG_AUTO_COMPLETE
#define CONFIG_CMDLINE_EDITING
#define CONFIG_CMD_MEM
-#define CONFIG_CMD_TIMER
#endif /* __CONFIG_H */
#endif /* __CONFIG_H */