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_arm
/
board.c
diff --git
a/lib_arm/board.c
b/lib_arm/board.c
index
babc254
..
d37e5da
100644
(file)
--- a/
lib_arm/board.c
+++ b/
lib_arm/board.c
@@
-54,7
+54,7
@@
DECLARE_GLOBAL_DATA_PTR;
DECLARE_GLOBAL_DATA_PTR;
-#if
(CONFIG_COMMANDS & CF
G_CMD_NAND)
+#if
defined(CONFI
G_CMD_NAND)
void nand_init (void);
#endif
void nand_init (void);
#endif
@@
-296,7
+296,7
@@
void start_armboot (void)
/* armboot_start is defined in the board-specific linker script */
mem_malloc_init (_armboot_start - CFG_MALLOC_LEN);
/* armboot_start is defined in the board-specific linker script */
mem_malloc_init (_armboot_start - CFG_MALLOC_LEN);
-#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
@@
-364,6
+364,13
@@
void start_armboot (void)
enable_interrupts ();
/* Perform network card initialisation if necessary */
enable_interrupts ();
/* Perform network card initialisation if necessary */
+#ifdef CONFIG_DRIVER_TI_EMAC
+extern void dm644x_eth_set_mac_addr (const u_int8_t *addr);
+ if (getenv ("ethaddr")) {
+ dm644x_eth_set_mac_addr(gd->bd->bi_enetaddr);
+ }
+#endif
+
#ifdef CONFIG_DRIVER_CS8900
cs8900_get_enetaddr (gd->bd->bi_enetaddr);
#endif
#ifdef CONFIG_DRIVER_CS8900
cs8900_get_enetaddr (gd->bd->bi_enetaddr);
#endif
@@
-378,16
+385,16
@@
void start_armboot (void)
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));
}
if ((s = getenv ("bootfile")) != NULL) {
copy_filename (BootFile, s, sizeof (BootFile));
}
-#endif
/* CFG_CMD_NET */
+#endif
#ifdef BOARD_LATE_INIT
board_late_init ();
#endif
#ifdef BOARD_LATE_INIT
board_late_init ();
#endif
-#if
(CONFIG_COMMANDS & CF
G_CMD_NET)
+#if
defined(CONFI
G_CMD_NET)
#if defined(CONFIG_NET_MULTI)
puts ("Net: ");
#endif
#if defined(CONFIG_NET_MULTI)
puts ("Net: ");
#endif