diff options
39 files changed, 44 insertions, 45 deletions
diff --git a/baseboard/brya/baseboard.h b/baseboard/brya/baseboard.h index 636c81b67c..6ebc5b06e7 100644 --- a/baseboard/brya/baseboard.h +++ b/baseboard/brya/baseboard.h @@ -24,7 +24,7 @@ /* EC Defines */ #define CONFIG_LTO -#define CONFIG_CROS_BOARD_INFO +#define CONFIG_CBI_EEPROM #define CONFIG_BOARD_VERSION_CBI #define CONFIG_CRC8 #define CONFIG_FPU diff --git a/baseboard/cherry/baseboard.h b/baseboard/cherry/baseboard.h index 0984d2e0dd..b1673c8490 100644 --- a/baseboard/cherry/baseboard.h +++ b/baseboard/cherry/baseboard.h @@ -54,7 +54,7 @@ /* CBI */ #define CONFIG_BOARD_VERSION_CBI -#define CONFIG_CROS_BOARD_INFO +#define CONFIG_CBI_EEPROM #define CONFIG_CMD_CBI #define I2C_PORT_EEPROM IT83XX_I2C_CH_A #define I2C_ADDR_EEPROM_FLAGS 0x50 diff --git a/baseboard/dedede/baseboard.h b/baseboard/dedede/baseboard.h index f7cbfcac31..933512548b 100644 --- a/baseboard/dedede/baseboard.h +++ b/baseboard/dedede/baseboard.h @@ -141,7 +141,7 @@ #define CONFIG_WP_ACTIVE_HIGH /* CBI */ -#define CONFIG_CROS_BOARD_INFO +#define CONFIG_CBI_EEPROM #define CONFIG_BOARD_VERSION_CBI /* Charger */ diff --git a/baseboard/dragonegg/baseboard.h b/baseboard/dragonegg/baseboard.h index ce8122c4e3..60b2d07241 100644 --- a/baseboard/dragonegg/baseboard.h +++ b/baseboard/dragonegg/baseboard.h @@ -39,7 +39,7 @@ * version. But for P0/P1 boards rely on GPIO signals. */ /* #define CONFIG_BOARD_VERSION_CBI */ -#define CONFIG_CROS_BOARD_INFO +#define CONFIG_CBI_EEPROM #define CONFIG_CRC8 /* Common Keyboard Defines */ diff --git a/baseboard/grunt/baseboard.c b/baseboard/grunt/baseboard.c index ffd084c37a..d5761768e0 100644 --- a/baseboard/grunt/baseboard.c +++ b/baseboard/grunt/baseboard.c @@ -724,7 +724,7 @@ static void cbi_init(void) * Use board version and SKU ID from CBI EEPROM if the board supports * it and the SKU ID set via resistors + ADC is not valid. */ -#ifdef CONFIG_CROS_BOARD_INFO +#ifdef CONFIG_CBI_EEPROM if (sku_id == 0 || sku_id == 0xff) { uint32_t val; diff --git a/baseboard/guybrush/baseboard.h b/baseboard/guybrush/baseboard.h index d066a2f7da..016d36b503 100644 --- a/baseboard/guybrush/baseboard.h +++ b/baseboard/guybrush/baseboard.h @@ -32,7 +32,7 @@ #define GPIO_PACKET_MODE_EN GPIO_EC_GSC_PACKET_MODE /* CBI Config */ -#define CONFIG_CROS_BOARD_INFO +#define CONFIG_CBI_EEPROM #define CONFIG_BOARD_VERSION_CBI /* Power Config */ diff --git a/baseboard/guybrush/build.mk b/baseboard/guybrush/build.mk index d6849d3029..976ff2c931 100644 --- a/baseboard/guybrush/build.mk +++ b/baseboard/guybrush/build.mk @@ -12,4 +12,4 @@ CHIP_VARIANT:=npcx9m3f baseboard-y=baseboard.o baseboard-$(CONFIG_USB_POWER_DELIVERY)+=usb_pd_policy.o -baseboard-$(CONFIG_CROS_BOARD_INFO)+=cbi.o
\ No newline at end of file +baseboard-$(CONFIG_CBI_EEPROM)+=cbi.o
\ No newline at end of file diff --git a/baseboard/hatch/baseboard.h b/baseboard/hatch/baseboard.h index e16872ed3a..2cbe91221f 100644 --- a/baseboard/hatch/baseboard.h +++ b/baseboard/hatch/baseboard.h @@ -35,7 +35,7 @@ #define CONFIG_ADC #define CONFIG_BOARD_VERSION_CBI #define CONFIG_CRC8 -#define CONFIG_CROS_BOARD_INFO +#define CONFIG_CBI_EEPROM #define CONFIG_DPTF #define CONFIG_HIBERNATE_PSL #define CONFIG_LED_ONOFF_STATES diff --git a/baseboard/honeybuns/baseboard.h b/baseboard/honeybuns/baseboard.h index 401f2f59d0..137f6b5df4 100644 --- a/baseboard/honeybuns/baseboard.h +++ b/baseboard/honeybuns/baseboard.h @@ -81,7 +81,7 @@ /* CBI Configs */ #define I2C_ADDR_EEPROM_FLAGS 0x50 -#define CONFIG_CROS_BOARD_INFO +#define CONFIG_CBI_EEPROM #define CONFIG_BOARD_VERSION_CBI #define CONFIG_CMD_CBI #define CBI_FW_MF_MASK BIT(0) diff --git a/baseboard/kalista/baseboard.h b/baseboard/kalista/baseboard.h index abccbfe528..230b815a48 100644 --- a/baseboard/kalista/baseboard.h +++ b/baseboard/kalista/baseboard.h @@ -21,7 +21,7 @@ #define CONFIG_BOARD_HAS_RTC_RESET #define CONFIG_CRC8 #define CONFIG_CEC -#define CONFIG_CROS_BOARD_INFO +#define CONFIG_CBI_EEPROM #define CONFIG_DEDICATED_RECOVERY_BUTTON #define CONFIG_EMULATED_SYSRQ #define CONFIG_LED_COMMON diff --git a/baseboard/mancomb/baseboard.h b/baseboard/mancomb/baseboard.h index 5c50ccbcee..4a6fd102dc 100644 --- a/baseboard/mancomb/baseboard.h +++ b/baseboard/mancomb/baseboard.h @@ -31,7 +31,7 @@ #define GPIO_PACKET_MODE_EN GPIO_EC_GSC_PACKET_MODE /* CBI Config */ -#define CONFIG_CROS_BOARD_INFO +#define CONFIG_CBI_EEPROM #define CONFIG_BOARD_VERSION_CBI /* Undefs because Box */ diff --git a/baseboard/mancomb/build.mk b/baseboard/mancomb/build.mk index d8adda45d6..391bd70ab2 100644 --- a/baseboard/mancomb/build.mk +++ b/baseboard/mancomb/build.mk @@ -12,4 +12,4 @@ CHIP_VARIANT:=npcx9m3f baseboard-y=baseboard.o baseboard-$(CONFIG_USB_POWER_DELIVERY)+=usb_pd_policy.o -baseboard-$(CONFIG_CROS_BOARD_INFO)+=cbi.o
\ No newline at end of file +baseboard-$(CONFIG_CBI_EEPROM)+=cbi.o
\ No newline at end of file diff --git a/baseboard/octopus/baseboard.h b/baseboard/octopus/baseboard.h index c729b84bf8..e07fa9166e 100644 --- a/baseboard/octopus/baseboard.h +++ b/baseboard/octopus/baseboard.h @@ -81,7 +81,7 @@ #define CONFIG_VSTORE #define CONFIG_VSTORE_SLOT_COUNT 1 #define CONFIG_CRC8 -#define CONFIG_CROS_BOARD_INFO +#define CONFIG_CBI_EEPROM #define CONFIG_BOARD_VERSION_CBI #define CONFIG_LOW_POWER_IDLE #define CONFIG_DPTF diff --git a/baseboard/volteer/baseboard.h b/baseboard/volteer/baseboard.h index 53cfa7b95f..b3bb89f91d 100644 --- a/baseboard/volteer/baseboard.h +++ b/baseboard/volteer/baseboard.h @@ -30,7 +30,7 @@ #define CONFIG_LTO #define CONFIG_BOARD_VERSION_CBI #define CONFIG_CRC8 -#define CONFIG_CROS_BOARD_INFO +#define CONFIG_CBI_EEPROM #define CONFIG_DPTF #define CONFIG_FPU #define CONFIG_HIBERNATE_PSL diff --git a/baseboard/zork/baseboard.h b/baseboard/zork/baseboard.h index 292d50722a..ea1e19945d 100644 --- a/baseboard/zork/baseboard.h +++ b/baseboard/zork/baseboard.h @@ -53,7 +53,7 @@ #define CONFIG_VOLUME_BUTTONS /* CBI EEPROM for board version and SKU ID */ -#define CONFIG_CROS_BOARD_INFO +#define CONFIG_CBI_EEPROM #define CONFIG_BOARD_VERSION_CBI #define CONFIG_CRC8 diff --git a/board/ambassador/board.h b/board/ambassador/board.h index ea9a05474e..6e90e5521c 100644 --- a/board/ambassador/board.h +++ b/board/ambassador/board.h @@ -31,7 +31,7 @@ /* TODO: (b/143496253) re-enable CEC */ /* #define CONFIG_CEC */ #define CONFIG_CRC8 -#define CONFIG_CROS_BOARD_INFO +#define CONFIG_CBI_EEPROM #define CONFIG_EMULATED_SYSRQ #undef CONFIG_KEYBOARD_BOOT_KEYS #define CONFIG_MKBP_INPUT_DEVICES diff --git a/board/dooly/board.h b/board/dooly/board.h index 120afbb865..927037e357 100644 --- a/board/dooly/board.h +++ b/board/dooly/board.h @@ -66,7 +66,7 @@ #define CONFIG_DEDICATED_RECOVERY_BUTTON #define CONFIG_BOARD_RESET_AFTER_POWER_ON #define CONFIG_CRC8 -#define CONFIG_CROS_BOARD_INFO +#define CONFIG_CBI_EEPROM #define CONFIG_EMULATED_SYSRQ #undef CONFIG_KEYBOARD_BOOT_KEYS #define CONFIG_MKBP_INPUT_DEVICES diff --git a/board/endeavour/board.h b/board/endeavour/board.h index a8ed940db1..36afe69d6c 100644 --- a/board/endeavour/board.h +++ b/board/endeavour/board.h @@ -20,7 +20,7 @@ #define CONFIG_BOARD_VERSION_CBI #define CONFIG_BOARD_HAS_RTC_RESET #define CONFIG_CRC8 -#define CONFIG_CROS_BOARD_INFO +#define CONFIG_CBI_EEPROM #define CONFIG_DEDICATED_RECOVERY_BUTTON #define CONFIG_EMULATED_SYSRQ #define CONFIG_LED_COMMON diff --git a/board/fizz/board.h b/board/fizz/board.h index 269fa883ed..d0cccd09ac 100644 --- a/board/fizz/board.h +++ b/board/fizz/board.h @@ -21,7 +21,7 @@ #define CONFIG_BOARD_HAS_RTC_RESET #define CONFIG_CRC8 #define CONFIG_CEC -#define CONFIG_CROS_BOARD_INFO +#define CONFIG_CBI_EEPROM #define CONFIG_DEDICATED_RECOVERY_BUTTON #define CONFIG_EMULATED_SYSRQ #define CONFIG_LED_COMMON diff --git a/board/flapjack/board.h b/board/flapjack/board.h index 43c4afe72f..9c47f72d06 100644 --- a/board/flapjack/board.h +++ b/board/flapjack/board.h @@ -15,7 +15,7 @@ #define CONFIG_CHIPSET_MT8183 #define CONFIG_CMD_ACCELS #define CONFIG_CRC8 -#define CONFIG_CROS_BOARD_INFO +#define CONFIG_CBI_EEPROM #define CONFIG_EMULATED_SYSRQ #undef CONFIG_HIBERNATE #define CONFIG_I2C diff --git a/board/genesis/board.h b/board/genesis/board.h index a848f67e86..af7af55f7c 100644 --- a/board/genesis/board.h +++ b/board/genesis/board.h @@ -31,7 +31,7 @@ /* TODO: (b/143496253) re-enable CEC */ /* #define CONFIG_CEC */ #define CONFIG_CRC8 -#define CONFIG_CROS_BOARD_INFO +#define CONFIG_CBI_EEPROM #define CONFIG_EMULATED_SYSRQ #undef CONFIG_KEYBOARD_BOOT_KEYS #define CONFIG_MKBP_INPUT_DEVICES diff --git a/board/host/board.h b/board/host/board.h index 8f34a22b4d..f9d00961e7 100644 --- a/board/host/board.h +++ b/board/host/board.h @@ -12,7 +12,7 @@ /* Default-yes, override to no by including fake_battery module. */ #define CONFIG_BATTERY_PRESENT_CUSTOM #undef CONFIG_CMD_PD -#define CONFIG_CROS_BOARD_INFO +#define CONFIG_CBI_EEPROM #define CONFIG_EXTPOWER_GPIO #undef CONFIG_FMAP #define CONFIG_POWER_BUTTON diff --git a/board/nami/board.h b/board/nami/board.h index c2f90f821a..40229fe18a 100644 --- a/board/nami/board.h +++ b/board/nami/board.h @@ -21,7 +21,7 @@ #define CONFIG_BOARD_VERSION_CBI #define CONFIG_BOARD_FORCE_RESET_PIN #define CONFIG_CRC8 -#define CONFIG_CROS_BOARD_INFO +#define CONFIG_CBI_EEPROM #define CONFIG_CASE_CLOSED_DEBUG_EXTERNAL #define CONFIG_DPTF #define CONFIG_FLASH_SIZE_BYTES 0x80000 diff --git a/board/puff/board.h b/board/puff/board.h index c8cc272499..cb22f710d8 100644 --- a/board/puff/board.h +++ b/board/puff/board.h @@ -31,7 +31,7 @@ /* TODO: (b/143496253) re-enable CEC */ /* #define CONFIG_CEC */ #define CONFIG_CRC8 -#define CONFIG_CROS_BOARD_INFO +#define CONFIG_CBI_EEPROM #define CONFIG_EMULATED_SYSRQ #undef CONFIG_KEYBOARD_BOOT_KEYS #define CONFIG_MKBP_INPUT_DEVICES diff --git a/board/rammus/board.h b/board/rammus/board.h index 04a446e672..9d3662d80c 100644 --- a/board/rammus/board.h +++ b/board/rammus/board.h @@ -14,7 +14,7 @@ #define CONFIG_BOARD_VERSION_CBI #define CONFIG_BOARD_FORCE_RESET_PIN #define CONFIG_CRC8 -#define CONFIG_CROS_BOARD_INFO +#define CONFIG_CBI_EEPROM #define CONFIG_DPTF #define CONFIG_FLASH_SIZE_BYTES 0x80000 #define CONFIG_FPU diff --git a/common/build.mk b/common/build.mk index 3623898c67..da5a08f83a 100644 --- a/common/build.mk +++ b/common/build.mk @@ -48,7 +48,7 @@ common-$(CONFIG_BLUETOOTH_LE_STACK)+=btle_hci_controller.o btle_ll.o common-$(CONFIG_BODY_DETECTION)+=body_detection.o common-$(CONFIG_CAPSENSE)+=capsense.o common-$(CONFIG_CEC)+=cec.o -common-$(CONFIG_CROS_BOARD_INFO)+=cbi.o +common-$(CONFIG_CBI_EEPROM)+=cbi.o ifeq ($(HAS_MOCK_CHARGE_MANAGER),) common-$(CONFIG_CHARGE_MANAGER)+=charge_manager.o endif diff --git a/common/peripheral.c b/common/peripheral.c index 58ca0dbffd..e70ec19347 100644 --- a/common/peripheral.c +++ b/common/peripheral.c @@ -18,7 +18,7 @@ static enum ec_status hc_locate_chip(struct host_cmd_handler_args *args) switch (params->type) { case EC_CHIP_TYPE_CBI_EEPROM: -#ifdef CONFIG_CROS_BOARD_INFO +#ifdef CONFIG_CBI_EEPROM if (params->index >= 1) return EC_RES_OVERFLOW; resp->bus_type = EC_BUS_TYPE_I2C; @@ -27,7 +27,7 @@ static enum ec_status hc_locate_chip(struct host_cmd_handler_args *args) #else /* Lookup type is supported, but not present on system. */ return EC_RES_UNAVAILABLE; -#endif /* CONFIG_CROS_BOARD_INFO */ +#endif /* CONFIG_CBI_EEPROM */ break; case EC_CHIP_TYPE_TCPC: #if defined(CONFIG_USB_POWER_DELIVERY) && defined(CONFIG_USB_PD_PORT_MAX_COUNT) && !defined(CONFIG_USB_PD_TCPC) diff --git a/docs/configuration/cbi.md b/docs/configuration/cbi.md index d80d31dd13..47d569a041 100644 --- a/docs/configuration/cbi.md +++ b/docs/configuration/cbi.md @@ -9,7 +9,7 @@ before enabling CBI. Add the following config options to `baseboard.h` or `board.h`. - `CONFIG_BOARD_VERSION_CBI` -- `CONFIG_CROS_BOARD_INFO` +- `CONFIG_CBI_EEPROM` ## Feature Parameters diff --git a/include/config.h b/include/config.h index d16a2b7987..25098f3bca 100644 --- a/include/config.h +++ b/include/config.h @@ -5174,10 +5174,10 @@ #undef CONFIG_EXTENDED_VERSION_INFO /* - * Define this to enable Cros Board Info support. I2C_PORT_EEPROM and - * I2C_ADDR_EEPROM_FLAGS must be defined as well. + * Define this to support Cros Board Info from EEPROM. I2C_PORT_EEPROM + * and I2C_ADDR_EEPROM_FLAGS must be defined as well. */ -#undef CONFIG_CROS_BOARD_INFO +#undef CONFIG_CBI_EEPROM /*****************************************************************************/ /* diff --git a/util/config_allowed.txt b/util/config_allowed.txt index 6f49c4e837..b6959d1261 100644 --- a/util/config_allowed.txt +++ b/util/config_allowed.txt @@ -363,7 +363,6 @@ CONFIG_CONSOLE_VERBOSE CONFIG_CPU_CORTEX_M CONFIG_CPU_PROCHOT_ACTIVE_LOW CONFIG_CRC8 -CONFIG_CROS_BOARD_INFO CONFIG_CROS_EC_RO_MEM_SIZE CONFIG_CROS_EC_RW_MEM_SIZE CONFIG_CTN730 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 |