diff options
| author | Wolfgang Denk <wd@denx.de> | 2010-10-12 20:44:46 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2010-10-12 20:44:46 +0200 |
| commit | 0ee8746a93e29a3d884f19598409a3bea8ff51ab (patch) | |
| tree | 1544d350005f0ff1403c21e2c795575e51901ae1 /arch | |
| parent | 456be17dbe0e22ee2be9fafa1ea8888ddf6bd514 (diff) | |
| parent | 1ca6d0df3ecb028e989f3489b95d021f4497477b (diff) | |
| download | u-boot-imx-0ee8746a93e29a3d884f19598409a3bea8ff51ab.zip u-boot-imx-0ee8746a93e29a3d884f19598409a3bea8ff51ab.tar.gz u-boot-imx-0ee8746a93e29a3d884f19598409a3bea8ff51ab.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot-net
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/include/asm/arch-davinci/emac_defs.h | 1 | ||||
| -rw-r--r-- | arch/arm/lib/board.c | 19 |
2 files changed, 0 insertions, 20 deletions
diff --git a/arch/arm/include/asm/arch-davinci/emac_defs.h b/arch/arm/include/asm/arch-davinci/emac_defs.h index 35a1585..76493a1 100644 --- a/arch/arm/include/asm/arch-davinci/emac_defs.h +++ b/arch/arm/include/asm/arch-davinci/emac_defs.h @@ -367,7 +367,6 @@ typedef struct { int davinci_eth_phy_read(u_int8_t phy_addr, u_int8_t reg_num, u_int16_t *data); int davinci_eth_phy_write(u_int8_t phy_addr, u_int8_t reg_num, u_int16_t data); -void davinci_eth_set_mac_addr(const u_int8_t *addr); typedef struct { diff --git a/arch/arm/lib/board.c b/arch/arm/lib/board.c index 5f2dfd0..22bd2c9 100644 --- a/arch/arm/lib/board.c +++ b/arch/arm/lib/board.c @@ -409,15 +409,6 @@ void start_armboot (void) enable_interrupts (); /* Perform network card initialisation if necessary */ -#ifdef CONFIG_DRIVER_TI_EMAC - /* XXX: this needs to be moved to board init */ -extern void davinci_eth_set_mac_addr (const u_int8_t *addr); - if (getenv ("ethaddr")) { - uchar enetaddr[6]; - eth_getenv_enetaddr("ethaddr", enetaddr); - davinci_eth_set_mac_addr(enetaddr); - } -#endif #if defined(CONFIG_DRIVER_SMC91111) || defined (CONFIG_DRIVER_LAN91C96) /* XXX: this needs to be moved to board init */ @@ -821,16 +812,6 @@ void board_init_r (gd_t *id, ulong dest_addr) enable_interrupts (); /* Perform network card initialisation if necessary */ -#ifdef CONFIG_DRIVER_TI_EMAC - /* XXX: this needs to be moved to board init */ -extern void davinci_eth_set_mac_addr (const u_int8_t *addr); - if (getenv ("ethaddr")) { - uchar enetaddr[6]; - eth_getenv_enetaddr("ethaddr", enetaddr); - davinci_eth_set_mac_addr(enetaddr); - } -#endif - #if defined(CONFIG_DRIVER_SMC91111) || defined (CONFIG_DRIVER_LAN91C96) /* XXX: this needs to be moved to board init */ if (getenv ("ethaddr")) { |