diff options
| author | Eric Yilun Lin <yllin@chromium.org> | 2023-04-12 10:54:39 +0800 |
|---|---|---|
| committer | Eric Yilun Lin <yllin@google.com> | 2023-04-12 02:57:13 +0000 |
| commit | 846964eb47c50aea47ab05af1b2ad7aeed8369ba (patch) | |
| tree | cf35bbea86d4779a299f48ae4360c0789a2212bf /zephyr/shim/include/config_chip.h | |
| parent | 0dd5bdacefd8b62523646950ad3754c1a60ca8b9 (diff) | |
| parent | 30ffbb76357c44d2d8311311308a56f834eecebe (diff) | |
| download | chrome-ec-846964eb47c50aea47ab05af1b2ad7aeed8369ba.tar.gz | |
Merge remote-tracking branch cros/main into firmware-corsola-15194.B-main
Generated by: util/update_release_branch.py -r -z --board corsla --relevant_paths_file
util/corsola-relevant-paths.txt firmware-corsola-15194.B-main
Relevant changes:
git log --oneline 0dd5bdacef..30ffbb7635 -- zephyr/program/corsla
common/charge_state_v2.c common/dps.c common/mkbp_* common/usb_charger.c
common/usb_common.c common/usbc/*_pd_* common/usbc/dp_alt_mode.c
common/usbc/usb_pe_drp_sm.c common/usbc/usb_prl_sm.c
common/usbc/usb_sm.c common/usbc/usb_tc_drp_acc_trysrc_sm.c
driver/battery/smart.c driver/bc12/pi3usb9201.* driver/charger/isl923x.*
driver/charger/rt949* driver/ppc/nx20p348x.* driver/ppc/rt1718s.*
driver/ppc/syv682x.* driver/tcpm/anx7447.* driver/tcpm/rt1718s.*
driver/tcpm/tcpci.* driver/usb_mux/it5205.* driver/usb_mux/ps8743.*
power/mt8186.c zephyr/boards/arm/npcx9/* zephyr/boards/riscv/it8xxx2/*
zephyr/drivers/* zephyr/program/corsola/* zephyr/shim/*
util/getversion.sh
9a2f21a9f6 system_safe_mode: Print process stack dump
513f2d68b8 voltorb: Select 15V PDO when battery charge full.
8096498329 zephyr: shim: Add GESTURE_DETECTION to enable/disable body detection
9a77bb3d4a zephyr: Support PLATFORM_EC_CMD_POWERINDEBUG flag
89379a0a5e zephyr: Support PLATFORM_EC_CMD_GPIO_EXTENDED flag
BRANCH=None
BUG=none
TEST=`make -j buildall`
Cq-Depend: chromium:4416478
Force-Relevant-Builds: all
Change-Id: I2df27a3ea81bf76aa859c63e7cb623679ebe33e0
Signed-off-by: Eric Yilun Lin <yllin@chromium.org>
Diffstat (limited to 'zephyr/shim/include/config_chip.h')
| -rw-r--r-- | zephyr/shim/include/config_chip.h | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/zephyr/shim/include/config_chip.h b/zephyr/shim/include/config_chip.h index 7cfa79cb43..4b00a952c5 100644 --- a/zephyr/shim/include/config_chip.h +++ b/zephyr/shim/include/config_chip.h @@ -9,6 +9,8 @@ #include <zephyr/devicetree.h> #include <zephyr/toolchain.h> +#define LID_ACCEL SENSOR_ID(DT_NODELABEL(lid_accel)) + #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) @@ -2032,6 +2034,11 @@ extern char mock_jump_data[CONFIG_PLATFORM_EC_PRESERVED_END_OF_RAM_SIZE]; #define CONFIG_CMD_HCDEBUG #endif +#undef CONFIG_CMD_POWERINDEBUG +#ifdef CONFIG_PLATFORM_EC_CMD_POWERINDEBUG +#define CONFIG_CMD_POWERINDEBUG +#endif + #undef CONFIG_CMD_USB_PD_PE #ifdef CONFIG_PLATFORM_EC_CONSOLE_CMD_USB_PD_PE #define CONFIG_CMD_USB_PD_PE @@ -2163,6 +2170,13 @@ extern char mock_jump_data[CONFIG_PLATFORM_EC_PRESERVED_END_OF_RAM_SIZE]; #define CONFIG_CMD_ACCEL_SPOOF #endif +#undef CONFIG_GESTURE_DETECTION +#undef CONFIG_GESTURE_DETECTION_MASK +#ifdef CONFIG_PLATFORM_EC_GESTURE_DETECTION +#define CONFIG_GESTURE_DETECTION +#define CONFIG_GESTURE_DETECTION_MASK BIT(CONFIG_BODY_DETECTION_SENSOR) +#endif + #undef CONFIG_GESTURE_HOST_DETECTION #ifdef CONFIG_PLATFORM_EC_GESTURE_HOST_DETECTION #define CONFIG_GESTURE_HOST_DETECTION @@ -2459,6 +2473,11 @@ BUILD_ASSERT((DT_NUM_INST_STATUS_OKAY(maxim_max695x)) == 1, #define CONFIG_SYSTEM_UNLOCKED #endif +#undef CONFIG_CMD_GPIO_EXTENDED +#ifdef CONFIG_PLATFORM_EC_CMD_GPIO_EXTENDED +#define CONFIG_CMD_GPIO_EXTENDED +#endif + #undef CONFIG_BYPASS_CBI_EEPROM_WP_CHECK #ifdef CONFIG_PLATFORM_EC_BYPASS_CBI_EEPROM_WP_CHECK #define CONFIG_BYPASS_CBI_EEPROM_WP_CHECK @@ -2961,6 +2980,11 @@ BUILD_ASSERT((DT_NUM_INST_STATUS_OKAY(mps_mp2964)) == 1, CONFIG_PLATFORM_EC_SYSTEM_SAFE_MODE_TIMEOUT_MSEC #endif +#undef CONFIG_SYSTEM_SAFE_MODE_PRINT_STACK +#ifdef CONFIG_PLATFORM_EC_SYSTEM_SAFE_MODE_PRINT_STACK +#define CONFIG_SYSTEM_SAFE_MODE_PRINT_STACK +#endif + #undef CONFIG_BATT_HOST_FULL_FACTOR #ifdef CONFIG_PLATFORM_EC_BATT_HOST_FULL_FACTOR #define CONFIG_BATT_HOST_FULL_FACTOR CONFIG_PLATFORM_EC_BATT_HOST_FULL_FACTOR |