ppc: trigger WDT before starting Linux

[u-boot] / board / mpl / vcma9 / cmd_vcma9.c

diff --git a/board/mpl/vcma9/cmd_vcma9.c b/board/mpl/vcma9/cmd_vcma9.c
index 2748fa97f8ae1fcebdcc21818b6aa38285d80bdc..01607743952b88e22307b66da00f673a9eea2ed5 100644 (file)
--- a/board/mpl/vcma9/cmd_vcma9.c
+++ b/board/mpl/vcma9/cmd_vcma9.c
@@ -27,6 +27,7 @@
 
 #include <common.h>
 #include <command.h>
+#include <net.h>
 #include "vcma9.h"
 #include "../common/common_util.h"
 
@@ -76,21 +77,18 @@ int do_vcma9(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
                        cs8900_e2prom_write(addr, data);
                } else if (strcmp(argv[2], "setaddr") == 0) {
                        uchar addr, i, csum; ushort data;
+                       uchar ethaddr[6];
 
                        /* check for valid ethaddr */
-                       for (i = 0; i < 6; i++)
-                               if (gd->bd->bi_enetaddr[i] != 0)
-                                       break;
-
-                       if (i < 6) {
+                       if (eth_getenv_enetaddr("ethaddr", ethaddr)) {
                                addr = 1;
                                data = 0x2158;
                                cs8900_e2prom_write(addr, data);
                                csum = cs8900_chksum(data);
                                addr++;
                                for (i = 0; i < 6; i+=2) {
-                                       data = gd->bd->bi_enetaddr[i+1] << 8 |
-                                              gd->bd->bi_enetaddr[i];
+                                       data = ethaddr[i+1] << 8 |
+                                              ethaddr[i];
                                        cs8900_e2prom_write(addr, data);
                                        csum += cs8900_chksum(data);
                                        addr++;
@@ -176,5 +174,5 @@ int do_vcma9(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 U_BOOT_CMD(
        vcma9, 6, 1, do_vcma9,
        "VCMA9 specific commands",
-       "flash mem [SrcAddr]\n    - updates U-Boot with image in memory\n"
+       "flash mem [SrcAddr]\n    - updates U-Boot with image in memory"
 );