diff options
| author | Simon Glass <sjg@chromium.org> | 2017-05-13 03:09:56 (GMT) |
|---|---|---|
| committer | Heiko Schocher <hs@denx.de> | 2017-05-15 04:18:30 (GMT) |
| commit | 69153988a6f4eda44257c6bc5afac484f8f95930 (patch) | |
| tree | 4f3995cb48da7354d628689aaf09ab9fa3cfdd23 /common | |
| parent | 64a144dcea038df2b58dd3120a880e89164af09f (diff) | |
| download | u-boot-fsl-qoriq-69153988a6f4eda44257c6bc5afac484f8f95930.tar.xz | |
i2c: Finish dropping use of CONFIG_I2C_HARD
Drop use of this long-deprecated option.
Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Tom Rini <trini@konsulko.com>
Diffstat (limited to 'common')
| -rw-r--r-- | common/board_f.c | 4 | ||||
| -rw-r--r-- | common/stdio.c | 5 |
2 files changed, 3 insertions, 6 deletions
diff --git a/common/board_f.c b/common/board_f.c index d9431ee..eed3e7b 100644 --- a/common/board_f.c +++ b/common/board_f.c @@ -184,7 +184,7 @@ __weak int dram_init_banksize(void) return 0; } -#if defined(CONFIG_HARD_I2C) || defined(CONFIG_SYS_I2C) +#if defined(CONFIG_SYS_I2C) static int init_func_i2c(void) { puts("I2C: "); @@ -765,7 +765,7 @@ static const init_fnc_t init_sequence_f[] = { misc_init_f, #endif INIT_FUNC_WATCHDOG_RESET -#if defined(CONFIG_HARD_I2C) || defined(CONFIG_SYS_I2C) +#if defined(CONFIG_SYS_I2C) init_func_i2c, #endif #if defined(CONFIG_HARD_SPI) diff --git a/common/stdio.c b/common/stdio.c index 4d30017..ee4f0bd 100644 --- a/common/stdio.c +++ b/common/stdio.c @@ -21,7 +21,7 @@ #include <logbuff.h> #endif -#if defined(CONFIG_HARD_I2C) || defined(CONFIG_SYS_I2C) +#if defined(CONFIG_SYS_I2C) #include <i2c.h> #endif @@ -346,9 +346,6 @@ int stdio_add_devices(void) #ifdef CONFIG_SYS_I2C i2c_init_all(); #else -#if defined(CONFIG_HARD_I2C) - i2c_init (CONFIG_SYS_I2C_SPEED, CONFIG_SYS_I2C_SLAVE); -#endif #endif #ifdef CONFIG_DM_VIDEO /* |