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 'agust@denx.de' of git://git.denx.de/u-boot-staging
[platform/kernel/u-boot.git]
/
include
/
configs
/
omap3_evm.h
diff --git
a/include/configs/omap3_evm.h
b/include/configs/omap3_evm.h
index
1fcb7af
..
f6e4236
100644
(file)
--- a/
include/configs/omap3_evm.h
+++ b/
include/configs/omap3_evm.h
@@
-42,6
+42,8
@@
*/
#include <config_cmd_default.h>
*/
#include <config_cmd_default.h>
+#define CONFIG_CMD_ASKENV
+
#define CONFIG_CMD_EXT2
#define CONFIG_CMD_FAT
#define CONFIG_CMD_JFFS2
#define CONFIG_CMD_EXT2
#define CONFIG_CMD_FAT
#define CONFIG_CMD_JFFS2
@@
-134,7
+136,7
@@
* Default environment
* -----------------------------------------------------------------------------
*/
* Default environment
* -----------------------------------------------------------------------------
*/
-#define CONFIG_BOOTDELAY
10
+#define CONFIG_BOOTDELAY
3
#define CONFIG_EXTRA_ENV_SETTINGS \
"loadaddr=0x82000000\0" \
#define CONFIG_EXTRA_ENV_SETTINGS \
"loadaddr=0x82000000\0" \
@@
-160,7
+162,7
@@
"bootm ${loadaddr}\0" \
#define CONFIG_BOOTCOMMAND \
"bootm ${loadaddr}\0" \
#define CONFIG_BOOTCOMMAND \
- "
if mmc rescan ${mmcdev}
; then " \
+ "
mmc dev ${mmcdev}; if mmc rescan
; then " \
"if run loadbootscript; then " \
"run bootscript; " \
"else " \
"if run loadbootscript; then " \
"run bootscript; " \
"else " \