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 with git://www.denx.de/git/u-boot.git
[platform/kernel/u-boot.git]
/
lib_microblaze
/
board.c
diff --git
a/lib_microblaze/board.c
b/lib_microblaze/board.c
index
c95125a
..
09d4d94
100644
(file)
--- a/
lib_microblaze/board.c
+++ b/
lib_microblaze/board.c
@@
-40,7
+40,7
@@
extern int gpio_init (void);
#ifdef CFG_INTC_0
extern int interrupts_init (void);
#endif
#ifdef CFG_INTC_0
extern int interrupts_init (void);
#endif
-#if
(CONFIG_COMMANDS & CF
G_CMD_NET)
+#if
defined(CONFI
G_CMD_NET)
extern int eth_init (bd_t * bis);
extern int getenv_IPaddr (char *);
#endif
extern int eth_init (bd_t * bis);
extern int getenv_IPaddr (char *);
#endif
@@
-108,7
+108,7
@@
void board_init (void)
bd_t *bd;
init_fnc_t **init_fnc_ptr;
gd = (gd_t *) CFG_GBL_DATA_OFFSET;
bd_t *bd;
init_fnc_t **init_fnc_ptr;
gd = (gd_t *) CFG_GBL_DATA_OFFSET;
-#if
(CONFIG_COMMANDS & CF
G_CMD_FLASH)
+#if
defined(CONFI
G_CMD_FLASH)
ulong flash_size = 0;
#endif
asm ("nop"); /* FIXME gd is not initialize - wait */
ulong flash_size = 0;
#endif
asm ("nop"); /* FIXME gd is not initialize - wait */
@@
-130,7
+130,7
@@
void board_init (void)
}
}
}
}
-#if
(CONFIG_COMMANDS & CF
G_CMD_FLASH)
+#if
defined(CONFI
G_CMD_FLASH)
bd->bi_flashstart = CFG_FLASH_BASE;
if (0 < (flash_size = flash_init ())) {
bd->bi_flashsize = flash_size;
bd->bi_flashstart = CFG_FLASH_BASE;
if (0 < (flash_size = flash_init ())) {
bd->bi_flashsize = flash_size;
@@
-143,7
+143,7
@@
void board_init (void)
}
#endif
}
#endif
-#if
(CONFIG_COMMANDS & CF
G_CMD_NET)
+#if
defined(CONFI
G_CMD_NET)
char *s, *e;
int i;
/* board MAC address */
char *s, *e;
int i;
/* board MAC address */