Merge branch 'evk1100-prep'

[u-boot] / drivers / net / s3c4510b_eth.c

diff --git a/drivers/net/s3c4510b_eth.c b/drivers/net/s3c4510b_eth.c
index 3d9066abeaf781812934a04350c3fb8c31bf0b64..818ed3d34f6413b158a8cccd811040797570f6b0 100644 (file)
--- a/drivers/net/s3c4510b_eth.c
+++ b/drivers/net/s3c4510b_eth.c
@@ -25,9 +25,6 @@
  */
 
 #include <common.h>
-
-#ifdef CONFIG_DRIVER_S3C4510_ETH
-
 #include <command.h>
 #include <net.h>
 #include <asm/hardware.h>
@@ -103,7 +100,7 @@ int eth_init(bd_t *bis)
        ETH *eth = &m_eth;
 
        /* store our MAC address */
-       eth->m_mac = bis->bi_enetaddr;
+       eth_getenv_enetaddr("ethaddr", eth->m_mac);
 
        /* setup DBMA and MAC */
        PUT_REG( REG_BDMARXCON, ETH_BRxRS);   /* reset BDMA RX machine */
@@ -242,5 +239,3 @@ void eth_halt(void)
        /* disable MAC */
        PUT_REG( REG_MACCON, ETH_HaltReg);
 }
-
-#endif