From 69d9eda4da13ecabb8002fce0dded4bba3bff9f9 Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Sat, 10 Jul 2021 21:14:32 -0600 Subject: 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 Reviewed-by: Heiko Schocher --- scripts/config_whitelist.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'scripts') diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 9b35e1cf158..91da5d57933 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -2297,7 +2297,6 @@ CONFIG_SYS_HMI_BASE CONFIG_SYS_HRCW_HIGH CONFIG_SYS_HRCW_LOW CONFIG_SYS_HZ_CLOCK -CONFIG_SYS_I2C CONFIG_SYS_I2C2_FSL_OFFSET CONFIG_SYS_I2C2_OFFSET CONFIG_SYS_I2C2_PINMUX_CLR @@ -2352,6 +2351,7 @@ CONFIG_SYS_I2C_IHS_SPEED_3 CONFIG_SYS_I2C_IHS_SPEED_3_1 CONFIG_SYS_I2C_INIT_BOARD CONFIG_SYS_I2C_LDI_ADDR +CONFIG_SYS_I2C_LEGACY CONFIG_SYS_I2C_LPC32XX_SLAVE CONFIG_SYS_I2C_LPC32XX_SPEED CONFIG_SYS_I2C_MAC1_BUS -- cgit v1.3.1 From 6f7abf64508b329c8b1d642d002ac950aee68f88 Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Sat, 10 Jul 2021 21:14:34 -0600 Subject: i2c: Drop unused CONFIG_I2C This actually does nothing but is defined by a few dozen boards. Drop it, so we can define a real one. Signed-off-by: Simon Glass Reviewed-by: Heiko Schocher --- include/configs/bur_am335x_common.h | 1 - include/configs/siemens-am33x-common.h | 1 - include/configs/ti_armv7_common.h | 1 - scripts/config_whitelist.txt | 1 - 4 files changed, 4 deletions(-) (limited to 'scripts') diff --git a/include/configs/bur_am335x_common.h b/include/configs/bur_am335x_common.h index 042cb4637ba..51585fcb371 100644 --- a/include/configs/bur_am335x_common.h +++ b/include/configs/bur_am335x_common.h @@ -19,7 +19,6 @@ #define CONFIG_SYS_NS16550_CLK (48000000) #define CONFIG_SYS_NS16550_COM1 0x44e09000 -#define CONFIG_I2C #define CONFIG_SYS_I2C_LEGACY #endif /* CONFIG_DM */ diff --git a/include/configs/siemens-am33x-common.h b/include/configs/siemens-am33x-common.h index abd5e2bacfd..a4b4c48d4c4 100644 --- a/include/configs/siemens-am33x-common.h +++ b/include/configs/siemens-am33x-common.h @@ -73,7 +73,6 @@ /* I2C Configuration */ -#define CONFIG_I2C #define CONFIG_SYS_I2C_LEGACY /* Defines for SPL */ diff --git a/include/configs/ti_armv7_common.h b/include/configs/ti_armv7_common.h index fe4689cf1da..4fcf741c0a0 100644 --- a/include/configs/ti_armv7_common.h +++ b/include/configs/ti_armv7_common.h @@ -88,7 +88,6 @@ /* If DM_I2C, enable non-DM I2C support */ #if !CONFIG_IS_ENABLED(DM_I2C) -#define CONFIG_I2C #define CONFIG_SYS_I2C_LEGACY #endif diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 91da5d57933..66678cf2a24 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -708,7 +708,6 @@ CONFIG_HUSH_INIT_VAR CONFIG_HVBOOT CONFIG_HWCONFIG CONFIG_HW_ENV_SETTINGS -CONFIG_I2C CONFIG_I2C_ENV_EEPROM_BUS CONFIG_I2C_GSC CONFIG_I2C_MBB_TIMEOUT -- cgit v1.3.1