Remove this code. It's not needed. The 4xx EMAC driver stores the MAC addresses into the SoC registers instead.

Signed-off-by: Stefan Roese sr@denx.de --- cpu/ppc4xx/cpu_init.c | 29 +---------------------------- 1 files changed, 1 insertions(+), 28 deletions(-)

diff --git a/cpu/ppc4xx/cpu_init.c b/cpu/ppc4xx/cpu_init.c index a8f589a..577d33f 100644 --- a/cpu/ppc4xx/cpu_init.c +++ b/cpu/ppc4xx/cpu_init.c @@ -321,35 +321,9 @@ cpu_init_f (void) */ int cpu_init_r (void) { -#if defined(CONFIG_405GP) || defined(CONFIG_405EP) - bd_t *bd = gd->bd; - unsigned long reg; - uchar enetaddr[6]; #if defined(CONFIG_405GP) uint pvr = get_pvr(); -#endif - - /* - * Write Ethernetaddress into on-chip register - */ - reg = 0x00000000; - eth_getenv_enetaddr("ethaddr", enetaddr); - reg |= enetaddr[0]; /* set high address */ - reg = reg << 8; - reg |= enetaddr[1]; - out32 (EMAC_IAH, reg); - - reg = 0x00000000; - reg |= enetaddr[2]; /* set low address */ - reg = reg << 8; - reg |= enetaddr[3]; - reg = reg << 8; - reg |= enetaddr[4]; - reg = reg << 8; - reg |= enetaddr[5]; - out32 (EMAC_IAL, reg);

-#if defined(CONFIG_405GP) /* * Set edge conditioning circuitry on PPC405GPr * for compatibility to existing PPC405GP designs. @@ -358,7 +332,6 @@ int cpu_init_r (void) mtdcr(ecr, 0x60606000); } #endif /* defined(CONFIG_405GP) */ -#endif /* defined(CONFIG_405GP) || defined(CONFIG_405EP) */

- return (0); + return 0; }