Merge branch 'master' of git://www.denx.de/git/u-boot-imx

2015-03-05 07:22:18 -05:00
parent 7ae8350f67 32df39c741
commit 02ebe6f702
52 changed files with 1196 additions and 52 deletions
--- a/3
+++ b/3
@@ -4422,6 +4422,9 @@ to save the current settings.
 	  If defined, specified the chip address of the EEPROM device.
 	  The default address is zero.

+	- CONFIG_SYS_I2C_EEPROM_BUS:
+	  If defined, specified the i2c bus of the EEPROM device.
+
 	- CONFIG_SYS_EEPROM_PAGE_WRITE_BITS:
 	  If defined, the number of bits used to address bytes in a
 	  single page in the EEPROM device.  A 64 byte page, for example