diff options
| author | Tom Rini <trini@konsulko.com> | 2021-08-18 23:12:24 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2021-08-30 14:10:07 -0400 |
| commit | 55dabcc8f24598e2777f663de09ab55fbe1269da (patch) | |
| tree | d785190ccaa53ef848573925a07a5f7aaadd93b8 /common | |
| parent | 5b4225511efe4480806c5098c664eedfa6933432 (diff) | |
| download | u-boot-55dabcc8f24598e2777f663de09ab55fbe1269da.zip u-boot-55dabcc8f24598e2777f663de09ab55fbe1269da.tar.gz u-boot-55dabcc8f24598e2777f663de09ab55fbe1269da.tar.bz2 | |
Convert CONFIG_SYS_I2C_LEGACY to Kconfig and add CONFIG_[ST]PL_SYS_I2C_LEGACY
First, we convert CONFIG_SYS_I2C_LEGACY to Kconfig. Next, as you cannot
have SYS_I2C_LEGACY and DM_I2C at the same time, introduce
CONFIG_SPL_SYS_I2C_LEGACY so that we can enable the legacy option only
in SPL. Finally, for some PowerPC cases we also need
CONFIG_TPL_SYS_I2C_LEGACY support. Convert all of the existing users to
one or more symbols.
Signed-off-by: Tom Rini <trini@konsulko.com>
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 f274653..3dc0eaa 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_LEGACY) +#if CONFIG_IS_ENABLED(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_LEGACY) +#if CONFIG_IS_ENABLED(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 4083e4e..0f2eb6f 100644 --- a/common/stdio.c +++ b/common/stdio.c @@ -336,7 +336,7 @@ int stdio_add_devices(void) dev->name); } } -#ifdef CONFIG_SYS_I2C_LEGACY +#if CONFIG_IS_ENABLED(SYS_I2C_LEGACY) i2c_init_all(); #endif if (IS_ENABLED(CONFIG_DM_VIDEO)) { |