diff options
| author | Simon Glass <sjg@chromium.org> | 2021-07-11 06:14:32 +0300 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2021-07-28 21:29:37 +0300 |
| commit | 69d9eda4da13ecabb8002fce0dded4bba3bff9f9 (patch) | |
| tree | 9f87f286ae11fb184114b901a5be2521a6551d40 /common | |
| parent | 9ca00684db9d4c2b5973a764ba7826c71e931f16 (diff) | |
| download | u-boot-69d9eda4da13ecabb8002fce0dded4bba3bff9f9.tar.xz | |
i2c: Rename CONFIG_SYS_I2C to CONFIG_SYS_I2C_LEGACY
It is quite confusing that CONFIG_SYS_I2C selects the legacy I2C and
CONFIG_DM_I2C selects the current I2C. The deadline to migrate I2C is less
than a year away.
Also we want to have a CONFIG_I2C for U-Boot proper just like we have
CONFIG_SPL_I2C for SPL, so we can simplify the Makefile rules.
Rename this symbol so it is clear it is going away.
Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Heiko Schocher <hs@denx.de>
Diffstat (limited to 'common')
| -rw-r--r-- | common/board_f.c | 4 | ||||
| -rw-r--r-- | common/stdio.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/common/board_f.c b/common/board_f.c index c1b8e63e56..f2746537c9 100644 --- a/common/board_f.c +++ b/common/board_f.c @@ -244,7 +244,7 @@ __weak int dram_init_banksize(void) return 0; } -#if defined(CONFIG_SYS_I2C) +#if defined(CONFIG_SYS_I2C_LEGACY) static int init_func_i2c(void) { puts("I2C: "); @@ -871,7 +871,7 @@ static const init_fnc_t init_sequence_f[] = { misc_init_f, #endif INIT_FUNC_WATCHDOG_RESET -#if defined(CONFIG_SYS_I2C) +#if defined(CONFIG_SYS_I2C_LEGACY) init_func_i2c, #endif #if defined(CONFIG_VID) && !defined(CONFIG_SPL) diff --git a/common/stdio.c b/common/stdio.c index d4acc5256c..4083e4edb8 100644 --- a/common/stdio.c +++ b/common/stdio.c @@ -336,7 +336,7 @@ int stdio_add_devices(void) dev->name); } } -#ifdef CONFIG_SYS_I2C +#ifdef CONFIG_SYS_I2C_LEGACY i2c_init_all(); #endif if (IS_ENABLED(CONFIG_DM_VIDEO)) { |