Merge branch 'master' of git://git.denx.de/u-boot-arm

[karo-tx-uboot.git] / drivers / net / rtl8019.c

diff --git a/drivers/net/rtl8019.c b/drivers/net/rtl8019.c
index 9d62cab34670e096e18f3b7ee00075dcc7ea5588..f516afe6b0f4e621600952b60f0d640dbf5a9392 100644 (file)
--- a/drivers/net/rtl8019.c
+++ b/drivers/net/rtl8019.c
@@ -32,10 +32,6 @@
 #include "rtl8019.h"
 #include <net.h>
 
-#ifdef CONFIG_DRIVER_RTL8019
-
-#if defined(CONFIG_CMD_NET)
-
 /* packet page register access functions */
 
 static unsigned char get_reg (unsigned int regno)
@@ -95,6 +91,7 @@ void eth_halt (void)
 
 int eth_init (bd_t * bd)
 {
+       uchar enetaddr[6];
        eth_reset ();
        put_reg (RTL8019_COMMAND, RTL8019_PAGE0STOP);
        put_reg (RTL8019_DATACONFIGURATION, 0x48);
@@ -109,12 +106,13 @@ int eth_init (bd_t * bd)
        put_reg (RTL8019_INTERRUPTSTATUS, 0xff);
        put_reg (RTL8019_INTERRUPTMASK, 0x11);  /*b; */
        put_reg (RTL8019_COMMAND, RTL8019_PAGE1STOP);
-       put_reg (RTL8019_PHYSICALADDRESS0, bd->bi_enetaddr[0]);
-       put_reg (RTL8019_PHYSICALADDRESS1, bd->bi_enetaddr[1]);
-       put_reg (RTL8019_PHYSICALADDRESS2, bd->bi_enetaddr[2]);
-       put_reg (RTL8019_PHYSICALADDRESS3, bd->bi_enetaddr[3]);
-       put_reg (RTL8019_PHYSICALADDRESS4, bd->bi_enetaddr[4]);
-       put_reg (RTL8019_PHYSICALADDRESS5, bd->bi_enetaddr[5]);
+       eth_getenv_enetaddr("ethaddr", enetaddr);
+       put_reg (RTL8019_PHYSICALADDRESS0, enetaddr[0]);
+       put_reg (RTL8019_PHYSICALADDRESS1, enetaddr[1]);
+       put_reg (RTL8019_PHYSICALADDRESS2, enetaddr[2]);
+       put_reg (RTL8019_PHYSICALADDRESS3, enetaddr[3]);
+       put_reg (RTL8019_PHYSICALADDRESS4, enetaddr[4]);
+       put_reg (RTL8019_PHYSICALADDRESS5, enetaddr[5]);
        put_reg (RTL8019_MULTIADDRESS0, 0x00);
        put_reg (RTL8019_MULTIADDRESS1, 0x00);
        put_reg (RTL8019_MULTIADDRESS2, 0x00);
@@ -271,7 +269,3 @@ extern int eth_send (volatile void *packet, int length)
 
        return 0;
 }
-
-#endif /* CONFIG_CMD_NET */
-
-#endif /* CONFIG_DRIVER_RTL8019 */