minix/u-boot
1
0
Fork 0
mirror of https://github.com/Stichting-MINIX-Research-Foundation/u-boot.git synced 2025-09-09 20:18:54 -04:00
Code Issues Packages Projects Releases Wiki Activity

Blackfin: bfin_mac: force boards to setup the MAC themselves

Browse Source 
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>
This commit is contained in:
Mike Frysinger 2008-10-13 15:06:25 -04:00 committed by Wolfgang Denk
parent 6ff4137f2a
commit 500b6c51e4
3 changed files with 11 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
drivers/net/bfin_mac.c
View File

@ -315,7 +315,7 @@ static int bfin_EMAC_init(struct eth_device *dev, bd_t *bd)
return -1; return -1;
/* Initialize EMAC address */ /* Initialize EMAC address */
bfin_EMAC_setup_addr(bd); bfin_EMAC_setup_addr(dev->enetaddr);
/* Initialize TX and RX buffer */ /* Initialize TX and RX buffer */
for (i = 0; i < PKTBUFSRX; i++) { for (i = 0; i < PKTBUFSRX; i++) {
@ -373,16 +373,16 @@ static void bfin_EMAC_halt(struct eth_device *dev)
} }
void bfin_EMAC_setup_addr(bd_t *bd) void bfin_EMAC_setup_addr(uchar *enetaddr)
{ {
*pEMAC_ADDRLO = *pEMAC_ADDRLO =
bd->bi_enetaddr[0] | enetaddr[0] |
bd->bi_enetaddr[1] << 8 | enetaddr[1] << 8 |
bd->bi_enetaddr[2] << 16 | enetaddr[2] << 16 |
bd->bi_enetaddr[3] << 24; enetaddr[3] << 24;
*pEMAC_ADDRHI = *pEMAC_ADDRHI =
bd->bi_enetaddr[4] | enetaddr[4] |
bd->bi_enetaddr[5] << 8; enetaddr[5] << 8;
} }
ADI_ETHER_BUFFER *SetupRxBuffer(int no) ADI_ETHER_BUFFER *SetupRxBuffer(int no)

2
drivers/net/bfin_mac.h
View File

@ -61,6 +61,6 @@ static void bfin_EMAC_halt(struct eth_device *dev);
static int bfin_EMAC_send(struct eth_device *dev, volatile void *packet, int length); static int bfin_EMAC_send(struct eth_device *dev, volatile void *packet, int length);
static int bfin_EMAC_recv(struct eth_device *dev); static int bfin_EMAC_recv(struct eth_device *dev);
static void bfin_EMAC_setup_addr(bd_t *bd); void bfin_EMAC_setup_addr(uchar *enetaddr);
#endif #endif

48
lib_blackfin/board.c
View File

@ -106,10 +106,6 @@ static void display_global_data(void)
printf(" \\-bd: %x\n", gd->bd); printf(" \\-bd: %x\n", gd->bd);
printf(" |-bi_baudrate: %x\n", bd->bi_baudrate); printf(" |-bi_baudrate: %x\n", bd->bi_baudrate);
printf(" |-bi_ip_addr: %x\n", bd->bi_ip_addr); 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_boot_params: %x\n", bd->bi_boot_params);
printf(" |-bi_memstart: %x\n", bd->bi_memstart); printf(" |-bi_memstart: %x\n", bd->bi_memstart);
printf(" |-bi_memsize: %x\n", bd->bi_memsize); 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. */ /* relocate environment function pointers etc. */
env_relocate(); 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 */ /* Initialize devices */
devices_init(); devices_init();
jumptable_init(); jumptable_init();
@ -393,21 +360,10 @@ void board_init_r(gd_t * id, ulong dest_addr)
#endif #endif
#ifdef CONFIG_CMD_NET #ifdef CONFIG_CMD_NET
/* IP Address */
bd->bi_ip_addr = getenv_IPaddr("ipaddr");
printf("Net: "); printf("Net: ");
eth_initialize(gd->bd); 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 #endif
display_global_data(); display_global_data();