summaryrefslogtreecommitdiff
path: root/lib_blackfin
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2008-10-13 15:06:25 -0400
committerWolfgang Denk <wd@denx.de>2009-03-20 22:39:09 +0100
commit500b6c51e4c41f4562cb48344af98deb7e342731 (patch)
treec58ff4d58fb5a26e5a034877631ab7afc27e77c8 /lib_blackfin
parent6ff4137f2ad640e4fc8ea1b0455161ddff1f6730 (diff)
Blackfin: bfin_mac: force boards to setup the MAC themselves
Since the on-chip MAC does not have an eeprom or similar interface, force all Blackfin boards that use this driver to setup the board data with a proper MAC. Signed-off-by: Mike Frysinger <vapier@gentoo.org> CC: Ben Warren <biggerbadderben@gmail.com>
Diffstat (limited to 'lib_blackfin')
-rw-r--r--lib_blackfin/board.c48
1 files changed, 2 insertions, 46 deletions
diff --git a/lib_blackfin/board.c b/lib_blackfin/board.c
index c22371197fb..537f69abaa9 100644
--- a/lib_blackfin/board.c
+++ b/lib_blackfin/board.c
@@ -106,10 +106,6 @@ static void display_global_data(void)
printf(" \\-bd: %x\n", gd->bd);
printf(" |-bi_baudrate: %x\n", bd->bi_baudrate);
printf(" |-bi_ip_addr: %x\n", bd->bi_ip_addr);
- printf(" |-bi_enetaddr: %x %x %x %x %x %x\n",
- bd->bi_enetaddr[0], bd->bi_enetaddr[1],
- bd->bi_enetaddr[2], bd->bi_enetaddr[3],
- bd->bi_enetaddr[4], bd->bi_enetaddr[5]);
printf(" |-bi_boot_params: %x\n", bd->bi_boot_params);
printf(" |-bi_memstart: %x\n", bd->bi_memstart);
printf(" |-bi_memsize: %x\n", bd->bi_memsize);
@@ -338,35 +334,6 @@ void board_init_r(gd_t * id, ulong dest_addr)
/* relocate environment function pointers etc. */
env_relocate();
-#ifdef CONFIG_CMD_NET
- /* board MAC address */
- s = getenv("ethaddr");
- if (s == NULL) {
-# ifndef CONFIG_ETHADDR
-# if 0
- if (!board_get_enetaddr(bd->bi_enetaddr)) {
- char nid[20];
- sprintf(nid, "%02X:%02X:%02X:%02X:%02X:%02X",
- bd->bi_enetaddr[0], bd->bi_enetaddr[1],
- bd->bi_enetaddr[2], bd->bi_enetaddr[3],
- bd->bi_enetaddr[4], bd->bi_enetaddr[5]);
- setenv("ethaddr", nid);
- }
-# endif
-# endif
- } else {
- int i;
- char *e;
- for (i = 0; i < 6; ++i) {
- bd->bi_enetaddr[i] = simple_strtoul(s, &e, 16);
- s = (*e) ? e + 1 : e;
- }
- }
-
- /* IP Address */
- bd->bi_ip_addr = getenv_IPaddr("ipaddr");
-#endif
-
/* Initialize devices */
devices_init();
jumptable_init();
@@ -393,21 +360,10 @@ void board_init_r(gd_t * id, ulong dest_addr)
#endif
#ifdef CONFIG_CMD_NET
+ /* IP Address */
+ bd->bi_ip_addr = getenv_IPaddr("ipaddr");
printf("Net: ");
eth_initialize(gd->bd);
- if ((s = getenv("ethaddr"))) {
-# ifndef CONFIG_NET_MULTI
- size_t i;
- char *e;
- for (i = 0; i < 6; ++i) {
- bd->bi_enetaddr[i] = simple_strtoul(s, &e, 16);
- s = (*e) ? e + 1 : e;
- }
-# endif
- printf("MAC: %02X:%02X:%02X:%02X:%02X:%02X\n",
- bd->bi_enetaddr[0], bd->bi_enetaddr[1], bd->bi_enetaddr[2],
- bd->bi_enetaddr[3], bd->bi_enetaddr[4], bd->bi_enetaddr[5]);
- }
#endif
display_global_data();