diff options
author | Tom Hughes <tomhughes@chromium.org> | 2022-09-21 14:10:01 -0700 |
---|---|---|
committer | Tom Hughes <tomhughes@chromium.org> | 2022-09-22 12:49:33 -0700 |
commit | 2bcf863b492fe7ed8105c853814dba6ed32ba719 (patch) | |
tree | fcf6ce5810f9ff9e3c8cce434812dd75492269ed /zephyr/shim/include/config_chip.h | |
parent | e5fb0b9ba488614b5684e640530f00821ab7b943 (diff) | |
parent | 28712dae9d7ed1e694f7622cc083afa71090d4d5 (diff) | |
download | chrome-ec-firmware-fpmcu-bloonchipper-release.tar.gz |
Merge remote-tracking branch cros/main into firmware-fpmcu-bloonchipper-releasefirmware-fpmcu-bloonchipper-release
Generated by: ./util/update_release_branch.py --board bloonchipper
--relevant_paths_file ./util/fingerprint-relevant-paths.txt firmware-
fpmcu-bloonchipper-release
Relevant changes:
git log --oneline e5fb0b9ba4..28712dae9d -- board/hatch_fp
board/bloonchipper common/fpsensor docs/fingerprint driver/fingerprint
util/getversion.sh
ded9307b79 util/getversion.sh: Fix version when not in a git repo
956055e692 board: change Google USB vendor info
71b2ef709d Update license boilerplate text in source code files
33e11afda0 Revert "fpsensor: Build fpsensor source file with C++"
c8d0360723 fpsensor: Build fpsensor source file with C++
bc113abd53 fpsensor: Fix g++ compiler error
150a58a0dc fpsensor: Fix fp_set_sensor_mode return type
b33b5ce85b fpsensor: Remove nested designators for C++ compatibility
2e864b2539 tree-wide: const-ify argv for console commands
56d8b360f9 test: Add test for get ikm failure when seed not set
3a3d6c3690 test: Add test for fpsensor trivial key failure
233e6bbd08 fpsensor_crypto: Abstract calls to hmac_SHA256
0a041b285b docs/fingerprint: Typo correction
c03fab67e2 docs/fingerprint: Fix the path of fputils.py
0b5d4baf5a util/getversion.sh: Fix empty file list handling
6e128fe760 FPMCU dev board environment with Satlab
3eb29b6aa5 builtin: Move ssize_t to sys/types.h
345d62ebd1 docs/fingerprint: Update power numbers for latest dartmonkey release
c25ffdb316 common: Conditionally support printf %l and %i modifiers
9a3c514b45 test: Add a test to check if the debugger is connected
54e603413f Move standard library tests to their own file
43fa6b4bf8 docs/fingerprint: Update power numbers for latest bloonchipper release
25536f9a84 driver/fingerprint/fpc/bep/fpc_sensor_spi.c: Format with clang-format
4face99efd driver/fingerprint/fpc/libfp/fpc_sensor_pal.h: Format with clang-format
738de2b575 trng: Rename rand to trng_rand
14b8270edd docs/fingerprint: Update dragonclaw power numbers
0b268f93d1 driver/fingerprint/fpc/libfp/fpc_private.c: Format with clang-format
f80da163f2 driver/fingerprint/fpc/libfp/fpc_private.h: Format with clang-format
5e9c85c9b1 driver/fingerprint/fpc/libfp/fpc_sensor_pal.c: Format with clang-format
c1f9dd3cf8 driver/fingerprint/fpc/libfp/fpc_bio_algorithm.h: Format with clang-format
eb1e1bed8d driver/fingerprint/fpc/libfp/fpc1145_private.h: Format with clang-format
6e7b611821 driver/fingerprint/fpc/bep/fpc_bio_algorithm.h: Format with clang-format
e0589cd5e2 driver/fingerprint/fpc/bep/fpc1035_private.h: Format with clang-format
7905e556a0 common/fpsensor/fpsensor_crypto.c: Format with clang-format
21289d170c driver/fingerprint/fpc/bep/fpc1025_private.h: Format with clang-format
98a20f937e common/fpsensor/fpsensor_state.c: Format with clang-format
a2d255d8af common/fpsensor/fpsensor.c: Format with clang-format
73055eeb3f driver/fingerprint/fpc/bep/fpc_private.c: Format with clang-format
0f7b5cb509 common/fpsensor/fpsensor_private.h: Format with clang-format
1ceade6e65 driver/fingerprint/fpc/bep/fpc_private.h: Format with clang-format
dc3e9008b8 board/hatch_fp/board.h: Format with clang-format
dca9d74321 Revert "trng: Rename rand to trng_rand"
a6b0b3554f trng: Rename rand to trng_rand
28d0b75b70 third_party/boringssl: Remove unused header
BRANCH=None
BUG=b:246424843 b:234181908 b:244781166 b:234181908 b:244387210
BUG=b:242720240 chromium:1098010 b:180945056 b:236025198 b:234181908
BUG=b:234181908 b:237344361 b:131913998 b:236386294 b:234143158
BUG=b:234781655 b:215613183 b:242720910
TEST=`make -j buildall`
TEST=./test/run_device_tests.py --board bloonchipper
Test "aes": PASSED
Test "cec": PASSED
Test "cortexm_fpu": PASSED
Test "crc": PASSED
Test "flash_physical": PASSED
Test "flash_write_protect": PASSED
Test "fpsensor_hw": PASSED
Test "fpsensor_spi_ro": PASSED
Test "fpsensor_spi_rw": PASSED
Test "fpsensor_uart_ro": PASSED
Test "fpsensor_uart_rw": PASSED
Test "mpu_ro": PASSED
Test "mpu_rw": PASSED
Test "mutex": PASSED
Test "pingpong": PASSED
Test "printf": PASSED
Test "queue": PASSED
Test "rollback_region0": PASSED
Test "rollback_region1": PASSED
Test "rollback_entropy": PASSED
Test "rtc": PASSED
Test "sha256": PASSED
Test "sha256_unrolled": PASSED
Test "static_if": PASSED
Test "stdlib": PASSED
Test "system_is_locked_wp_on": PASSED
Test "system_is_locked_wp_off": PASSED
Test "timer_dos": PASSED
Test "utils": PASSED
Test "utils_str": PASSED
Test "stm32f_rtc": PASSED
Test "panic_data_bloonchipper_v2.0.4277": PASSED
Test "panic_data_bloonchipper_v2.0.5938": PASSED
Force-Relevant-Builds: all
Signed-off-by: Tom Hughes <tomhughes@chromium.org>
Change-Id: I264ad0ffe7afcd507a1e483c6e934a9c4fea47c3
Diffstat (limited to 'zephyr/shim/include/config_chip.h')
-rw-r--r-- | zephyr/shim/include/config_chip.h | 336 |
1 files changed, 197 insertions, 139 deletions
diff --git a/zephyr/shim/include/config_chip.h b/zephyr/shim/include/config_chip.h index 73f38a72f4..75c27dd32d 100644 --- a/zephyr/shim/include/config_chip.h +++ b/zephyr/shim/include/config_chip.h @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ @@ -9,9 +9,9 @@ #include <zephyr/devicetree.h> #include <autoconf.h> -#define SENSOR_NODE DT_PATH(motionsense_sensor) -#define SENSOR_INFO_NODE DT_PATH(motionsense_sensor_info) -#define SENSOR_ALT_NODE DT_PATH(motionsense_sensor_alt) +#define SENSOR_NODE DT_PATH(motionsense_sensor) +#define SENSOR_INFO_NODE DT_PATH(motionsense_sensor_info) +#define SENSOR_ALT_NODE DT_PATH(motionsense_sensor_alt) /* * The battery enum is used in various drivers and these assume that it is @@ -66,14 +66,16 @@ #undef CONFIG_CONSOLE_UART /* Only used by the Chromium EC chip drivers */ #undef CONFIG_I2C_MULTI_PORT_CONTROLLER /* Not required by I2C shim */ #undef CONFIG_IRQ_COUNT /* Only used by Chromium EC core drivers */ -#undef CONFIG_KEYBOARD_KSO_HIGH_DRIVE /* Used by the Chromium EC chip drivers */ +#undef CONFIG_KEYBOARD_KSO_HIGH_DRIVE /* Used by the Chromium EC chip drivers \ + */ #undef CONFIG_LTO /* Link time optimization enabled by Zephyr build system */ #undef CONFIG_STACK_SIZE /* Only used in Chromium EC core init code */ #ifndef CONFIG_FPU #undef CONFIG_FPU /* Used in Zephyr as well, enabled in Kconfig directly */ #endif #ifndef CONFIG_WATCHDOG -#undef CONFIG_WATCHDOG /* Used in Zephyr as well, enabled in Kconfig directly */ +#undef CONFIG_WATCHDOG /* Used in Zephyr as well, enabled in Kconfig directly \ + */ #endif /* @@ -103,8 +105,8 @@ #endif /* EC chipset configuration */ -#define HOOK_TICK_INTERVAL CONFIG_CROS_EC_HOOK_TICK_INTERVAL -#define HOOK_TICK_INTERVAL_MS (HOOK_TICK_INTERVAL / 1000) +#define HOOK_TICK_INTERVAL CONFIG_CROS_EC_HOOK_TICK_INTERVAL +#define HOOK_TICK_INTERVAL_MS (HOOK_TICK_INTERVAL / 1000) /* Chipset and power configuration */ #ifdef CONFIG_AP_ARM_QUALCOMM_SC7180 @@ -242,7 +244,7 @@ #undef CONFIG_BATTERY_PRESENT_GPIO #ifdef CONFIG_PLATFORM_EC_BATTERY_PRESENT_GPIO /* This is always GPIO_BATT_PRES_ODL with Zephyr */ -#define CONFIG_BATTERY_PRESENT_GPIO GPIO_BATT_PRES_ODL +#define CONFIG_BATTERY_PRESENT_GPIO GPIO_BATT_PRES_ODL #endif #undef CONFIG_BATTERY_CRITICAL_SHUTDOWN_CUT_OFF @@ -283,9 +285,9 @@ #undef CONFIG_BATT_FULL_CHIPSET_OFF_INPUT_LIMIT_MV #if defined(CONFIG_PLATFORM_EC_BATT_FULL_CHIPSET_OFF_INPUT_LIMIT_MV) && \ - (CONFIG_PLATFORM_EC_BATT_FULL_CHIPSET_OFF_INPUT_LIMIT_MV > 0) + (CONFIG_PLATFORM_EC_BATT_FULL_CHIPSET_OFF_INPUT_LIMIT_MV > 0) #define CONFIG_BATT_FULL_CHIPSET_OFF_INPUT_LIMIT_MV \ - CONFIG_PLATFORM_EC_BATT_FULL_CHIPSET_OFF_INPUT_LIMIT_MV + CONFIG_PLATFORM_EC_BATT_FULL_CHIPSET_OFF_INPUT_LIMIT_MV #endif #undef CONFIG_BOARD_RESET_AFTER_POWER_ON @@ -428,29 +430,30 @@ #endif /* eSPI signals */ -#undef CONFIG_HOSTCMD_ESPI_VW_SLP_S3 -#ifdef CONFIG_PLATFORM_EC_ESPI_VW_SLP_S3 -#define CONFIG_HOSTCMD_ESPI_VW_SLP_S3 +#undef CONFIG_HOST_INTERFACE_ESPI_VW_SLP_S3 +#ifdef CONFIG_PLATFORM_EC_HOST_INTERFACE_ESPI_VW_SLP_S3 +#define CONFIG_HOST_INTERFACE_ESPI_VW_SLP_S3 #endif -#undef CONFIG_HOSTCMD_ESPI_VW_SLP_S4 -#ifdef CONFIG_PLATFORM_EC_ESPI_VW_SLP_S4 -#define CONFIG_HOSTCMD_ESPI_VW_SLP_S4 +#undef CONFIG_HOST_INTERFACE_ESPI_VW_SLP_S4 +#ifdef CONFIG_PLATFORM_EC_HOST_INTERFACE_ESPI_VW_SLP_S4 +#define CONFIG_HOST_INTERFACE_ESPI_VW_SLP_S4 #endif -#undef CONFIG_HOSTCMD_ESPI_VW_SLP_S5 -#ifdef CONFIG_PLATFORM_EC_ESPI_VW_SLP_S5 -#define CONFIG_HOSTCMD_ESPI_VW_SLP_S5 +#undef CONFIG_HOST_INTERFACE_ESPI_VW_SLP_S5 +#ifdef CONFIG_PLATFORM_EC_HOST_INTERFACE_ESPI_VW_SLP_S5 +#define CONFIG_HOST_INTERFACE_ESPI_VW_SLP_S5 #endif -#undef CONFIG_HOSTCMD_ESPI_RESET_SLP_SX_VW_ON_ESPI_RST -#ifdef CONFIG_PLATFORM_EC_ESPI_RESET_SLP_SX_VW_ON_ESPI_RST -#define CONFIG_HOSTCMD_ESPI_RESET_SLP_SX_VW_ON_ESPI_RST +#undef CONFIG_HOST_INTERFACE_ESPI_RESET_SLP_SX_VW_ON_ESPI_RST +#ifdef CONFIG_PLATFORM_EC_HOST_INTERFACE_ESPI_RESET_SLP_SX_VW_ON_ESPI_RST +#define CONFIG_HOST_INTERFACE_ESPI_RESET_SLP_SX_VW_ON_ESPI_RST #endif -#undef CONFIG_ESPI_DEFAULT_VW_WIDTH_US +#undef CONFIG_HOST_INTERFACE_ESPI_DEFAULT_VW_WIDTH_US #ifdef CONFIG_PLATFORM_EC_DEFAULT_SCI_WIDTH_US -#define CONFIG_ESPI_DEFAULT_VW_WIDTH_US CONFIG_PLATFORM_EC_DEFAULT_SCI_WIDTH_US +#define CONFIG_HOST_INTERFACE_ESPI_DEFAULT_VW_WIDTH_US \ + CONFIG_PLATFORM_EC_DEFAULT_SCI_WIDTH_US #endif #if DT_HAS_CHOSEN(zephyr_flash) @@ -466,10 +469,11 @@ /* The jump data goes at the end of data ram, so for posix, the end of ram is * wherever the jump data ended up. */ -extern struct jump_data mock_jump_data; +#include "sysjump.h" +extern char mock_jump_data[sizeof(struct jump_data) + 256]; #define CONFIG_RAM_BASE 0x0 #define CONFIG_DATA_RAM_SIZE \ - (((uintptr_t)&mock_jump_data) + sizeof(struct jump_data)) + (((uintptr_t)&mock_jump_data) + sizeof(mock_jump_data)) #else #error "A zephyr,sram device must be chosen in the device tree" #endif @@ -479,16 +483,16 @@ extern struct jump_data mock_jump_data; #define CONFIG_RW_MEM_OFF CONFIG_CROS_EC_RW_MEM_OFF #define CONFIG_RW_MEM_SIZE CONFIG_CROS_EC_RW_MEM_SIZE -#define CONFIG_WP_STORAGE_OFF CONFIG_EC_PROTECTED_STORAGE_OFF -#define CONFIG_WP_STORAGE_SIZE CONFIG_EC_PROTECTED_STORAGE_SIZE -#define CONFIG_RO_SIZE CONFIG_CROS_EC_RO_SIZE -#define CONFIG_RW_SIZE CONFIG_CROS_EC_RW_SIZE +#define CONFIG_WP_STORAGE_OFF CONFIG_EC_PROTECTED_STORAGE_OFF +#define CONFIG_WP_STORAGE_SIZE CONFIG_EC_PROTECTED_STORAGE_SIZE +#define CONFIG_RO_SIZE CONFIG_CROS_EC_RO_SIZE +#define CONFIG_RW_SIZE CONFIG_CROS_EC_RW_SIZE /* * ROM resident area in flash used to store data objects that are not copied * into code RAM. Enable using the CONFIG_CHIP_INIT_ROM_REGION option. */ -#define CONFIG_RO_ROM_RESIDENT_MEM_OFF CONFIG_RO_SIZE +#define CONFIG_RO_ROM_RESIDENT_MEM_OFF CONFIG_RO_SIZE #define CONFIG_RO_ROM_RESIDENT_SIZE \ (CONFIG_EC_PROTECTED_STORAGE_SIZE - CONFIG_RO_SIZE) @@ -496,7 +500,7 @@ extern struct jump_data mock_jump_data; * RW firmware in program memory - Identical to RO, only one image loaded at * a time. */ -#define CONFIG_RW_ROM_RESIDENT_MEM_OFF CONFIG_RW_SIZE +#define CONFIG_RW_ROM_RESIDENT_MEM_OFF CONFIG_RW_SIZE #define CONFIG_RW_ROM_RESIDENT_SIZE \ (CONFIG_EC_WRITABLE_STORAGE_SIZE - CONFIG_RW_SIZE) @@ -560,22 +564,9 @@ extern struct jump_data mock_jump_data; #undef CONFIG_FLASH_SIZE_BYTES #ifdef CONFIG_PLATFORM_EC_FLASH_SIZE_BYTES -/* - * Flash size of IT81202 is 1MB. - * We use only 3/4 space of flash to save time of erasing RW image from flash. - */ -#ifdef CONFIG_SOC_IT8XXX2 -#define CONFIG_FLASH_SIZE_BYTES (CONFIG_PLATFORM_EC_FLASH_SIZE_BYTES * 3 / 4) -#else #define CONFIG_FLASH_SIZE_BYTES CONFIG_PLATFORM_EC_FLASH_SIZE_BYTES -#endif #endif /* CONFIG_PLATFORM_EC_FLASH_SIZE_BYTES */ -#undef CONFIG_ADC -#ifdef CONFIG_PLATFORM_EC_ADC -#define CONFIG_ADC -#endif - #undef CONFIG_ADC_CHANNELS_RUNTIME_CONFIG #ifdef CONFIG_PLATFORM_EC_ADC_CHANNELS_RUNTIME_CONFIG #define CONFIG_ADC_CHANNELS_RUNTIME_CONFIG @@ -621,6 +612,11 @@ extern struct jump_data mock_jump_data; #define CONFIG_FANS CONFIG_PLATFORM_EC_NUM_FANS #endif +#undef CONFIG_FAN_BYPASS_SLOW_RESPONSE +#ifdef PLATFORM_EC_FAN_BYPASS_SLOW_RESPONSE +#define CONFIG_FAN_BYPASS_SLOW_RESPONSE +#endif + #ifdef CONFIG_PLATFORM_EC_I2C /* Also see shim/include/i2c/i2c.h which defines the ports enum */ #define CONFIG_I2C_CONTROLLER @@ -659,7 +655,7 @@ extern struct jump_data mock_jump_data; #undef CONFIG_KEYBOARD_DISCRETE #ifdef CONFIG_PLATFORM_EC_KEYBOARD_DISCRETE #define CONFIG_KEYBOARD_DISCRETE -#define KB_DISCRETE_I2C_ADDR_FLAGS DT_REG_ADDR(DT_NODELABEL(kb_discrete)) +#define KB_DISCRETE_I2C_ADDR_FLAGS DT_REG_ADDR(DT_NODELABEL(kb_discrete)) #endif #undef CONFIG_MKBP_INPUT_DEVICES @@ -669,16 +665,16 @@ extern struct jump_data mock_jump_data; #undef CONFIG_MKBP_EVENT_WAKEUP_MASK #if defined(CONFIG_PLATFORM_EC_MKBP_EVENT_WAKEUP_MASK) && \ - DT_NODE_EXISTS(DT_PATH(ec_mkbp_event_wakeup_mask)) + DT_NODE_EXISTS(DT_PATH(ec_mkbp_event_wakeup_mask)) #define CONFIG_MKBP_EVENT_WAKEUP_MASK \ - DT_PROP(DT_PATH(ec_mkbp_event_wakeup_mask), wakeup_mask) + DT_PROP(DT_PATH(ec_mkbp_event_wakeup_mask), wakeup_mask) #endif #undef CONFIG_MKBP_HOST_EVENT_WAKEUP_MASK #if defined(CONFIG_PLATFORM_EC_MKBP_HOST_EVENT_WAKEUP_MASK) && \ - DT_NODE_EXISTS(DT_PATH(ec_mkbp_host_event_wakeup_mask)) + DT_NODE_EXISTS(DT_PATH(ec_mkbp_host_event_wakeup_mask)) #define CONFIG_MKBP_HOST_EVENT_WAKEUP_MASK \ - DT_PROP(DT_PATH(ec_mkbp_host_event_wakeup_mask), wakeup_mask) + DT_PROP(DT_PATH(ec_mkbp_host_event_wakeup_mask), wakeup_mask) #endif #undef CONFIG_CMD_KEYBOARD @@ -689,12 +685,12 @@ extern struct jump_data mock_jump_data; #undef CONFIG_KEYBOARD_COL2_INVERTED #ifdef CONFIG_PLATFORM_EC_KEYBOARD_COL2_INVERTED #define CONFIG_KEYBOARD_COL2_INVERTED -#endif /* CONFIG_PLATFORM_EC_KEYBOARD_COL2_INVERTED */ +#endif /* CONFIG_PLATFORM_EC_KEYBOARD_COL2_INVERTED */ #undef CONFIG_KEYBOARD_REFRESH_ROW3 #ifdef CONFIG_PLATFORM_EC_KEYBOARD_REFRESH_ROW3 #define CONFIG_KEYBOARD_REFRESH_ROW3 -#endif /* CONFIG_PLATFORM_EC_KEYBOARD_REFRESH_ROW3 */ +#endif /* CONFIG_PLATFORM_EC_KEYBOARD_REFRESH_ROW3 */ #undef CONFIG_KEYBOARD_KEYPAD #ifdef CONFIG_PLATFORM_EC_KEYBOARD_KEYPAD @@ -743,6 +739,11 @@ extern struct jump_data mock_jump_data; #define CONFIG_KBLIGHT_ENABLE_PIN #endif +#undef CONFIG_KEYBOARD_STRICT_DEBOUNCE +#ifdef CONFIG_PLATFORM_EC_KEYBOARD_STRICT_DEBOUNCE +#define CONFIG_KEYBOARD_STRICT_DEBOUNCE +#endif + #undef CONFIG_LED_COMMON #ifdef CONFIG_PLATFORM_EC_LED_COMMON #define CONFIG_LED_COMMON @@ -765,8 +766,7 @@ extern struct jump_data mock_jump_data; #ifdef CONFIG_PLATFORM_EC_LED_PWM_CHARGE_COLOR #undef CONFIG_LED_PWM_CHARGE_COLOR -#define CONFIG_LED_PWM_CHARGE_COLOR \ - CONFIG_PLATFORM_EC_LED_PWM_CHARGE_COLOR +#define CONFIG_LED_PWM_CHARGE_COLOR CONFIG_PLATFORM_EC_LED_PWM_CHARGE_COLOR #endif #ifdef CONFIG_PLATFORM_EC_LED_PWM_NEAR_FULL_COLOR @@ -783,8 +783,7 @@ extern struct jump_data mock_jump_data; #ifdef CONFIG_PLATFORM_EC_LED_PWM_SOC_ON_COLOR #undef CONFIG_LED_PWM_SOC_ON_COLOR -#define CONFIG_LED_PWM_SOC_ON_COLOR \ - CONFIG_PLATFORM_EC_LED_PWM_SOC_ON_COLOR +#define CONFIG_LED_PWM_SOC_ON_COLOR CONFIG_PLATFORM_EC_LED_PWM_SOC_ON_COLOR #endif #ifdef CONFIG_PLATFORM_EC_LED_PWM_SOC_SUSPEND_COLOR @@ -795,8 +794,7 @@ extern struct jump_data mock_jump_data; #ifdef CONFIG_PLATFORM_EC_LED_PWM_LOW_BATT_COLOR #undef CONFIG_LED_PWM_LOW_BATT_COLOR -#define CONFIG_LED_PWM_LOW_BATT_COLOR \ - CONFIG_PLATFORM_EC_LED_PWM_LOW_BATT_COLOR +#define CONFIG_LED_PWM_LOW_BATT_COLOR CONFIG_PLATFORM_EC_LED_PWM_LOW_BATT_COLOR #endif #undef CONFIG_CMD_LEDTEST @@ -812,7 +810,7 @@ extern struct jump_data mock_jump_data; #undef CONFIG_LED_ONOFF_STATES_BAT_LOW #ifdef CONFIG_PLATFORM_EC_LED_ONOFF_STATES_BAT_LOW #define CONFIG_LED_ONOFF_STATES_BAT_LOW \ - CONFIG_PLATFORM_EC_LED_ONOFF_STATES_BAT_LOW + CONFIG_PLATFORM_EC_LED_ONOFF_STATES_BAT_LOW #endif #undef CONFIG_PWM_DISPLIGHT @@ -872,8 +870,7 @@ extern struct jump_data mock_jump_data; #endif #undef CONFIG_POWER_S0IX -#if defined(CONFIG_PLATFORM_EC_POWERSEQ_S0IX) || \ - defined(CONFIG_AP_PWRSEQ_S0IX) +#if defined(CONFIG_PLATFORM_EC_POWERSEQ_S0IX) || defined(CONFIG_AP_PWRSEQ_S0IX) #define CONFIG_POWER_S0IX #endif @@ -898,7 +895,6 @@ extern struct jump_data mock_jump_data; CONFIG_PLATFORM_EC_POWER_BUTTON_INIT_TIMEOUT #endif - #undef CONFIG_POWERSEQ_FAKE_CONTROL #ifdef CONFIG_PLATFORM_EC_POWERSEQ_FAKE_CONTROL #define CONFIG_POWERSEQ_FAKE_CONTROL @@ -931,19 +927,19 @@ extern struct jump_data mock_jump_data; #undef CONFIG_CMD_GETTIME #ifdef CONFIG_PLATFORM_EC_CONSOLE_CMD_GETTIME #define CONFIG_CMD_GETTIME -#endif /* CONFIG_PLATFORM_EC_CONSOLE_CMD_GETTIME */ +#endif /* CONFIG_PLATFORM_EC_CONSOLE_CMD_GETTIME */ #undef CONFIG_CMD_TIMERINFO #ifdef CONFIG_PLATFORM_EC_CONSOLE_CMD_TIMERINFO #define CONFIG_CMD_TIMERINFO -#endif /* CONFIG_PLATFORM_EC_CONSOLE_CMD_TIMERINFO */ +#endif /* CONFIG_PLATFORM_EC_CONSOLE_CMD_TIMERINFO */ #undef CONFIG_CMD_WAITMS #ifdef CONFIG_PLATFORM_EC_CONSOLE_CMD_WAITMS #define CONFIG_CMD_WAITMS -#endif /* CONFIG_PLATFORM_EC_CONSOLE_CMD_TIMERINFO */ +#endif /* CONFIG_PLATFORM_EC_CONSOLE_CMD_TIMERINFO */ -#endif /* CONFIG_PLATFORM_EC_TIMER */ +#endif /* CONFIG_PLATFORM_EC_TIMER */ /* USB-C things */ #ifdef CONFIG_PLATFORM_EC_USBC @@ -954,18 +950,21 @@ extern struct jump_data mock_jump_data; /* * Define these here for now. They are not actually CONFIG options in the EC * code base. Ideally they would be defined in the devicetree (perhaps for a - * 'board' driver if not in the USB chip driver itself). + * 'board' driver if not in the USB chip driver itself). Use Kconfig to allow + * projects to overwrite the power configurations. * * SN5S30 PPC supports up to 24V VBUS source and sink, however passive USB-C * cables only support up to 60W. */ -#define PD_OPERATING_POWER_MW 15000 -#define PD_MAX_POWER_MW 60000 -#define PD_MAX_CURRENT_MA 3000 -#define PD_MAX_VOLTAGE_MV 20000 +#define PD_OPERATING_POWER_MW CONFIG_PLATFORM_EC_PD_OPERATING_POWER_MW +#define PD_MAX_POWER_MW CONFIG_PLATFORM_EC_PD_MAX_POWER_MW +#define PD_MAX_CURRENT_MA CONFIG_PLATFORM_EC_PD_MAX_CURRENT_MA +#define PD_MAX_VOLTAGE_MV CONFIG_PLATFORM_EC_PD_MAX_VOLTAGE_MV -#define PD_POWER_SUPPLY_TURN_ON_DELAY 30000 /* us */ -#define PD_POWER_SUPPLY_TURN_OFF_DELAY 30000 /* us */ +#define PD_POWER_SUPPLY_TURN_ON_DELAY \ + CONFIG_PLATFORM_EC_PD_POWER_SUPPLY_TURN_ON_DELAY +#define PD_POWER_SUPPLY_TURN_OFF_DELAY \ + CONFIG_PLATFORM_EC_PD_POWER_SUPPLY_TURN_OFF_DELAY #endif #undef CONFIG_CMD_PPC_DUMP @@ -973,6 +972,11 @@ extern struct jump_data mock_jump_data; #define CONFIG_CMD_PPC_DUMP #endif +#undef CONFIG_USBC_PPC_LOGGING +#ifdef CONFIG_PLATFORM_EC_USBC_PPC_LOGGING +#define CONFIG_USBC_PPC_LOGGING +#endif + #undef CONFIG_CMD_TCPC_DUMP #ifdef CONFIG_PLATFORM_EC_CONSOLE_CMD_TCPC_DUMP #define CONFIG_CMD_TCPC_DUMP @@ -990,8 +994,8 @@ extern struct jump_data mock_jump_data; #define CONFIG_CHARGER /* TODO: Put these charger defines in the devicetree? */ -#define CONFIG_CHARGER_SENSE_RESISTOR 10 -#define CONFIG_CHARGER_SENSE_RESISTOR_AC 10 +#define CONFIG_CHARGER_SENSE_RESISTOR 10 +#define CONFIG_CHARGER_SENSE_RESISTOR_AC 10 #endif @@ -1013,31 +1017,31 @@ extern struct jump_data mock_jump_data; #undef CONFIG_CHARGER_INPUT_CURRENT #ifdef CONFIG_PLATFORM_EC_CHARGER_INPUT_CURRENT -#define CONFIG_CHARGER_INPUT_CURRENT CONFIG_PLATFORM_EC_CHARGER_INPUT_CURRENT +#define CONFIG_CHARGER_INPUT_CURRENT CONFIG_PLATFORM_EC_CHARGER_INPUT_CURRENT #endif #undef CONFIG_CHARGER_MIN_BAT_PCT_FOR_POWER_ON #ifdef CONFIG_PLATFORM_EC_CHARGER_MIN_BAT_PCT_FOR_POWER_ON #define CONFIG_CHARGER_MIN_BAT_PCT_FOR_POWER_ON \ - CONFIG_PLATFORM_EC_CHARGER_MIN_BAT_PCT_FOR_POWER_ON + CONFIG_PLATFORM_EC_CHARGER_MIN_BAT_PCT_FOR_POWER_ON #endif #undef CONFIG_CHARGER_MIN_BAT_PCT_FOR_POWER_ON_WITH_AC #ifdef CONFIG_PLATFORM_EC_CHARGER_MIN_BAT_PCT_FOR_POWER_ON_WITH_AC #define CONFIG_CHARGER_MIN_BAT_PCT_FOR_POWER_ON_WITH_AC \ - CONFIG_PLATFORM_EC_CHARGER_MIN_BAT_PCT_FOR_POWER_ON_WITH_AC + CONFIG_PLATFORM_EC_CHARGER_MIN_BAT_PCT_FOR_POWER_ON_WITH_AC #endif #undef CONFIG_CHARGER_MIN_POWER_MW_FOR_POWER_ON_WITH_BATT #ifdef CONFIG_PLATFORM_EC_CHARGER_MIN_POWER_MW_FOR_POWER_ON_WITH_BATT #define CONFIG_CHARGER_MIN_POWER_MW_FOR_POWER_ON_WITH_BATT \ - CONFIG_PLATFORM_EC_CHARGER_MIN_POWER_MW_FOR_POWER_ON_WITH_BATT + CONFIG_PLATFORM_EC_CHARGER_MIN_POWER_MW_FOR_POWER_ON_WITH_BATT #endif #undef CONFIG_CHARGER_MIN_POWER_MW_FOR_POWER_ON #ifdef CONFIG_PLATFORM_EC_CHARGER_MIN_POWER_MW_FOR_POWER_ON #define CONFIG_CHARGER_MIN_POWER_MW_FOR_POWER_ON \ - CONFIG_PLATFORM_EC_CHARGER_MIN_POWER_MW_FOR_POWER_ON + CONFIG_PLATFORM_EC_CHARGER_MIN_POWER_MW_FOR_POWER_ON #endif #undef CONFIG_CHARGE_RAMP_SW @@ -1062,22 +1066,22 @@ extern struct jump_data mock_jump_data; #undef CONFIG_USB_PID #ifdef CONFIG_PLATFORM_EC_USB_PID -#define CONFIG_USB_PID CONFIG_PLATFORM_EC_USB_PID +#define CONFIG_USB_PID CONFIG_PLATFORM_EC_USB_PID #endif #undef CONFIG_USB_BCD_DEV #ifdef CONFIG_PLATFORM_EC_USB_BCD_DEV -#define CONFIG_USB_BCD_DEV CONFIG_PLATFORM_EC_USB_BCD_DEV +#define CONFIG_USB_BCD_DEV CONFIG_PLATFORM_EC_USB_BCD_DEV #endif #undef CONFIG_USB_VID #ifdef CONFIG_PLATFORM_EC_USB_VID -#define CONFIG_USB_VID CONFIG_PLATFORM_EC_USB_VID +#define CONFIG_USB_VID CONFIG_PLATFORM_EC_USB_VID #endif #undef CONFIG_USB_MS_EXTENDED_COMPAT_ID_DESCRIPTOR #ifdef CONFIG_PLATFORM_EC_USB_MS_EXTENDED_COMPAT_ID_DESCRIPTOR -#define CONFIG_USB_MS_EXTENDED_COMPAT_ID_DESCRIPTOR \ +#define CONFIG_USB_MS_EXTENDED_COMPAT_ID_DESCRIPTOR \ CONFIG_PLATFORM_EC_USB_MS_EXTENDED_COMPAT_ID_DESCRIPTOR #endif @@ -1145,11 +1149,25 @@ extern struct jump_data mock_jump_data; #define CONFIG_USB_PORT_POWER_SMART_SIMPLE #endif +#undef CONFIG_USB_PORT_POWER_SMART_DEFAULT_MODE +#ifdef CONFIG_PLATFORM_EC_USB_PORT_POWER_SMART_DEFAULT_DISABLED +#define CONFIG_USB_PORT_POWER_SMART_DEFAULT_MODE USB_CHARGE_MODE_DISABLED +#elif defined(CONFIG_PLATFORM_EC_USB_PORT_POWER_SMART_DEFAULT_SDP) +#define CONFIG_USB_PORT_POWER_SMART_DEFAULT_MODE USB_CHARGE_MODE_SDP2 +#elif defined(CONFIG_PLATFORM_EC_USB_PORT_POWER_SMART_DEFAULT_CDP) +#define CONFIG_USB_PORT_POWER_SMART_DEFAULT_MODE USB_CHARGE_MODE_CDP +#endif + #undef CONFIG_USB_PORT_POWER_SMART_INVERTED #ifdef CONFIG_PLATFORM_EC_USB_PORT_POWER_SMART_INVERTED #define CONFIG_USB_PORT_POWER_SMART_INVERTED #endif +#undef CONFIG_BC12_CLIENT_MODE_ONLY_PI3USB9201 +#ifdef CONFIG_PLATFORM_EC_BC12_CLIENT_MODE_ONLY_PI3USB9201 +#define CONFIG_BC12_CLIENT_MODE_ONLY_PI3USB9201 +#endif + #undef CONFIG_BC12_DETECT_PI3USB9201 #ifdef CONFIG_PLATFORM_EC_BC12_DETECT_PI3USB9201 #define CONFIG_BC12_DETECT_PI3USB9201 @@ -1310,6 +1328,16 @@ extern struct jump_data mock_jump_data; #define CONFIG_USB_PD_TCPM_NCT38XX #endif +#undef CONFIG_USB_PD_TCPM_PS8745 +#ifdef CONFIG_PLATFORM_EC_USB_PD_TCPM_PS8745 +#define CONFIG_USB_PD_TCPM_PS8745 +#endif + +#undef CONFIG_USB_PD_TCPM_PS8745_FORCE_ID +#ifdef CONFIG_PLATFORM_EC_USB_PD_TCPM_PS8745_FORCE_ID +#define CONFIG_USB_PD_TCPM_PS8745_FORCE_ID +#endif + #undef CONFIG_USB_PD_TCPM_PS8751 #ifdef CONFIG_PLATFORM_EC_USB_PD_TCPM_PS8751 #define CONFIG_USB_PD_TCPM_PS8751 @@ -1364,8 +1392,11 @@ extern struct jump_data mock_jump_data; #ifdef CONFIG_PLATFORM_EC_USB_PD_TCPM_ITE_ON_CHIP #define CONFIG_USB_PD_TCPM_ITE_ON_CHIP -/* TODO(b:189855648): hard-code a few things here; move to zephyr? */ -#define IT83XX_USBPD_PHY_PORT_COUNT 2 +#define IT83XX_USBPD_PHY_PORT_COUNT \ + COND_CODE_1(DT_NODE_EXISTS(DT_INST(1, ite_it8xxx2_usbpd)), (2), (1)) + +#define CONFIG_USB_PD_ITE_ACTIVE_PORT_COUNT \ + DT_NUM_INST_STATUS_OKAY(ite_it8xxx2_usbpd) #endif #undef CONFIG_USB_PD_TCPM_DRIVER_IT8XXX2 @@ -1446,31 +1477,6 @@ extern struct jump_data mock_jump_data; #endif /* CONFIG_PLATFORM_EC_USB_POWER_DELIVERY */ -#ifdef CONFIG_PLATFORM_EC_USB_CHARGER -#ifndef CONFIG_PLATFORM_EC_USB_CHARGER_SINGLE_TASK -#define HAS_TASK_USB_CHG_P0 1 - -#if CONFIG_USB_PD_PORT_MAX_COUNT > 1 -#define HAS_TASK_USB_CHG_P1 1 -#endif /* CONFIG_USB_PD_PORT_MAX_COUNT > 1 */ - -#if CONFIG_USB_PD_PORT_MAX_COUNT > 2 -#define HAS_TASK_USB_CHG_P2 1 -#endif /* CONFIG_USB_PD_PORT_MAX_COUNT > 2 */ - -#if CONFIG_USB_PD_PORT_MAX_COUNT > 3 -#define HAS_TASK_USB_CHG_P3 1 -#endif /* CONFIG_USB_PD_PORT_MAX_COUNT > 3 */ - -#endif /* !PLATFORM_EC_USB_CHARGER_SINGLE_TASK */ -#endif /* CONFIG_PLATFORM_EC_USB_CHARGER */ - -#undef CONFIG_USB_PD_ITE_ACTIVE_PORT_COUNT -#ifdef CONFIG_PLATFORM_EC_USB_PD_ITE_ACTIVE_PORT_COUNT -#define CONFIG_USB_PD_ITE_ACTIVE_PORT_COUNT \ - CONFIG_PLATFORM_EC_USB_PD_ITE_ACTIVE_PORT_COUNT -#endif - /* Remove PD_INT_C* task for ports managed by ITE embedded TCPC */ #ifdef CONFIG_USB_PD_ITE_ACTIVE_PORT_COUNT #if CONFIG_USB_PD_ITE_ACTIVE_PORT_COUNT >= 1 @@ -1512,6 +1518,11 @@ extern struct jump_data mock_jump_data; #define CONFIG_USBC_PPC_NX20P3483 #endif +#undef CONFIG_USBC_NX20P348X_RCP_5VSRC_MASK_ENABLE +#ifdef CONFIG_PLATFORM_EC_USBC_NX20P348X_RCP_5VSRC_MASK_ENABLE +#define CONFIG_USBC_NX20P348X_RCP_5VSRC_MASK_ENABLE +#endif + #undef CONFIG_USBC_PPC_RT1718S #ifdef CONFIG_PLATFORM_EC_USBC_PPC_RT1718S #define CONFIG_USBC_PPC_RT1718S @@ -1594,13 +1605,13 @@ extern struct jump_data mock_jump_data; #ifdef CONFIG_PLATFORM_EC_USBC_RETIMER_INTEL_HB #define USBC_PORT_C0_HB_RETIMER_I2C_ADDR \ - DT_REG_ADDR(DT_NODELABEL(usb_c0_hb_retimer)) + DT_REG_ADDR(DT_NODELABEL(usb_c0_hb_retimer)) #define USBC_PORT_C1_HB_RETIMER_I2C_ADDR \ - DT_REG_ADDR(DT_NODELABEL(usb_c1_hb_retimer)) + DT_REG_ADDR(DT_NODELABEL(usb_c1_hb_retimer)) #define USBC_PORT_C2_HB_RETIMER_I2C_ADDR \ - DT_REG_ADDR(DT_NODELABEL(usb_c2_hb_retimer)) + DT_REG_ADDR(DT_NODELABEL(usb_c2_hb_retimer)) #define USBC_PORT_C3_HB_RETIMER_I2C_ADDR \ - DT_REG_ADDR(DT_NODELABEL(usb_c3_hb_retimer)) + DT_REG_ADDR(DT_NODELABEL(usb_c3_hb_retimer)) #define CONFIG_USBC_RETIMER_INTEL_HB #endif @@ -1731,18 +1742,24 @@ extern struct jump_data mock_jump_data; #ifdef CONFIG_PLATFORM_EC_USB_PD_TCPC_LOW_POWER #define CONFIG_USB_PD_TCPC_LOW_POWER #define CONFIG_USB_PD_TCPC_LPM_EXIT_DEBOUNCE \ - CONFIG_PLATFORM_EC_USB_PD_TCPC_LPM_EXIT_DEBOUNCE_US + CONFIG_PLATFORM_EC_USB_PD_TCPC_LPM_EXIT_DEBOUNCE_US #endif /* CONFIG_PLATFORM_EC_USB_PD_TCPC_LOW_POWER */ #undef CONFIG_USB_PD_DEBUG_LEVEL #ifdef CONFIG_PLATFORM_EC_USB_PD_DEBUG_FIXED_LEVEL -#define CONFIG_USB_PD_DEBUG_LEVEL CONFIG_PLATFORM_EC_USB_PD_DEBUG_LEVEL +#define CONFIG_USB_PD_DEBUG_LEVEL CONFIG_PLATFORM_EC_USB_PD_DEBUG_LEVEL +#endif + +#undef CONFIG_USB_PD_INITIAL_DEBUG_LEVEL +#ifdef CONFIG_PLATFORM_EC_USB_PD_INITIAL_DEBUG_LEVEL +#define CONFIG_USB_PD_INITIAL_DEBUG_LEVEL \ + CONFIG_PLATFORM_EC_USB_PD_INITIAL_DEBUG_LEVEL #endif #undef CONFIG_USB_PD_STARTUP_DELAY_MS #ifdef CONFIG_PLATFORM_EC_USB_PD_STARTUP_DELAY_MS -#define CONFIG_USB_PD_STARTUP_DELAY_MS \ - CONFIG_PLATFORM_EC_USB_PD_STARTUP_DELAY_MS +#define CONFIG_USB_PD_STARTUP_DELAY_MS \ + CONFIG_PLATFORM_EC_USB_PD_STARTUP_DELAY_MS #endif #undef CONFIG_USB_PD_3A_PORTS @@ -1755,6 +1772,18 @@ extern struct jump_data mock_jump_data; #define CONFIG_USB_PD_TEMP_SENSOR CONFIG_PLATFORM_EC_USB_PD_TEMP_SENSOR #endif +#undef CONFIG_USB_PD_SHORT_PRESS_MAX_MS +#ifdef CONFIG_PLATFORM_EC_USB_PD_SHORT_PRESS_MAX_MS +#define CONFIG_USB_PD_SHORT_PRESS_MAX_MS \ + CONFIG_PLATFORM_EC_USB_PD_SHORT_PRESS_MAX_MS +#endif + +#undef CONFIG_USB_PD_LONG_PRESS_MAX_MS +#ifdef CONFIG_PLATFORM_EC_USB_PD_LONG_PRESS_MAX_MS +#define CONFIG_USB_PD_LONG_PRESS_MAX_MS \ + CONFIG_PLATFORM_EC_USB_PD_LONG_PRESS_MAX_MS +#endif + #undef CONFIG_USBC_VCONN #ifdef CONFIG_PLATFORM_EC_USBC_VCONN #define CONFIG_USBC_VCONN @@ -1818,6 +1847,11 @@ extern struct jump_data mock_jump_data; #define CONFIG_USB_PD_USB4 #endif +#undef CONFIG_USB_PD_DATA_RESET_MSG +#ifdef CONFIG_PLATFORM_EC_USB_PD_DATA_RESET_MSG +#define CONFIG_USB_PD_DATA_RESET_MSG +#endif + #undef CONFIG_USB_PD_FRS #ifdef CONFIG_PLATFORM_EC_USB_PD_FRS #define CONFIG_USB_PD_FRS @@ -1837,7 +1871,7 @@ extern struct jump_data mock_jump_data; #undef VSTORE_SLOT_COUNT #ifdef CONFIG_PLATFORM_EC_VSTORE #define CONFIG_VSTORE -#define CONFIG_VSTORE_SLOT_COUNT CONFIG_PLATFORM_EC_VSTORE_SLOT_COUNT +#define CONFIG_VSTORE_SLOT_COUNT CONFIG_PLATFORM_EC_VSTORE_SLOT_COUNT #endif /* motion sense */ @@ -1871,7 +1905,8 @@ extern struct jump_data mock_jump_data; #undef CONFIG_EC_MAX_SENSOR_FREQ_MILLIHZ #ifdef CONFIG_PLATFORM_EC_MAX_SENSOR_FREQ_MILLIHZ -#define CONFIG_EC_MAX_SENSOR_FREQ_MILLIHZ CONFIG_PLATFORM_EC_MAX_SENSOR_FREQ_MILLIHZ +#define CONFIG_EC_MAX_SENSOR_FREQ_MILLIHZ \ + CONFIG_PLATFORM_EC_MAX_SENSOR_FREQ_MILLIHZ #endif #undef CONFIG_CMD_ACCEL_SPOOF @@ -1984,6 +2019,11 @@ extern struct jump_data mock_jump_data; #define CONFIG_ACCELGYRO_LSM6DSO #endif +#undef CONFIG_ACCELGYRO_LSM6DSM +#ifdef CONFIG_PLATFORM_EC_ACCELGYRO_LSM6DSM +#define CONFIG_ACCELGYRO_LSM6DSM +#endif + #endif /* CONFIG_PLATFORM_EC_MOTIONSENSE */ #undef CONFIG_MATH_UTIL @@ -2027,6 +2067,11 @@ extern struct jump_data mock_jump_data; #define CONFIG_SOFTWARE_PANIC #endif +#undef CONFIG_DEBUG_ASSSERT_BRIEF +#ifdef CONFIG_PLATFORM_EC_DEBUG_ASSERT_BRIEF +#define CONFIG_DEBUG_ASSSERT_BRIEF +#endif + #undef CONFIG_PANIC_CONSOLE_OUTPUT #ifdef CONFIG_PLATFORM_EC_PANIC_CONSOLE_OUTPUT #define CONFIG_PANIC_CONSOLE_OUTPUT @@ -2108,6 +2153,11 @@ extern struct jump_data mock_jump_data; #define I2C_ADDR_EEPROM_FLAGS DT_REG_ADDR(DT_NODELABEL(cbi_eeprom)) #endif +#undef CONFIG_EEPROM_CBI_WP +#ifdef CONFIG_PLATFORM_EC_EEPROM_CBI_WP +#define CONFIG_EEPROM_CBI_WP +#endif + #undef CONFIG_CBI_GPIO #ifdef CONFIG_PLATFORM_EC_CBI_GPIO #define CONFIG_CBI_GPIO @@ -2125,14 +2175,14 @@ extern struct jump_data mock_jump_data; #undef CONFIG_RO_HDR_MEM_OFF #ifdef CONFIG_PLATFORM_EC_RO_HEADER_OFFSET -#define CONFIG_RO_HDR_MEM_OFF CONFIG_PLATFORM_EC_RO_HEADER_OFFSET +#define CONFIG_RO_HDR_MEM_OFF CONFIG_PLATFORM_EC_RO_HEADER_OFFSET #else #define CONFIG_RO_HDR_MEM_OFF 0 #endif #undef CONFIG_RO_HDR_SIZE #ifdef CONFIG_PLATFORM_EC_RO_HEADER_SIZE -#define CONFIG_RO_HDR_SIZE CONFIG_PLATFORM_EC_RO_HEADER_SIZE +#define CONFIG_RO_HDR_SIZE CONFIG_PLATFORM_EC_RO_HEADER_SIZE #else #define CONFIG_RO_HDR_SIZE 0 #endif @@ -2172,11 +2222,6 @@ extern struct jump_data mock_jump_data; #define CONFIG_DEBUG_ASSERT_REBOOTS #endif -#undef CONFIG_MPU -#ifdef CONFIG_PLATFORM_EC_MPU -#define CONFIG_MPU -#endif - #undef CONFIG_CMD_SYSINFO #ifdef CONFIG_PLATFORM_EC_CONSOLE_CMD_SYSINFO #define CONFIG_CMD_SYSINFO @@ -2199,7 +2244,7 @@ extern struct jump_data mock_jump_data; #undef CONFIG_WATCHDOG_WARNING_LEADING_TIME_MS #if defined(CONFIG_PLATFORM_EC_WATCHDOG_WARNING_LEADING_TIME_MS) || \ - defined(CONFIG_WDT_NPCX_DELAY_CYCLES) || \ + defined(CONFIG_WDT_NPCX_DELAY_CYCLES) || \ defined(CONFIG_WDT_ITE_WARNING_LEADING_TIME_MS) /* * Note: @@ -2319,7 +2364,7 @@ extern struct jump_data mock_jump_data; #undef CONFIG_BATTERY_DEVICE_CHEMISTRY #ifdef CONFIG_PLATFORM_EC_USE_BATTERY_DEVICE_CHEMISTRY -#define CONFIG_BATTERY_DEVICE_CHEMISTRY \ +#define CONFIG_BATTERY_DEVICE_CHEMISTRY \ CONFIG_PLATFORM_EC_BATTERY_DEVICE_CHEMISTRY #endif @@ -2366,13 +2411,13 @@ extern struct jump_data mock_jump_data; #undef CONFIG_CHARGER_BQ25710_SENSE_RESISTOR #ifdef CONFIG_PLATFORM_EC_CHARGER_BQ25710_SENSE_RESISTOR -#define CONFIG_CHARGER_BQ25710_SENSE_RESISTOR \ +#define CONFIG_CHARGER_BQ25710_SENSE_RESISTOR \ CONFIG_PLATFORM_EC_CHARGER_BQ25710_SENSE_RESISTOR #endif #undef CONFIG_CHARGER_BQ25710_SENSE_RESISTOR_AC #ifdef CONFIG_PLATFORM_EC_CHARGER_BQ25710_SENSE_RESISTOR_AC -#define CONFIG_CHARGER_BQ25710_SENSE_RESISTOR_AC \ +#define CONFIG_CHARGER_BQ25710_SENSE_RESISTOR_AC \ CONFIG_PLATFORM_EC_CHARGER_BQ25710_SENSE_RESISTOR_AC #endif @@ -2413,13 +2458,12 @@ extern struct jump_data mock_jump_data; #undef CONFIG_CHARGER_SENSE_RESISTOR #ifdef CONFIG_PLATFORM_EC_CHARGER_SENSE_RESISTOR -#define CONFIG_CHARGER_SENSE_RESISTOR \ - CONFIG_PLATFORM_EC_CHARGER_SENSE_RESISTOR +#define CONFIG_CHARGER_SENSE_RESISTOR CONFIG_PLATFORM_EC_CHARGER_SENSE_RESISTOR #endif #undef CONFIG_CHARGER_SENSE_RESISTOR_AC #ifdef CONFIG_PLATFORM_EC_CHARGER_SENSE_RESISTOR_AC -#define CONFIG_CHARGER_SENSE_RESISTOR_AC \ +#define CONFIG_CHARGER_SENSE_RESISTOR_AC \ CONFIG_PLATFORM_EC_CHARGER_SENSE_RESISTOR_AC #endif @@ -2454,8 +2498,7 @@ extern struct jump_data mock_jump_data; #undef CONFIG_MP2964 #ifdef CONFIG_PLATFORM_EC_MP2964 #define CONFIG_MP2964 -#define I2C_ADDR_MP2964_FLAGS \ - DT_REG_ADDR(DT_NODELABEL(pmic_mp2964)) +#define I2C_ADDR_MP2964_FLAGS DT_REG_ADDR(DT_NODELABEL(pmic_mp2964)) #endif #undef CONFIG_ACCELGYRO_ICM_COMM_SPI @@ -2503,6 +2546,11 @@ extern struct jump_data mock_jump_data; #define CONFIG_PORT80_4_BYTE #endif +#undef CONFIG_PORT80_QUIET +#ifdef CONFIG_PLATFORM_EC_PORT80_QUIET +#define CONFIG_PORT80_QUIET +#endif + #undef CONFIG_ASSERT_CCD_MODE_ON_DTS_CONNECT #ifdef CONFIG_PLATFORM_EC_ASSERT_CCD_MODE_ON_DTS_CONNECT #define CONFIG_ASSERT_CCD_MODE_ON_DTS_CONNECT @@ -2597,4 +2645,14 @@ extern struct jump_data mock_jump_data; #define CONFIG_IO_EXPANDER_CCGXXF #endif -#endif /* __CROS_EC_CONFIG_CHIP_H */ +#undef CONFIG_PERIPHERAL_CHARGER +#ifdef CONFIG_PLATFORM_EC_PERIPHERAL_CHARGER +#define CONFIG_PERIPHERAL_CHARGER +#endif + +#undef CONFIG_CPS8100 +#ifdef CONFIG_PLATFORM_EC_CPS8100 +#define CONFIG_CPS8100 +#endif + +#endif /* __CROS_EC_CONFIG_CHIP_H */ |