brain-hackers_pepepper-mirror/u-boot-brain
1
0
Fork 0
mirror of https://github.com/brain-hackers/u-boot-brain synced 2024-09-29 16:10:24 +09:00
Code Issues Projects Releases Wiki Activity

boards: get mac address from env and move load_sernum_ethaddr() to board init

Browse Source 
The environment is the canonical storage location of the mac address, so
we're killing off the global data location and moving everything to
querying the env directly.

Rather than have common ppc code call a board-specific function like
load_sernum_ethaddr(), have each board call it in its own board-specific
misc_init_r() function.

The boards that get converted here are:
	- kup4k/kup4x
	- pcs440ep
	- tqm8xx

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
CC: Ben Warren <biggerbadderben@gmail.com>
CC: Stefan Roese <sr@denx.de>
This commit is contained in:
Mike Frysinger 2009-02-11 20:09:52 -05:00 committed by Wolfgang Denk
parent 92b50ffef9
commit 9c150102bc
8 changed files with 21 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
board/kup/common/kup.h
View File

@ -41,4 +41,6 @@
extern void poweron_key (void);
extern void load_sernum_ethaddr(void);
#endif /* __KUP_H */

1
board/kup/kup4k/kup4k.c
View File

@ -250,6 +250,7 @@ int misc_init_r (void)
immap->im_ioport.iop_papar &= ~0x80;
immap->im_ioport.iop_padat |= 0x80; /* turn it off */
#endif
load_sernum_ethaddr();
setenv("hw","4k");
poweron_key();
return (0);

2
board/kup/kup4x/kup4x.c
View File

@ -295,7 +295,6 @@ static long int dram_size (long int mamr_value, long int *base,
int misc_init_r (void)
{
volatile immap_t *immap = (immap_t *) CONFIG_SYS_IMMR;
#ifdef CONFIG_IDE_LED
/* Configure PA8 as output port */
immap->im_ioport.iop_padir |= 0x80;
@ -306,6 +305,7 @@ int misc_init_r (void)
#ifdef KUP4X_USB
usb_init_kup4x ();
#endif
load_sernum_ethaddr();
setenv ("hw", "4x");
poweron_key ();
return (0);

5
board/m501sk/m501sk.c
View File

@ -105,11 +105,6 @@ uchar m501sk_gpio_clear(M501SK_PIO io)
return status;
}
void load_sernum_ethaddr(void)
{
return;
}
/*
* Miscelaneous platform dependent initialisations
*/

31
board/pcs440ep/pcs440ep.c
View File

@ -182,14 +182,21 @@ int board_early_init_f(void)
}
#define EEPROM_LEN 256
void load_sernum_ethaddr (void)
static void load_ethaddr(void)
{
int ok_ethaddr, ok_eth1addr;
int ret;
char buf[EEPROM_LEN];
char mac[32];
char *use_eeprom;
u16 checksumcrc16 = 0;
/* If the env is sane, then nothing for us to do */
ok_ethaddr = eth_getenv_enetaddr("ethaddr", buf);
ok_eth1addr = eth_getenv_enetaddr("eth1addr", buf);
if (ok_ethaddr && ok_eth1addr)
return;
/* read the MACs from EEprom */
status_led_set (0, STATUS_LED_ON);
status_led_set (1, STATUS_LED_ON);
@ -207,22 +214,10 @@ void load_sernum_ethaddr (void)
printf("%s: EEPROM Checksum not OK\n", __FUNCTION__);
} else {
/* get the MACs */
sprintf (mac, "%02x:%02x:%02x:%02x:%02x:%02x",
buf[3],
buf[4],
buf[5],
buf[6],
buf[7],
buf[8]);
setenv ("ethaddr", (char *) mac);
sprintf (mac, "%02x:%02x:%02x:%02x:%02x:%02x",
buf[9],
buf[10],
buf[11],
buf[12],
buf[13],
buf[14]);
setenv ("eth1addr", (char *) mac);
if (!ok_ethaddr)
eth_setenv_enetaddr("ethaddr", &buf[3]);
if (!ok_eth1addr)
eth_setenv_enetaddr("eth1addr", &buf[9]);
return;
}
}
@ -446,6 +441,8 @@ int misc_init_r (void)
uint pbcr;
int size_val = 0;
load_ethaddr();
/* Re-do sizing to get full correct info */
mtdcr(ebccfga, pb0cr);
pbcr = mfdcr(ebccfgd);

3
board/tqc/tqm8xx/tqm8xx.c
View File

@ -449,11 +449,14 @@ int board_early_init_r (void)
#ifdef CONFIG_MISC_INIT_R
extern void load_sernum_ethaddr(void);
int misc_init_r (void)
{
volatile immap_t *immap = (immap_t *) CONFIG_SYS_IMMR;
volatile memctl8xx_t *memctl = &immap->im_memctl;
load_sernum_ethaddr();
#ifdef CONFIG_SYS_OR_TIMING_FLASH_AT_50MHZ
int scy, trlx, flash_or_timing, clk_diff;

2
include/common.h
View File

@ -364,8 +364,6 @@ void display_mem_map(void);
void perform_soft_reset(void);
#endif
void load_sernum_ethaddr (void);
/* $(BOARD)/$(BOARD).c */
int board_early_init_f (void);
int board_late_init (void);

6
lib_ppc/board.c
View File

@ -943,12 +943,6 @@ void board_init_r (gd_t *id, ulong dest_addr)
}
#endif
#if defined(CONFIG_TQM8xxL) || defined(CONFIG_TQM8260) || \
defined(CONFIG_TQM8272) || \
defined(CONFIG_CCM) || defined(CONFIG_KUP4K) || \
defined(CONFIG_KUP4X) || defined(CONFIG_PCS440EP)
load_sernum_ethaddr ();
#endif
/* IP Address */
bd->bi_ip_addr = getenv_IPaddr ("ipaddr");