diff options
| author | Tom Rini <trini@konsulko.com> | 2018-12-10 07:16:33 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2018-12-10 07:16:33 -0500 |
| commit | 7ff485c68b7e5573e5a4a877066e98398283a24f (patch) | |
| tree | 8070ad8de0b18240ee67e1c8b847afc37bdb2d5d /cmd | |
| parent | 7504e9e75f76a5101b47cd32851ad7bd4ea8ff70 (diff) | |
| parent | 19f8c4dfb6e744a31da59bdd23b24d144152f1dc (diff) | |
| download | u-boot-7ff485c68b7e5573e5a4a877066e98398283a24f.tar.gz | |
Merge branch 'master' of git://git.denx.de/u-boot-i2c
- DM_I2C_COMPAT removal for all ti platforms from Jean-Jacques Hiblot
- Fix in i2c command help output from Chirstoph Muellner.
Diffstat (limited to 'cmd')
| -rw-r--r-- | cmd/Kconfig | 1 | ||||
| -rw-r--r-- | cmd/i2c.c | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/cmd/Kconfig b/cmd/Kconfig index b1cd1c9690..ea1a325eb3 100644 --- a/cmd/Kconfig +++ b/cmd/Kconfig @@ -445,6 +445,7 @@ config CRC32_VERIFY config CMD_EEPROM bool "eeprom - EEPROM subsystem" + depends on !DM_I2C || DM_I2C_COMPAT help (deprecated, needs conversion to driver model) Provides commands to read and write EEPROM (Electrically Erasable @@ -2023,6 +2023,7 @@ static int do_i2c(cmd_tbl_t * cmdtp, int flag, int argc, char * const argv[]) static char i2c_help_text[] = #if defined(CONFIG_SYS_I2C) || defined(CONFIG_DM_I2C) "bus [muxtype:muxaddr:muxchannel] - show I2C bus info\n" + "i2c " /* That's the prefix for the crc32 command below. */ #endif "crc32 chip address[.0, .1, .2] count - compute CRC32 checksum\n" #if defined(CONFIG_SYS_I2C) || \ |