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

[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..0ee959507f7e516626b667ef2a6731073a5efda9 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>
+#if defined(CONFIG_CS8900)
+#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,75 +56,78 @@ 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;
-
+       struct eth_device *dev;
+       char cs8900_name[10];
        if (strcmp(argv[1], "info") == 0)
        {
                print_vcma9_info();
-               return 0;
-       }
-#if defined(CONFIG_DRIVER_CS8900)
-       if (strcmp(argv[1], "cs8900_eeprom") == 0) {
+               return 0;
+       }
+#if defined(CONFIG_CS8900)
+       if (strcmp(argv[1], "cs8900") == 0) {
+               sprintf(cs8900_name, "%s-0", CS8900_DRIVERNAME);
+               dev = eth_get_dev_by_name(cs8900_name);
+               if (!dev) {
+                       printf("Couldn't find CS8900 driver");
+                       return 0;
+               }
                if (strcmp(argv[2], "read") == 0) {
                        uchar addr; ushort data;
 
                        addr = simple_strtoul(argv[3], NULL, 16);
-                       cs8900_e2prom_read(addr, &data);
+                       cs8900_e2prom_read(dev, addr, &data);
                        printf("0x%2.2X: 0x%4.4X\n", addr, data);
                } else if (strcmp(argv[2], "write") == 0) {
                        uchar addr; ushort data;
 
                        addr = simple_strtoul(argv[3], NULL, 16);
                        data = simple_strtoul(argv[4], NULL, 16);
-                       cs8900_e2prom_write(addr, data);
+                       cs8900_e2prom_write(dev, 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);
+                               cs8900_e2prom_write(dev, 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];
-                                       cs8900_e2prom_write(addr, data);
+                                       data = ethaddr[i+1] << 8 |
+                                              ethaddr[i];
+                                       cs8900_e2prom_write(dev, addr, data);
                                        csum += cs8900_chksum(data);
                                        addr++;
                                }
                                /* calculate header link byte */
                                data = 0xA100 | (addr * 2);
-                               cs8900_e2prom_write(0, data);
+                               cs8900_e2prom_write(dev, 0, data);
                                csum += cs8900_chksum(data);
                                /* write checksum word */
-                               cs8900_e2prom_write(addr, (0 - csum) << 8);
+                               cs8900_e2prom_write(dev, 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: ");
-                       cs8900_e2prom_read(addr, &data);
+                       puts("Dump of CS8900 config device: ");
+                       cs8900_e2prom_read(dev, addr, &data);
                        if ((data & 0xE000) == 0xA000) {
                                endaddr = (data & 0x00FF) / 2;
                                csum = cs8900_chksum(data);
                                for (addr = 1; addr <= endaddr; addr++) {
-                                       cs8900_e2prom_read(addr, &data);
+                                       cs8900_e2prom_read(dev, addr, &data);
                                        printf("\n0x%2.2X: 0x%4.4X", addr, data);
                                        csum += cs8900_chksum(data);
                                }
                                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 +181,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"
 );