config: Rename CONFIG_CROS_BOARD_INFO

Rename CONFIG_CROS_BOARD_INFO to CONFIG_CBI_EEPROM to make it clear
that the information comes from on-board EEPROM.

It sets up the groundwork for adding more options of CBI sources later.

BRANCH=None
BUG=b:186264627
TEST=make buildall -j

Signed-off-by: Philip Chen <philipchen@google.com>
Change-Id: I9a6feee0a8b35bbf29e445544243485507767ad8
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2945792
Reviewed-by: Philip Chen <philipchen@chromium.org>
Commit-Queue: Philip Chen <philipchen@chromium.org>
Tested-by: Philip Chen <philipchen@chromium.org>

9 files changed, 12 insertions, 12 deletions

diff --git a/zephyr/CMakeLists.txt b/zephyr/CMakeLists.txt
index 4fc6705c93..084b09dccb 100644
--- a/zephyr/CMakeLists.txt
+++ b/zephyr/CMakeLists.txt
@@ -188,7 +188,7 @@ zephyr_library_sources_ifdef(CONFIG_PLATFORM_EC_CHARGE_RAMP_SW
                                                 "${PLATFORM_EC}/common/charge_ramp.c"
                                                 "${PLATFORM_EC}/common/charge_ramp_sw.c")
 
-zephyr_library_sources_ifdef(CONFIG_PLATFORM_EC_CBI
+zephyr_library_sources_ifdef(CONFIG_PLATFORM_EC_CBI_EEPROM
                                                 "${PLATFORM_EC}/common/cbi.c")
 zephyr_library_sources_ifdef(CONFIG_PLATFORM_EC_CONSOLE_CMD_MEM
                                                 "${PLATFORM_EC}/common/memory_commands.c")
diff --git a/zephyr/Kconfig b/zephyr/Kconfig
index 6a350ca5ac..5bd8be5006 100644
--- a/zephyr/Kconfig
+++ b/zephyr/Kconfig
@@ -152,7 +152,7 @@ config PLATFORM_EC_BYPASS_CBI_EEPROM_WP_CHECK
 	  When defined, ectool can be used to reprogram all CBI fields,
 	  regardless of the state of the hardware write protect.
 
-config PLATFORM_EC_CBI
+config PLATFORM_EC_CBI_EEPROM
 	bool "CBI EEPROM support"
 	depends on PLATFORM_EC_I2C
 	help
diff --git a/zephyr/Kconfig.board_version b/zephyr/Kconfig.board_version
index 068367c8b8..500dae21c3 100644
--- a/zephyr/Kconfig.board_version
+++ b/zephyr/Kconfig.board_version
@@ -14,7 +14,7 @@ choice "Version source"
 
 config PLATFORM_EC_BOARD_VERSION_CBI
 	bool "Chromium OS Board Info (CBI)"
-	depends on PLATFORM_EC_CBI
+	depends on PLATFORM_EC_CBI_EEPROM
 	help
 	  Choose this if the board version comes from Chromium Board Info
 	  within the EEPROM. This is the recommended approach and is used on
diff --git a/zephyr/drivers/cros_cbi/CMakeLists.txt b/zephyr/drivers/cros_cbi/CMakeLists.txt
index 1ef8eccf1f..6ba5b25a97 100644
--- a/zephyr/drivers/cros_cbi/CMakeLists.txt
+++ b/zephyr/drivers/cros_cbi/CMakeLists.txt
@@ -1,3 +1,3 @@
 # SPDX-License-Identifier: Apache-2.0
 
-zephyr_library_sources_ifdef(CONFIG_PLATFORM_EC_CBI	cros_cbi.c)
+zephyr_library_sources_ifdef(CONFIG_PLATFORM_EC_CBI_EEPROM	cros_cbi.c)
diff --git a/zephyr/projects/volteer/volteer/CMakeLists.txt b/zephyr/projects/volteer/volteer/CMakeLists.txt
index 03db654157..fa75a34a77 100644
--- a/zephyr/projects/volteer/volteer/CMakeLists.txt
+++ b/zephyr/projects/volteer/volteer/CMakeLists.txt
@@ -25,7 +25,7 @@ zephyr_library_sources_ifdef(CONFIG_PLATFORM_EC_BATTERY
   "${PLATFORM_EC_BASEBOARD}/battery_presence.c")
 zephyr_library_sources_ifdef(CONFIG_PLATFORM_EC_CHARGE_MANAGER
   "${PLATFORM_EC_BASEBOARD}/charger.c")
-zephyr_library_sources_ifdef(CONFIG_PLATFORM_EC_CBI
+zephyr_library_sources_ifdef(CONFIG_PLATFORM_EC_CBI_EEPROM
   "${PLATFORM_EC_BASEBOARD}/cbi.c"
   "${PLATFORM_EC_BASEBOARD}/cbi_ec_fw_config.c")
 zephyr_library_sources_ifdef(CONFIG_PLATFORM_EC_POWERSEQ
@@ -38,7 +38,7 @@ zephyr_library_sources_ifdef(CONFIG_PLATFORM_EC_USBC
 # Include selected EC source for the board
 zephyr_library_sources_ifdef(CONFIG_PLATFORM_EC_BATTERY
   "${PLATFORM_EC_BOARD}/battery.c")
-zephyr_library_sources_ifdef(CONFIG_PLATFORM_EC_CBI
+zephyr_library_sources_ifdef(CONFIG_PLATFORM_EC_CBI_EEPROM
   "${PLATFORM_EC_BOARD}/cbi.c")
 zephyr_library_sources_ifdef(CONFIG_PLATFORM_EC_KEYBOARD_BOARD_CONFIG
   "${PLATFORM_EC_BOARD}/keyboard.c")
diff --git a/zephyr/projects/volteer/volteer/prj.conf b/zephyr/projects/volteer/volteer/prj.conf
index aa9b8ace51..2a0cd5cc44 100644
--- a/zephyr/projects/volteer/volteer/prj.conf
+++ b/zephyr/projects/volteer/volteer/prj.conf
@@ -22,7 +22,7 @@ CONFIG_I2C=y
 CONFIG_PLATFORM_EC_EXTPOWER_GPIO=y
 CONFIG_PLATFORM_EC_LID_SWITCH=y
 CONFIG_PLATFORM_EC_POWER_BUTTON=y
-CONFIG_PLATFORM_EC_CBI=y
+CONFIG_PLATFORM_EC_CBI_EEPROM=y
 CONFIG_PLATFORM_EC_CONSOLE_CMD_HCDEBUG=n
 CONFIG_PLATFORM_EC_CONSOLE_CMD_CHGRAMP=n
 
diff --git a/zephyr/shim/include/config_chip.h b/zephyr/shim/include/config_chip.h
index 89b1fabe53..1d49fb504e 100644
--- a/zephyr/shim/include/config_chip.h
+++ b/zephyr/shim/include/config_chip.h
@@ -1391,9 +1391,9 @@
 #define CONFIG_BOARD_VERSION_CUSTOM
 #endif
 
-#undef CONFIG_CROS_BOARD_INFO
-#ifdef CONFIG_PLATFORM_EC_CBI
-#define CONFIG_CROS_BOARD_INFO
+#undef CONFIG_CBI_EEPROM
+#ifdef CONFIG_PLATFORM_EC_CBI_EEPROM
+#define CONFIG_CBI_EEPROM
 #define I2C_ADDR_EEPROM_FLAGS DT_REG_ADDR(DT_NODELABEL(cbi_eeprom))
 #endif
 
diff --git a/zephyr/shim/src/CMakeLists.txt b/zephyr/shim/src/CMakeLists.txt
index 6beaced2dc..b10b3789ef 100644
--- a/zephyr/shim/src/CMakeLists.txt
+++ b/zephyr/shim/src/CMakeLists.txt
@@ -16,7 +16,7 @@ endif()
 zephyr_library_sources_ifdef(no_libgcc                  libgcc_${ARCH}.S)
 
 zephyr_library_sources_ifdef(CONFIG_PLATFORM_EC_ADC         adc.c)
-zephyr_library_sources_ifdef(CONFIG_PLATFORM_EC_CBI         cbi.c)
+zephyr_library_sources_ifdef(CONFIG_PLATFORM_EC_CBI_EEPROM  cbi.c)
 zephyr_library_sources_ifdef(CONFIG_PLATFORM_EC_ESPI        espi.c)
 zephyr_library_sources_ifdef(CONFIG_PLATFORM_EC_FAN         fan.c)
 zephyr_library_sources_ifdef(CONFIG_PLATFORM_EC_FLASH_CROS  flash.c)
diff --git a/zephyr/test/drivers/prj.conf b/zephyr/test/drivers/prj.conf
index 4192c23961..e424b70f6e 100644
--- a/zephyr/test/drivers/prj.conf
+++ b/zephyr/test/drivers/prj.conf
@@ -38,7 +38,7 @@ CONFIG_PLATFORM_EC_HOSTCMD=y
 CONFIG_PLATFORM_EC_USB_PD_TCPM_TUSB422=y
 CONFIG_PLATFORM_EC_USB_MUX_VIRTUAL=y
 CONFIG_PLATFORM_EC_USBC_PPC_SN5S330=y
-CONFIG_PLATFORM_EC_CBI=y
+CONFIG_PLATFORM_EC_CBI_EEPROM=y
 CONFIG_PLATFORM_EC_ADC=y
 CONFIG_PLATFORM_EC_TEMP_SENSOR=y
 CONFIG_PLATFORM_EC_THERMISTOR=y