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

[u-boot] / board / siemens / IAD210 / IAD210.c

diff --git a/board/siemens/IAD210/IAD210.c b/board/siemens/IAD210/IAD210.c
index e9e7f8472aa90774684a23cb0121eac9288a9901..7325a9364727d8a046bb1773b4499e63549dd58d 100644 (file)
--- a/board/siemens/IAD210/IAD210.c
+++ b/board/siemens/IAD210/IAD210.c
@@ -23,6 +23,7 @@
 
 #include <common.h>
 #include <mpc8xx.h>
+#include <net.h>
 #include "atm.h"
 #include <i2c.h>
 
@@ -240,7 +241,7 @@ int board_early_init_f (void)
        iop->iop_padir = 0x0800;
 
        /* start timer 2 for the 4hz LED blink rate */
-       timers->cpmt_tmr2 = 0xff2c;     /* 4hz for 64mhz */
+       timers->cpmt_tmr2 = 0xff2c;     /* 4HZ for 64MHz */
        timers->cpmt_trr2 = 0x000003d0; /* clk/16 , prescale=256 */
        timers->cpmt_tgcr = 0x00000810; /* run timer 2 */
 
@@ -258,7 +259,7 @@ int board_early_init_f (void)
        return 0;
 }
 
-void board_get_enetaddr (uchar * addr)
+static void board_get_enetaddr(uchar *addr)
 {
        int i;
        volatile immap_t *immap = (immap_t *) CONFIG_SYS_IMMR;
@@ -284,3 +285,15 @@ void board_get_enetaddr (uchar * addr)
 
        cpm->cp_rccr = rccrtmp;
 }
+
+int misc_init_r(void)
+{
+       uchar enetaddr[6];
+
+       if (!eth_getenv_enetaddr("ethaddr", enetaddr)) {
+               board_get_enetaddr(enetaddr);
+               eth_setenv_enetaddr("ethaddr", enetaddr);
+       }
+
+       return 0;
+}