eeprom: fix eeprom write procedure

[people/ms/u-boot.git] / common / cmd_eeprom.c

diff --git a/common/cmd_eeprom.c b/common/cmd_eeprom.c
index 120ddbbf97a8f482edfb3ea408e564caba66b4d0..571240a99bc011da7b4cc9f05de32f2c82eb59a8 100644 (file)
--- a/common/cmd_eeprom.c
+++ b/common/cmd_eeprom.c
@@ -49,8 +49,8 @@
  */
 #if !defined(CONFIG_SPI) || defined(CONFIG_ENV_EEPROM_IS_ON_I2C)
 #if !defined(CONFIG_SYS_I2C_EEPROM_ADDR_LEN) || \
-    (CONFIG_SYS_I2C_EEPROM_ADDR_LEN < 1) || \
-    (CONFIG_SYS_I2C_EEPROM_ADDR_LEN > 2)
+       (CONFIG_SYS_I2C_EEPROM_ADDR_LEN < 1) || \
+       (CONFIG_SYS_I2C_EEPROM_ADDR_LEN > 2)
 #error CONFIG_SYS_I2C_EEPROM_ADDR_LEN must be 1 or 2
 #endif
 #endif
@@ -185,7 +185,8 @@ int eeprom_read(unsigned dev_addr, unsigned offset, uchar *buffer, unsigned cnt)
        return eeprom_rw(dev_addr, offset, buffer, cnt, 1);
 }
 
-int eeprom_write(unsigned dev_addr, unsigned offset, uchar *buffer, unsigned cnt)
+int eeprom_write(unsigned dev_addr, unsigned offset,
+                uchar *buffer, unsigned cnt)
 {
        int ret;
 
@@ -196,7 +197,7 @@ int eeprom_write(unsigned dev_addr, unsigned offset, uchar *buffer, unsigned cnt
         * We must write the address again when changing pages
         * because the address counter only increments within a page.
         */
-       ret = eeprom_rw(dev_addr, offset, buffer, cnt, 1);
+       ret = eeprom_rw(dev_addr, offset, buffer, cnt, 0);
 
        eeprom_write_enable(dev_addr, 0);
        return ret;
@@ -209,14 +210,21 @@ static int do_eeprom(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
        char * const *args = &argv[2];
        int rcode;
        ulong dev_addr, addr, off, cnt;
+       int bus_addr;
 
        switch (argc) {
 #ifdef CONFIG_SYS_DEF_EEPROM_ADDR
        case 5:
+               bus_addr = -1;
                dev_addr = CONFIG_SYS_DEF_EEPROM_ADDR;
                break;
 #endif
        case 6:
+               bus_addr = -1;
+               dev_addr = simple_strtoul(*args++, NULL, 16);
+               break;
+       case 7:
+               bus_addr = simple_strtoul(*args++, NULL, 16);
                dev_addr = simple_strtoul(*args++, NULL, 16);
                break;
        default:
@@ -227,21 +235,21 @@ static int do_eeprom(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
        off = simple_strtoul(*args++, NULL, 16);
        cnt = simple_strtoul(*args++, NULL, 16);
 
-       eeprom_init(-1);
+       eeprom_init(bus_addr);
 
-       if (strcmp (argv[1], "read") == 0) {
+       if (strcmp(argv[1], "read") == 0) {
                printf(fmt, dev_addr, argv[1], addr, off, cnt);
 
-               rcode = eeprom_read(dev_addr, off, (uchar *) addr, cnt);
+               rcode = eeprom_read(dev_addr, off, (uchar *)addr, cnt);
 
-               puts ("done\n");
+               puts("done\n");
                return rcode;
-       } else if (strcmp (argv[1], "write") == 0) {
+       } else if (strcmp(argv[1], "write") == 0) {
                printf(fmt, dev_addr, argv[1], addr, off, cnt);
 
-               rcode = eeprom_write(dev_addr, off, (uchar *) addr, cnt);
+               rcode = eeprom_write(dev_addr, off, (uchar *)addr, cnt);
 
-               puts ("done\n");
+               puts("done\n");
                return rcode;
        }
 
@@ -249,9 +257,9 @@ static int do_eeprom(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 }
 
 U_BOOT_CMD(
-       eeprom, 6,      1,      do_eeprom,
+       eeprom, 7,      1,      do_eeprom,
        "EEPROM sub-system",
-       "read  devaddr addr off cnt\n"
-       "eeprom write devaddr addr off cnt\n"
+       "read  <bus> <devaddr> addr off cnt\n"
+       "eeprom write <bus> <devaddr> addr off cnt\n"
        "       - read/write `cnt' bytes from `devaddr` EEPROM at offset `off'"
 )