Add config option for disabling DM9000-SROM support.

[u-boot] / board / trizepsiv / eeprom.c

diff --git a/board/trizepsiv/eeprom.c b/board/trizepsiv/eeprom.c
index 7a2b90585b886a1947aa28a4f7e1df36639b8990..9fa7aef9a29864fa14a78df9fa32641801d9a046 100644 (file)
--- a/board/trizepsiv/eeprom.c
+++ b/board/trizepsiv/eeprom.c
@@ -23,17 +23,17 @@
 
 #include <common.h>
 #include <command.h>
-
-extern u16 read_srom_word(int);
-extern void write_srom_word(int offset, u16 val);
+#include <dm9000.h>
 
 static int do_read_dm9000_eeprom ( cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) {
-       int i;
+       unsigned int i;
+       u8 data[2];
 
        for (i=0; i < 0x40; i++) {
                if (!(i % 0x10))
-                       printf("\n%08lx:", i);
-               printf(" %04x", read_srom_word(i));
+                       printf("\n%08x:", i);
+               dm9000_read_srom_word(i, data);
+               printf(" %02x%02x", data[1], data[0]);
        }
        printf ("\n");
        return (0);
@@ -43,7 +43,7 @@ static int do_write_dm9000_eeprom ( cmd_tbl_t *cmdtp, int flag, int argc, char *
        int offset,value;
 
        if (argc < 4) {
-               printf ("Usage:\n%s\n", cmdtp->usage);
+               cmd_usage(cmdtp);
                return 1;
        }
 
@@ -51,16 +51,16 @@ static int do_write_dm9000_eeprom ( cmd_tbl_t *cmdtp, int flag, int argc, char *
        value=simple_strtoul(argv[3],NULL,16);
        if (offset > 0x40) {
                printf("Wrong offset : 0x%x\n",offset);
-               printf ("Usage:\n%s\n", cmdtp->usage);
+               cmd_usage(cmdtp);
                return 1;
        }
-       write_srom_word(offset, value);
+       dm9000_write_srom_word(offset, value);
        return (0);
 }
 
 int do_dm9000_eeprom ( cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) {
        if (argc < 2) {
-               printf ("Usage:\n%s\n", cmdtp->usage);
+               cmd_usage(cmdtp);
                return 1;
        }
 
@@ -69,14 +69,14 @@ int do_dm9000_eeprom ( cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) {
        } else if (strcmp (argv[1],"write") == 0) {
                return (do_write_dm9000_eeprom(cmdtp,flag,argc,argv));
        } else {
-               printf ("Usage:\n%s\n", cmdtp->usage);
+               cmd_usage(cmdtp);
                return 1;
        }
 }
 
 U_BOOT_CMD(
        dm9000ee,4,1,do_dm9000_eeprom,
-       "dm9000ee- Read/Write eeprom connected to Ethernet Controller\n",
+       "Read/Write eeprom connected to Ethernet Controller",
        "\ndm9000ee write <word offset> <value> \n"
        "\tdm9000ee read \n"
        "\tword:\t\t00-02 : MAC Address\n"