Re: [U-Boot] [PATCH 03/17] eeprom: Zap CONFIG_SYS_I2C_MULTI_EEPROMS

Heiko Schocher Mon, 16 Nov 2015 03:27:51 -0800

Hello Marek,

Am 10.11.2015 um 20:53 schrieb Marek Vasut:

This option only complicates the code unnecessarily, just use
CONFIG_SYS_DEF_EEPROM_ADDR as the default address if there are
only five arguments to eeprom {read/write} if this is defined.
If CONFIG_SYS_DEF_EEPROM_ADDR is not defined, we mandate all
six arguments.


Signed-off-by: Marek Vasut <ma...@denx.de>
Cc: Simon Glass <s...@chromium.org>
Cc: Tom Rini <tr...@konsulko.com>
Cc: Heiko Schocher <h...@denx.de>
---
  common/cmd_eeprom.c             | 69 ++++++++++++++++++-----------------------
  include/configs/BSC9131RDB.h    |  1 -
  include/configs/BSC9132QDS.h    |  1 -
  include/configs/C29XPCIE.h      |  1 -
  include/configs/P1010RDB.h      |  1 -
  include/configs/PMC440.h        |  1 -
  include/configs/TQM834x.h       |  1 -
  include/configs/acadia.h        |  1 -
  include/configs/am335x_evm.h    |  1 -
  include/configs/am43xx_evm.h    |  1 -
  include/configs/axs101.h        |  1 -
  include/configs/bamboo.h        |  1 -
  include/configs/canyonlands.h   |  1 -
  include/configs/icon.h          |  1 -
  include/configs/intip.h         |  1 -
  include/configs/katmai.h        |  1 -
  include/configs/km/km-powerpc.h |  1 -
  include/configs/km/km_arm.h     |  1 -
  include/configs/luan.h          |  1 -
  include/configs/m28evk.h        |  1 -
  include/configs/motionpro.h     |  1 -
  include/configs/p1_p2_rdb_pc.h  |  1 -
  include/configs/p1_twr.h        |  1 -
  include/configs/pcm051.h        |  1 -
  include/configs/pengwyn.h       |  1 -
  include/configs/sequoia.h       |  1 -
  include/configs/t3corp.h        |  1 -
  include/configs/tricorder.h     |  1 -
  include/configs/walnut.h        |  1 -
  include/configs/yosemite.h      |  1 -
  30 files changed, 30 insertions(+), 68 deletions(-)



Reviewed-by: Heiko Schocher <h...@denx.de>

bye,
Heiko


diff --git a/common/cmd_eeprom.c b/common/cmd_eeprom.c
index 4335079..0b59bea 100644
--- a/common/cmd_eeprom.c
+++ b/common/cmd_eeprom.c
@@ -338,50 +338,50 @@ static int do_eeprom(cmd_tbl_t *cmdtp, int flag, int 
argc, char * const argv[])
  {
        const char *const fmt =
                "\nEEPROM @0x%lX %s: addr %08lx  off %04lx  count %ld ... ";
+       char * const *args = &argv[2];
+       int rcode;
+       ulong dev_addr, addr, off, cnt;
+
+       switch (argc) {
+#ifdef CONFIG_SYS_DEF_EEPROM_ADDR
+       case 5:
+               dev_addr = CONFIG_SYS_DEF_EEPROM_ADDR;
+               break;
+#endif
+       case 6:
+               dev_addr = simple_strtoul(*args++, NULL, 16);
+               break;
+       default:
+               return CMD_RET_USAGE;
+       }

-#if defined(CONFIG_SYS_I2C_MULTI_EEPROMS)
-       if (argc == 6) {
-               ulong dev_addr = simple_strtoul (argv[2], NULL, 16);
-               ulong addr = simple_strtoul (argv[3], NULL, 16);
-               ulong off  = simple_strtoul (argv[4], NULL, 16);
-               ulong cnt  = simple_strtoul (argv[5], NULL, 16);
-#else
-       if (argc == 5) {
-               ulong dev_addr = CONFIG_SYS_DEF_EEPROM_ADDR;
-               ulong addr = simple_strtoul (argv[2], NULL, 16);
-               ulong off  = simple_strtoul (argv[3], NULL, 16);
-               ulong cnt  = simple_strtoul (argv[4], NULL, 16);
-#endif /* CONFIG_SYS_I2C_MULTI_EEPROMS */
+       addr = simple_strtoul(*args++, NULL, 16);
+       off = simple_strtoul(*args++, NULL, 16);
+       cnt = simple_strtoul(*args++, NULL, 16);

  # if !defined(CONFIG_SPI) || defined(CONFIG_ENV_EEPROM_IS_ON_I2C)
-               eeprom_init ();
+       eeprom_init ();
  # endif /* !CONFIG_SPI */

-               if (strcmp (argv[1], "read") == 0) {
-                       int rcode;
-
-                       printf (fmt, dev_addr, argv[1], addr, off, cnt);
-
-                       rcode = eeprom_read (dev_addr, off, (uchar *) addr, 
cnt);
+       if (strcmp (argv[1], "read") == 0) {
+               printf(fmt, dev_addr, argv[1], addr, off, cnt);

-                       puts ("done\n");
-                       return rcode;
-               } else if (strcmp (argv[1], "write") == 0) {
-                       int rcode;
+               rcode = eeprom_read(dev_addr, off, (uchar *) addr, cnt);

-                       printf (fmt, dev_addr, argv[1], addr, off, cnt);
+               puts ("done\n");
+               return rcode;
+       } 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");
-                       return rcode;
-               }
+               puts ("done\n");
+               return rcode;
        }

        return CMD_RET_USAGE;
  }

-#ifdef CONFIG_SYS_I2C_MULTI_EEPROMS
  U_BOOT_CMD(
        eeprom, 6,      1,      do_eeprom,
        "EEPROM sub-system",
@@ -389,12 +389,3 @@ U_BOOT_CMD(
        "eeprom write devaddr addr off cnt\n"
        "       - read/write `cnt' bytes from `devaddr` EEPROM at offset `off'"
  )
-#else /* One EEPROM */
-U_BOOT_CMD(
-       eeprom, 5,      1,      do_eeprom,
-       "EEPROM sub-system",
-       "read  addr off cnt\n"
-       "eeprom write addr off cnt\n"
-       "       - read/write `cnt' bytes at EEPROM offset `off'"
-)
-#endif /* CONFIG_SYS_I2C_MULTI_EEPROMS */
diff --git a/include/configs/BSC9131RDB.h b/include/configs/BSC9131RDB.h
index 2754016..193ffbc 100644
--- a/include/configs/BSC9131RDB.h
+++ b/include/configs/BSC9131RDB.h
@@ -267,7 +267,6 @@ extern unsigned long get_sdram_size(void);

  /* I2C EEPROM */
  #define CONFIG_CMD_EEPROM
-#define CONFIG_SYS_I2C_MULTI_EEPROMS
  #define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 1
  #define CONFIG_SYS_EEPROM_PAGE_WRITE_BITS 3
  #define CONFIG_SYS_EEPROM_PAGE_WRITE_DELAY_MS 5
diff --git a/include/configs/BSC9132QDS.h b/include/configs/BSC9132QDS.h
index 54dcf3b..4b0e5f1 100644
--- a/include/configs/BSC9132QDS.h
+++ b/include/configs/BSC9132QDS.h
@@ -463,7 +463,6 @@ combinations. this should be removed later

  /* enable read and write access to EEPROM */
  #define CONFIG_CMD_EEPROM
-#define CONFIG_SYS_I2C_MULTI_EEPROMS
  #define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 1
  #define CONFIG_SYS_EEPROM_PAGE_WRITE_BITS 3
  #define CONFIG_SYS_EEPROM_PAGE_WRITE_DELAY_MS 5
diff --git a/include/configs/C29XPCIE.h b/include/configs/C29XPCIE.h
index 94f991b..c76d05f 100644
--- a/include/configs/C29XPCIE.h
+++ b/include/configs/C29XPCIE.h
@@ -420,7 +420,6 @@
  /* I2C EEPROM */
  /* enable read and write access to EEPROM */
  #define CONFIG_CMD_EEPROM
-#define CONFIG_SYS_I2C_MULTI_EEPROMS
  #define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 2
  #define CONFIG_SYS_EEPROM_PAGE_WRITE_BITS 3
  #define CONFIG_SYS_EEPROM_PAGE_WRITE_DELAY_MS 5
diff --git a/include/configs/P1010RDB.h b/include/configs/P1010RDB.h
index 81b0855..8a137d0 100644
--- a/include/configs/P1010RDB.h
+++ b/include/configs/P1010RDB.h
@@ -660,7 +660,6 @@ extern unsigned long get_sdram_size(void);
  #endif
  /* enable read and write access to EEPROM */
  #define CONFIG_CMD_EEPROM
-#define CONFIG_SYS_I2C_MULTI_EEPROMS
  #define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 1
  #define CONFIG_SYS_EEPROM_PAGE_WRITE_BITS 3
  #define CONFIG_SYS_EEPROM_PAGE_WRITE_DELAY_MS 5
diff --git a/include/configs/PMC440.h b/include/configs/PMC440.h
index 0227649..26a1444 100644
--- a/include/configs/PMC440.h
+++ b/include/configs/PMC440.h
@@ -159,7 +159,6 @@
  #define CONFIG_SYS_I2C_PPC4XX_SPEED_1         400000
  #define CONFIG_SYS_I2C_PPC4XX_SLAVE_1         0x7F

-#define CONFIG_SYS_I2C_MULTI_EEPROMS

  #define CONFIG_SYS_I2C_EEPROM_ADDR            0x54
  #define CONFIG_SYS_I2C_EEPROM_ADDR_LEN                2
diff --git a/include/configs/TQM834x.h b/include/configs/TQM834x.h
index 0b046d1..9f6bd0f 100644
--- a/include/configs/TQM834x.h
+++ b/include/configs/TQM834x.h
@@ -183,7 +183,6 @@
  #define CONFIG_SYS_I2C_EEPROM_ADDR_LEN                2       /* 16 bit */
  #define CONFIG_SYS_EEPROM_PAGE_WRITE_BITS     5       /* 32 bytes/write */
  #define CONFIG_SYS_EEPROM_PAGE_WRITE_DELAY_MS 12      /* 10ms +/- 20% */
-#define CONFIG_SYS_I2C_MULTI_EEPROMS           /* more than one eeprom */

  /* I2C RTC */
  #define CONFIG_RTC_DS1337                     /* use ds1337 rtc via i2c */
diff --git a/include/configs/acadia.h b/include/configs/acadia.h
index 4dd5720..2f53d73 100644
--- a/include/configs/acadia.h
+++ b/include/configs/acadia.h
@@ -120,7 +120,6 @@
   *----------------------------------------------------------------------*/
  #define CONFIG_SYS_I2C_PPC4XX_SPEED_0         400000

-#define CONFIG_SYS_I2C_MULTI_EEPROMS
  #define CONFIG_SYS_I2C_EEPROM_ADDR    (0xa8>>1)
  #define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 1
  #define CONFIG_SYS_EEPROM_PAGE_WRITE_BITS 3
diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h
index d58816d..a4b8e0f 100644
--- a/include/configs/am335x_evm.h
+++ b/include/configs/am335x_evm.h
@@ -213,7 +213,6 @@
  #define CONFIG_ENV_EEPROM_IS_ON_I2C
  #define CONFIG_SYS_I2C_EEPROM_ADDR    0x50    /* Main EEPROM */
  #define CONFIG_SYS_I2C_EEPROM_ADDR_LEN        2
-#define CONFIG_SYS_I2C_MULTI_EEPROMS

  /* PMIC support */
  #define CONFIG_POWER_TPS65217
diff --git a/include/configs/am43xx_evm.h b/include/configs/am43xx_evm.h
index d93e3e7..5821137 100644
--- a/include/configs/am43xx_evm.h
+++ b/include/configs/am43xx_evm.h
@@ -36,7 +36,6 @@
  #define CONFIG_ENV_EEPROM_IS_ON_I2C
  #define CONFIG_SYS_I2C_EEPROM_ADDR    0x50    /* Main EEPROM */
  #define CONFIG_SYS_I2C_EEPROM_ADDR_LEN        2
-#define CONFIG_SYS_I2C_MULTI_EEPROMS

  /* Power */
  #define CONFIG_POWER
diff --git a/include/configs/axs101.h b/include/configs/axs101.h
index 450291c..e921f19 100644
--- a/include/configs/axs101.h
+++ b/include/configs/axs101.h
@@ -91,7 +91,6 @@
  /*
   * EEPROM configuration
   */
-#define CONFIG_SYS_I2C_MULTI_EEPROMS
  #define CONFIG_SYS_I2C_EEPROM_ADDR            (0xA8 >> 1)
  #define CONFIG_SYS_I2C_EEPROM_ADDR_LEN                1
  #define CONFIG_SYS_I2C_EEPROM_ADDR_OVERFLOW   1
diff --git a/include/configs/bamboo.h b/include/configs/bamboo.h
index 6ba4aaf..5b8b22f 100644
--- a/include/configs/bamboo.h
+++ b/include/configs/bamboo.h
@@ -139,7 +139,6 @@
   *----------------------------------------------------------------------*/
  #define CONFIG_SYS_I2C_PPC4XX_SPEED_0         400000

-#define CONFIG_SYS_I2C_MULTI_EEPROMS
  #define CONFIG_SYS_I2C_EEPROM_ADDR    (0xa8>>1)
  #define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 1
  #define CONFIG_SYS_EEPROM_PAGE_WRITE_BITS 3
diff --git a/include/configs/canyonlands.h b/include/configs/canyonlands.h
index ed790cc..e136824 100644
--- a/include/configs/canyonlands.h
+++ b/include/configs/canyonlands.h
@@ -248,7 +248,6 @@
   *----------------------------------------------------------------------*/
  #define CONFIG_SYS_I2C_PPC4XX_SPEED_0         400000

-#define CONFIG_SYS_I2C_MULTI_EEPROMS
  #define CONFIG_SYS_I2C_EEPROM_ADDR            (0xa8>>1)
  #define CONFIG_SYS_I2C_EEPROM_ADDR_LEN                1
  #define CONFIG_SYS_EEPROM_PAGE_WRITE_BITS     3
diff --git a/include/configs/icon.h b/include/configs/icon.h
index bbe9b59..d9a3671 100644
--- a/include/configs/icon.h
+++ b/include/configs/icon.h
@@ -107,7 +107,6 @@

  #define CONFIG_SYS_SPD_BUS_NUM        0       /* The I2C bus for SPD          
*/

-#define CONFIG_SYS_I2C_MULTI_EEPROMS
  #define CONFIG_SYS_I2C_EEPROM_ADDR    0x50
  #define CONFIG_SYS_I2C_EEPROM_ADDR_LEN        1
  #define CONFIG_SYS_EEPROM_PAGE_WRITE_BITS 3
diff --git a/include/configs/intip.h b/include/configs/intip.h
index a676a20..60c9e2c 100644
--- a/include/configs/intip.h
+++ b/include/configs/intip.h
@@ -214,7 +214,6 @@
   */
  #define CONFIG_SYS_I2C_PPC4XX_SPEED_0         400000

-#define CONFIG_SYS_I2C_MULTI_EEPROMS
  #define CONFIG_SYS_I2C_EEPROM_ADDR            (0xa8>>1)
  #define CONFIG_SYS_I2C_EEPROM_ADDR_LEN                1
  #define CONFIG_SYS_EEPROM_PAGE_WRITE_BITS     3
diff --git a/include/configs/katmai.h b/include/configs/katmai.h
index fa72eb0..664896b 100644
--- a/include/configs/katmai.h
+++ b/include/configs/katmai.h
@@ -109,7 +109,6 @@
  #define IIC0_BOOTPROM_ADDR    0x50
  #define IIC0_ALT_BOOTPROM_ADDR        0x54

-#define CONFIG_SYS_I2C_MULTI_EEPROMS
  #define CONFIG_SYS_I2C_EEPROM_ADDR    (0x50)
  #define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 1
  #define CONFIG_SYS_EEPROM_PAGE_WRITE_BITS 3
diff --git a/include/configs/km/km-powerpc.h b/include/configs/km/km-powerpc.h
index eb85a74..2b0b9dc 100644
--- a/include/configs/km/km-powerpc.h
+++ b/include/configs/km/km-powerpc.h
@@ -21,7 +21,6 @@
  #define CONFIG_KM_COMMON_ETH_INIT

  /* EEprom support 24C08, 24C16, 24C64 */
-#define CONFIG_SYS_I2C_MULTI_EEPROMS
  #define CONFIG_SYS_EEPROM_PAGE_WRITE_ENABLE
  #define CONFIG_SYS_EEPROM_PAGE_WRITE_BITS     3  /* 8 Byte write page */
  #define CONFIG_SYS_EEPROM_PAGE_WRITE_DELAY_MS 10
diff --git a/include/configs/km/km_arm.h b/include/configs/km/km_arm.h
index b89af53..798c9a7 100644
--- a/include/configs/km/km_arm.h
+++ b/include/configs/km/km_arm.h
@@ -215,7 +215,6 @@ int get_scl(void);
  #define       CONFIG_SYS_I2C_SOFT_SPEED       100000

  /* EEprom support 24C128, 24C256 valid for environment eeprom */
-#define CONFIG_SYS_I2C_MULTI_EEPROMS
  #define CONFIG_SYS_EEPROM_PAGE_WRITE_ENABLE
  #define CONFIG_SYS_EEPROM_PAGE_WRITE_BITS     6 /* 64 Byte write page */
  #define CONFIG_SYS_EEPROM_PAGE_WRITE_DELAY_MS 10
diff --git a/include/configs/luan.h b/include/configs/luan.h
index 15e4a7e..e22d0e8 100644
--- a/include/configs/luan.h
+++ b/include/configs/luan.h
@@ -119,7 +119,6 @@
   *----------------------------------------------------------------------*/
  #define CONFIG_SYS_I2C_PPC4XX_SPEED_0         400000

-#define CONFIG_SYS_I2C_MULTI_EEPROMS
  #define CONFIG_SYS_I2C_EEPROM_ADDR    (0xa8>>1)
  #define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 1
  #define CONFIG_SYS_EEPROM_PAGE_WRITE_BITS 3
diff --git a/include/configs/m28evk.h b/include/configs/m28evk.h
index 29c60b7..f9fc66f 100644
--- a/include/configs/m28evk.h
+++ b/include/configs/m28evk.h
@@ -92,7 +92,6 @@

  /* EEPROM */
  #ifdef CONFIG_CMD_EEPROM
-#define CONFIG_SYS_I2C_MULTI_EEPROMS
  #define CONFIG_SYS_I2C_EEPROM_ADDR_LEN        2
  #endif

diff --git a/include/configs/motionpro.h b/include/configs/motionpro.h
index 97c614b..a8cf201 100644
--- a/include/configs/motionpro.h
+++ b/include/configs/motionpro.h
@@ -285,7 +285,6 @@
  #define CONFIG_SYS_I2C_EEPROM_ADDR_LEN                1
  #define CONFIG_SYS_EEPROM_PAGE_WRITE_BITS     1       /* 2 bytes per write 
cycle */
  #define CONFIG_SYS_EEPROM_PAGE_WRITE_DELAY_MS 5       /* 2ms/cycle + 3ms 
extra */
-#define CONFIG_SYS_I2C_MULTI_EEPROMS           1       /* 2 EEPROMs 
(addr:50,52) */

  /*
   * RTC configuration
diff --git a/include/configs/p1_p2_rdb_pc.h b/include/configs/p1_p2_rdb_pc.h
index 433c409..e039af4 100644
--- a/include/configs/p1_p2_rdb_pc.h
+++ b/include/configs/p1_p2_rdb_pc.h
@@ -701,7 +701,6 @@

  /* enable read and write access to EEPROM */
  #define CONFIG_CMD_EEPROM
-#define CONFIG_SYS_I2C_MULTI_EEPROMS
  #define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 1
  #define CONFIG_SYS_EEPROM_PAGE_WRITE_BITS 3
  #define CONFIG_SYS_EEPROM_PAGE_WRITE_DELAY_MS 5
diff --git a/include/configs/p1_twr.h b/include/configs/p1_twr.h
index d83daa0..3089969 100644
--- a/include/configs/p1_twr.h
+++ b/include/configs/p1_twr.h
@@ -262,7 +262,6 @@ extern unsigned long get_board_sys_clk(unsigned long dummy);

  /* enable read and write access to EEPROM */
  #define CONFIG_CMD_EEPROM
-#define CONFIG_SYS_I2C_MULTI_EEPROMS
  #define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 1
  #define CONFIG_SYS_EEPROM_PAGE_WRITE_BITS 3
  #define CONFIG_SYS_EEPROM_PAGE_WRITE_DELAY_MS 5
diff --git a/include/configs/pcm051.h b/include/configs/pcm051.h
index 275e952..64cfd81 100644
--- a/include/configs/pcm051.h
+++ b/include/configs/pcm051.h
@@ -115,7 +115,6 @@
  #define CONFIG_ENV_EEPROM_IS_ON_I2C
  #define CONFIG_SYS_I2C_EEPROM_ADDR    0x50    /* Main EEPROM */
  #define CONFIG_SYS_I2C_EEPROM_ADDR_LEN        2
-#define CONFIG_SYS_I2C_MULTI_EEPROMS

  #define CONFIG_SYS_BAUDRATE_TABLE     { 110, 300, 600, 1200, 2400, \
  4800, 9600, 14400, 19200, 28800, 38400, 56000, 57600, 115200 }
diff --git a/include/configs/pengwyn.h b/include/configs/pengwyn.h
index ccb5dd3..b057539 100644
--- a/include/configs/pengwyn.h
+++ b/include/configs/pengwyn.h
@@ -112,7 +112,6 @@
  #define CONFIG_ENV_EEPROM_IS_ON_I2C
  #define CONFIG_SYS_I2C_EEPROM_ADDR    0x50
  #define CONFIG_SYS_I2C_EEPROM_ADDR_LEN        2
-#define CONFIG_SYS_I2C_MULTI_EEPROMS

  /* SPL */
  #define CONFIG_SPL_POWER_SUPPORT
diff --git a/include/configs/sequoia.h b/include/configs/sequoia.h
index 1f1beea..f32459b 100644
--- a/include/configs/sequoia.h
+++ b/include/configs/sequoia.h
@@ -151,7 +151,6 @@
   */
  #define CONFIG_SYS_I2C_PPC4XX_SPEED_0         400000

-#define CONFIG_SYS_I2C_MULTI_EEPROMS
  #define CONFIG_SYS_I2C_EEPROM_ADDR    (0xa8>>1)
  #define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 1
  #define CONFIG_SYS_EEPROM_PAGE_WRITE_BITS 3
diff --git a/include/configs/t3corp.h b/include/configs/t3corp.h
index 502e795..7942865 100644
--- a/include/configs/t3corp.h
+++ b/include/configs/t3corp.h
@@ -307,7 +307,6 @@
   */
  #define CONFIG_SYS_I2C_PPC4XX_SPEED_0                 400000

-#define CONFIG_SYS_I2C_MULTI_EEPROMS
  #define CONFIG_SYS_I2C_EEPROM_ADDR            (0xa8>>1)
  #define CONFIG_SYS_I2C_EEPROM_ADDR_LEN                1
  #define CONFIG_SYS_EEPROM_PAGE_WRITE_BITS     3
diff --git a/include/configs/tricorder.h b/include/configs/tricorder.h
index 02b0e63..e453151 100644
--- a/include/configs/tricorder.h
+++ b/include/configs/tricorder.h
@@ -112,7 +112,6 @@


  /* EEPROM */
-#define CONFIG_SYS_I2C_MULTI_EEPROMS
  #define CONFIG_CMD_EEPROM
  #define CONFIG_SYS_I2C_EEPROM_ADDR_LEN        2
  #define CONFIG_SYS_EEPROM_BUS_NUM     1
diff --git a/include/configs/walnut.h b/include/configs/walnut.h
index 8b803a2..dd6b519 100644
--- a/include/configs/walnut.h
+++ b/include/configs/walnut.h
@@ -80,7 +80,6 @@
   */
  #define CONFIG_SYS_I2C_PPC4XX_SPEED_0         400000

-#define CONFIG_SYS_I2C_MULTI_EEPROMS
  #define CONFIG_SYS_I2C_EEPROM_ADDR    (0xa8>>1)
  #define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 1
  #define CONFIG_SYS_EEPROM_PAGE_WRITE_BITS 3
diff --git a/include/configs/yosemite.h b/include/configs/yosemite.h
index 8508a80..0cffab8 100644
--- a/include/configs/yosemite.h
+++ b/include/configs/yosemite.h
@@ -122,7 +122,6 @@
   *----------------------------------------------------------------------*/
  #define CONFIG_SYS_I2C_PPC4XX_SPEED_0         400000

-#define CONFIG_SYS_I2C_MULTI_EEPROMS
  #define CONFIG_SYS_I2C_EEPROM_ADDR    (0xa8>>1)
  #define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 1
  #define CONFIG_SYS_EEPROM_PAGE_WRITE_BITS 3


--
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
_______________________________________________
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot

Re: [U-Boot] [PATCH 03/17] eeprom: Zap CONFIG_SYS_I2C_MULTI_EEPROMS

Reply via email to