From: Mario Six <six@gdsys.de>
Date: Wed, 20 Apr 2016 08:44:52 +0000 (+0200)
Subject: i2c/eeprom: Always define I2C_RXTX_LEN
X-Git-Tag: v2016.05~31
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=a6e7b7744e158c4c02f91fcbf991845cad4dc6e3;p=oweals%2Fu-boot.git

i2c/eeprom: Always define I2C_RXTX_LEN

I2C_RXTX_LEN from include/i2c.h is not defined if CONFIG_DM_I2C is
enabled. This leads to a compilation error on boards that enable both
CONFIG_CMD_EEPROM and CONFIG_DM_I2C.

To avoid this, we define I2C_RXTX_LEN in cmd/eeprom.c if it is not
already defined.

Signed-off-by: Mario Six <mario.six@gdsys.cc>
---

diff --git a/cmd/eeprom.c b/cmd/eeprom.c
index 571240a99b..e5457ba0cf 100644
--- a/cmd/eeprom.c
+++ b/cmd/eeprom.c
@@ -37,6 +37,10 @@
 #define CONFIG_SYS_EEPROM_PAGE_WRITE_BITS	8
 #endif
 
+#ifndef	I2C_RXTX_LEN
+#define I2C_RXTX_LEN	128
+#endif
+
 #define	EEPROM_PAGE_SIZE	(1 << CONFIG_SYS_EEPROM_PAGE_WRITE_BITS)
 #define	EEPROM_PAGE_OFFSET(x)	((x) & (EEPROM_PAGE_SIZE - 1))