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 remote-tracking branch 'u-boot-atmel/master'
[platform/kernel/u-boot.git]
/
include
/
configs
/
mx28evk.h
diff --git
a/include/configs/mx28evk.h
b/include/configs/mx28evk.h
index
dffb744
..
2916c71
100644
(file)
--- a/
include/configs/mx28evk.h
+++ b/
include/configs/mx28evk.h
@@
-63,6
+63,7
@@
#define CONFIG_CMD_NET
#define CONFIG_CMD_NFS
#define CONFIG_CMD_PING
#define CONFIG_CMD_NET
#define CONFIG_CMD_NFS
#define CONFIG_CMD_PING
+#define CONFIG_CMD_SETEXPR
#define CONFIG_CMD_SF
#define CONFIG_CMD_SPI
#define CONFIG_CMD_USB
#define CONFIG_CMD_SF
#define CONFIG_CMD_SPI
#define CONFIG_CMD_USB
@@
-141,7
+142,7
@@
#ifdef CONFIG_CMD_MMC
#define CONFIG_MMC
#define CONFIG_GENERIC_MMC
#ifdef CONFIG_CMD_MMC
#define CONFIG_MMC
#define CONFIG_GENERIC_MMC
-#define CONFIG_
MMC_
BOUNCE_BUFFER
+#define CONFIG_BOUNCE_BUFFER
#define CONFIG_MXS_MMC
#endif
#define CONFIG_MXS_MMC
#endif
@@
-312,7
+313,7
@@
"dhcp ${uimage}; bootm\0"
#define CONFIG_BOOTCOMMAND \
"dhcp ${uimage}; bootm\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 " \