commit bccfc2ee099ae1bc8781fc002ea462e12ca10e36
author Simon Glass <sjg@chromium.org> Sat Jul 10 21:14:36 2021 -0600
committer Tom Rini <trini@konsulko.com> Wed Jul 28 14:29:37 2021 -0400
tree d8d3eb3177cb7b8667955818951161ca509c35a0
parent 8e85e3c42506e89e4207b332f2719af57a4c2de8

i2c: Rename SPL/TPL_I2C_SUPPORT to I2C

Rename these options so that CONFIG_IS_ENABLED can be used with them.

Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Heiko Schocher <hs@denx.de>

arch/arm/mach-omap2/Kconfig

diff --git a/arch/arm/mach-omap2/Kconfig b/arch/arm/mach-omap2/Kconfig
index cd69664..0863965 100644
--- a/arch/arm/mach-omap2/Kconfig
+++ b/arch/arm/mach-omap2/Kconfig
@@ -16,7 +16,7 @@
 	imply SPL_FS_EXT4
 	imply SPL_FS_FAT
 	imply SPL_GPIO
-	imply SPL_I2C_SUPPORT
+	imply SPL_I2C
 	imply SPL_LIBCOMMON_SUPPORT
 	imply SPL_LIBDISK_SUPPORT
 	imply SPL_LIBGENERIC_SUPPORT
@@ -38,7 +38,7 @@
 	imply SPL_FS_EXT4
 	imply SPL_FS_FAT
 	imply SPL_GPIO
-	imply SPL_I2C_SUPPORT
+	imply SPL_I2C
 	imply SPL_LIBCOMMON_SUPPORT
 	imply SPL_LIBDISK_SUPPORT
 	imply SPL_LIBGENERIC_SUPPORT
@@ -62,7 +62,7 @@
 	imply SPL_FS_EXT4
 	imply SPL_FS_FAT
 	imply SPL_GPIO
-	imply SPL_I2C_SUPPORT
+	imply SPL_I2C
 	imply SPL_LIBCOMMON_SUPPORT
 	imply SPL_LIBDISK_SUPPORT
 	imply SPL_LIBGENERIC_SUPPORT

arch/arm/mach-omap2/am33xx/Kconfig

diff --git a/arch/arm/mach-omap2/am33xx/Kconfig b/arch/arm/mach-omap2/am33xx/Kconfig
index 70377f0..4268419 100644
--- a/arch/arm/mach-omap2/am33xx/Kconfig
+++ b/arch/arm/mach-omap2/am33xx/Kconfig
@@ -42,7 +42,7 @@
 	imply SPL_FS_EXT4
 	imply SPL_FS_FAT
 	imply SPL_GPIO
-	imply SPL_I2C_SUPPORT
+	imply SPL_I2C
 	imply SPL_LIBCOMMON_SUPPORT
 	imply SPL_LIBDISK_SUPPORT
 	imply SPL_LIBGENERIC_SUPPORT
@@ -226,7 +226,7 @@
 	imply SPL_FS_EXT4
 	imply SPL_FS_FAT
 	imply SPL_GPIO
-	imply SPL_I2C_SUPPORT
+	imply SPL_I2C
 	imply SPL_LIBCOMMON_SUPPORT
 	imply SPL_LIBDISK_SUPPORT
 	imply SPL_LIBGENERIC_SUPPORT

arch/arm/mach-omap2/boot-common.c

diff --git a/arch/arm/mach-omap2/boot-common.c b/arch/arm/mach-omap2/boot-common.c
index b3b727a..7cdf7f1 100644
--- a/arch/arm/mach-omap2/boot-common.c
+++ b/arch/arm/mach-omap2/boot-common.c
@@ -202,7 +202,7 @@
 #if defined(CONFIG_SPL_NAND_SUPPORT) || defined(CONFIG_SPL_ONENAND_SUPPORT)
 	gpmc_init();
 #endif
-#if defined(CONFIG_SPL_I2C_SUPPORT) && !CONFIG_IS_ENABLED(DM_I2C)
+#if defined(CONFIG_SPL_I2C) && !CONFIG_IS_ENABLED(DM_I2C)
 	i2c_init(CONFIG_SYS_OMAP24_I2C_SPEED, CONFIG_SYS_OMAP24_I2C_SLAVE);
 #endif
 #if defined(CONFIG_AM33XX) && defined(CONFIG_SPL_MUSB_NEW)