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
/
smdkc100.h
diff --git
a/include/configs/smdkc100.h
b/include/configs/smdkc100.h
index
ffa1a1f
..
c148757
100644
(file)
--- a/
include/configs/smdkc100.h
+++ b/
include/configs/smdkc100.h
@@
-28,7
+28,7
@@
" mem=128M " \
" " CONFIG_MTDPARTS_DEFAULT
" mem=128M " \
" " CONFIG_MTDPARTS_DEFAULT
-#define C
ONFIG_EXTRA_ENV_SETTINGS
\
+#define C
FG_EXTRA_ENV_SETTINGS
\
"updateb=" \
"onenand erase 0x0 0x40000;" \
"onenand write 0x32008000 0x0 0x40000\0" \
"updateb=" \
"onenand erase 0x0 0x40000;" \
"onenand write 0x32008000 0x0 0x40000\0" \
@@
-94,7
+94,7
@@
* Ethernet Contoller driver
*/
#ifdef CONFIG_CMD_NET
* Ethernet Contoller driver
*/
#ifdef CONFIG_CMD_NET
-#define C
ONFI
G_ENV_SROM_BANK 3 /* Select SROM Bank-3 for Ethernet*/
+#define C
F
G_ENV_SROM_BANK 3 /* Select SROM Bank-3 for Ethernet*/
#endif /* CONFIG_CMD_NET */
#endif /* __CONFIG_H */
#endif /* CONFIG_CMD_NET */
#endif /* __CONFIG_H */