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 8df642d9ba6b512a321f8ee1a1c574533cf93756..01607743952b88e22307b66da00f673a9eea2ed5 100644 (file)
--- a/board/mpl/vcma9/cmd_vcma9.c
+++ b/board/mpl/vcma9/cmd_vcma9.c
@@ -27,11 +27,12 @@
 
 #include <common.h>
 #include <command.h>
+#include <net.h>
 #include "vcma9.h"
 #include "../common/common_util.h"
 
 #if defined(CONFIG_DRIVER_CS8900)
-#include <../drivers/cs8900.h>
+#include <../drivers/net/cs8900.h>
 
 static uchar cs8900_chksum(ushort data)
 {
@@ -40,6 +41,8 @@ static uchar cs8900_chksum(ushort data)
 
 #endif
 
+DECLARE_GLOBAL_DATA_PTR;
+
 extern void print_vcma9_info(void);
 extern int vcma9_cantest(int);
 extern int vcma9_nandtest(void);
@@ -53,15 +56,13 @@ extern int do_mplcommon(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]);
 
 int do_vcma9(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 {
-       DECLARE_GLOBAL_DATA_PTR;
-
        if (strcmp(argv[1], "info") == 0)
        {
                print_vcma9_info();
-               return 0;
-       }
+               return 0;
+       }
 #if defined(CONFIG_DRIVER_CS8900)
-       if (strcmp(argv[1], "cs8900_eeprom") == 0) {
+       if (strcmp(argv[1], "cs8900") == 0) {
                if (strcmp(argv[2], "read") == 0) {
                        uchar addr; ushort data;
 
@@ -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++;
@@ -102,12 +100,12 @@ int do_vcma9(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
                                /* write checksum word */
                                cs8900_e2prom_write(addr, (0 - csum) << 8);
                        } else {
-                               printf("\nplease defined 'ethaddr'\n");
+                               puts("\nplease defined 'ethaddr'\n");
                        }
                } else if (strcmp(argv[2], "dump") == 0) {
                        uchar addr = 0, endaddr, csum; ushort data;
 
-                       printf("Dump of CS8900 config device: ");
+                       puts("Dump of CS8900 config device: ");
                        cs8900_e2prom_read(addr, &data);
                        if ((data & 0xE000) == 0xA000) {
                                endaddr = (data & 0x00FF) / 2;
@@ -119,9 +117,9 @@ int do_vcma9(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
                                }
                                printf("\nChecksum: %s", (csum == 0) ? "ok" : "wrong");
                        } else {
-                               printf("no valid config found");
+                               puts("no valid config found");
                        }
-                       printf("\n");
+                       puts("\n");
                }
 
                return 0;
@@ -175,6 +173,6 @@ int do_vcma9(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 
 U_BOOT_CMD(
        vcma9, 6, 1, do_vcma9,
-       "vcma9   - VCMA9 specific commands\n",
-       "flash mem [SrcAddr]\n    - updates U-Boot with image in memory\n"
+       "VCMA9 specific commands",
+       "flash mem [SrcAddr]\n    - updates U-Boot with image in memory"
 );