Merge branch 'master' of /home/stefan/git/u-boot/lwmon5

[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..227c49272cef347b406202c658b1a3f53734a66a 100644 (file)
--- a/board/mpl/vcma9/cmd_vcma9.c
+++ b/board/mpl/vcma9/cmd_vcma9.c
@@ -40,6 +40,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 +55,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;
        }
 #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;
 
@@ -102,12 +102,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 +119,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;