projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge with git+ssh://sr@pollux.denx.org/home/wd/git/u-boot/from_stefan
[oweals/u-boot.git]
/
lib_blackfin
/
board.c
diff --git
a/lib_blackfin/board.c
b/lib_blackfin/board.c
index 1538da3f29a6f6a0317e9ff7d75d23322baf0161..36a969e7318e2748a4dce752a34ca1ec754e9c6c 100644
(file)
--- a/
lib_blackfin/board.c
+++ b/
lib_blackfin/board.c
@@
-297,7
+297,7
@@
void board_init_f(ulong bootflag)
}
checkboard();
}
checkboard();
-#if defined(CONFIG_RTC_BF533) &&
(CONFIG_COMMANDS & CF
G_CMD_DATE)
+#if defined(CONFIG_RTC_BF533) &&
defined(CONFI
G_CMD_DATE)
rtc_init();
#endif
timer_init();
rtc_init();
#endif
timer_init();
@@
-391,13
+391,13
@@
void board_init_r(gd_t * id, ulong dest_addr)
if ((s = getenv("loadaddr")) != NULL) {
load_addr = simple_strtoul(s, NULL, 16);
}
if ((s = getenv("loadaddr")) != NULL) {
load_addr = simple_strtoul(s, NULL, 16);
}
-#if
(CONFIG_COMMANDS & CF
G_CMD_NET)
+#if
defined(CONFI
G_CMD_NET)
if ((s = getenv("bootfile")) != NULL) {
copy_filename(BootFile, s, sizeof(BootFile));
}
#endif
if ((s = getenv("bootfile")) != NULL) {
copy_filename(BootFile, s, sizeof(BootFile));
}
#endif
-#if
(CONFIG_COMMANDS & CF
G_CMD_NAND)
+#if
defined(CONFI
G_CMD_NAND)
puts("NAND: ");
nand_init(); /* go init the NAND */
#endif
puts("NAND: ");
nand_init(); /* go init the NAND */
#endif