diff options
| author | YH Lin <yueherngl@chromium.org> | 2022-12-03 00:17:55 +0000 |
|---|---|---|
| committer | Chromeos LUCI <chromeos-scoped@luci-project-accounts.iam.gserviceaccount.com> | 2022-12-05 17:43:18 +0000 |
| commit | dd732876495ed4942d00b9f9ca8dd3b01bad7120 (patch) | |
| tree | bdff671e5ad3e71e30ab56f4f084f34a2fd72e28 /util/config_allowed.txt | |
| parent | 184d13e77614be3be5374d3fef9d1edf66ec8687 (diff) | |
| download | chrome-ec-factory-brya-14909.124.B-main.tar.gz | |
Revert "Merge remote-tracking branch cros/main into factory-brya-14909.124.B-main"factory-brya-14909.124.B-main
This reverts commit 184d13e77614be3be5374d3fef9d1edf66ec8687.
Reason for revert: broken build due to ec-utils.
Original change's description:
> Merge remote-tracking branch cros/main into factory-brya-14909.124.B-main
>
> Generated by: util/update_release_branch.py --baseboard brya --relevant_paths_file
> baseboard/brya/relevant-paths.txt factory-brya-14909.124.B-main
>
> Relevant changes:
>
> git log --oneline 19d4d68ffa..aa40b859b3 -- baseboard/brya board/agah
> board/anahera board/banshee board/brya board/crota board/felwinter
> board/gimble board/kano board/mithrax board/osiris board/primus
> board/redrix board/taeko board/taniks board/vell board/volmar
> driver/bc12/pi3usb9201_public.* driver/charger/bq25710.*
> driver/ppc/nx20p348x.* driver/ppc/syv682x_public.*
> driver/retimer/bb_retimer_public.* driver/tcpm/nct38xx.*
> driver/tcpm/ps8xxx_public.* driver/tcpm/tcpci.* include/power/alderlake*
> include/intel_x86.h power/alderlake* power/intel_x86.c
> util/getversion.sh
>
> e6da633c38 driver: Sort header files
> 234a87ae2d tcpci: Add FRS enable to driver structure
> a56be59ccd tcpm_header: add test for tcpm_dump_registers
> 57b3256963 Rename CONFIG_CHARGER_INPUT_CURRENT to _CHARGER_DEFAULT_CURRENT_LIMIT
> e420c8ff9a marasov: Modify TypeC and TypeA configuration.
> 43b53e0045 Add default implementation of board_set_charge_limit
> b75dc90677 Add CONFIG_CHARGER_MIN_INPUT_CURRENT_LIMIT
> f1b563c350 baseboard: Sort header files
> 7d01b1e58d driver/retimer/ps8818.h: Add I2C ADDR FLAGS 0x30, 0x58, 0x70
> ec31407993 Add CONFIG_CHARGER_INPUT_CURRENT_DERATE_PCT
> 8f89f69a5b crota: disable lid angle sensor for clamshell
>
> BRANCH=None
> BUG=b:260630630 b:163093572 b:259002141 b:255184961 b:259354679
> BUG=b:247100970 b:254328661
> TEST=`emerge-brya chromeos-ec`
>
> Force-Relevant-Builds: all
> Change-Id: I0ecfa0e6af68631283c7a9e8f1afb9d827176c62
> Signed-off-by: YH Lin <yueherngl@google.com>
Bug: b:260630630 b:163093572 b:259002141 b:255184961 b:259354679
Bug: b:247100970 b:254328661
Change-Id: Ia14942d1bd6a502062399d77cb59d1f4b549b2c9
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/4077247
Auto-Submit: YH Lin <yueherngl@chromium.org>
Tested-by: YH Lin <yueherngl@chromium.org>
Reviewed-by: Boris Mittelberg <bmbm@google.com>
Commit-Queue: YH Lin <yueherngl@chromium.org>
Diffstat (limited to 'util/config_allowed.txt')
| -rw-r--r-- | util/config_allowed.txt | 18 |
1 files changed, 17 insertions, 1 deletions
diff --git a/util/config_allowed.txt b/util/config_allowed.txt index f7e20b379c..e503e96f94 100644 --- a/util/config_allowed.txt +++ b/util/config_allowed.txt @@ -122,7 +122,15 @@ CONFIG_BOARD_I2C_ADDR_FLAGS CONFIG_BOARD_ID_CMD_ACPI_EC1 CONFIG_BOARD_POST_GPIO_INIT CONFIG_BOARD_PRE_INIT +CONFIG_BODY_DETECTION +CONFIG_BODY_DETECTION_CONFIDENCE_DELTA +CONFIG_BODY_DETECTION_MAX_WINDOW_SIZE +CONFIG_BODY_DETECTION_OFF_BODY_CON +CONFIG_BODY_DETECTION_ON_BODY_CON CONFIG_BODY_DETECTION_SENSOR +CONFIG_BODY_DETECTION_STATIONARY_DURATION +CONFIG_BODY_DETECTION_VAR_NOISE_FACTOR +CONFIG_BODY_DETECTION_VAR_THRESHOLD CONFIG_BOOTBLOCK CONFIG_BOOTCFG_VALUE CONFIG_BOOT_HEADER_STORAGE_OFF @@ -161,6 +169,7 @@ CONFIG_CHARGE_MANAGER_BAT_PCT_SAFE_MODE_EXIT CONFIG_CHARGE_MANAGER_DRP_CHARGING CONFIG_CHARGE_MANAGER_EXTERNAL_POWER_LIMIT CONFIG_CHARGE_MANAGER_SAFE_MODE +CONFIG_CHARGE_STATE_DEBUG CONFIG_CHIPSET_ALDERLAKE CONFIG_CHIPSET_APL_GLK CONFIG_CHIPSET_APOLLOLAKE @@ -278,6 +287,7 @@ CONFIG_CMD_POWERLED CONFIG_CMD_POWER_AP CONFIG_CMD_PPC_DUMP CONFIG_CMD_PS2 +CONFIG_CMD_PWR_AVG CONFIG_CMD_RAND CONFIG_CMD_REGULATOR CONFIG_CMD_RESET_FLAGS @@ -332,6 +342,7 @@ CONFIG_CROS_EC_RW_MEM_SIZE CONFIG_CTN730 CONFIG_CTS_TASK_LIST CONFIG_CURVE25519 +CONFIG_CUSTOM_FAN_CONTROL CONFIG_DATA_RAM_SIZE CONFIG_DEBUG_BRINGUP CONFIG_DEBUG_DISABLE_WRITE_BUFFER @@ -376,6 +387,7 @@ CONFIG_ENABLE_JTAG_SELECTION CONFIG_EVENT_LOG_SIZE CONFIG_EXPERIMENTAL_CONSOLE CONFIG_EXTENDED_VERSION_INFO +CONFIG_EXTPOWER_DEBOUNCE_MS CONFIG_FAKE_SHMEM CONFIG_FANS CONFIG_FAN_DSLEEP @@ -407,7 +419,6 @@ CONFIG_FLASH_WRITE_SIZE CONFIG_FMAP CONFIG_FOO CONFIG_FORCE_CONSOLE_RESUME -CONFIG_FPU CONFIG_FPU_WARNINGS CONFIG_FP_SENSOR_ELAN515 CONFIG_FP_SENSOR_ELAN80 @@ -421,6 +432,7 @@ CONFIG_FW_PSTATE_OFF CONFIG_FW_PSTATE_SIZE CONFIG_GESTURE_DETECTION CONFIG_GESTURE_DETECTION_MASK +CONFIG_GESTURE_HOST_DETECTION CONFIG_GESTURE_ORIENTATION CONFIG_GESTURE_SAMPLING_INTERVAL_MS CONFIG_GESTURE_SENSOR_DOUBLE_TAP @@ -447,8 +459,10 @@ CONFIG_H2RAM_BASE CONFIG_H2RAM_HOST_LPC_IO_BASE CONFIG_H2RAM_SIZE CONFIG_HAS_TASK_PD_INT +CONFIG_HIBERNATE CONFIG_HIBERNATE_BATT_PCT CONFIG_HIBERNATE_BATT_SEC +CONFIG_HIBERNATE_DELAY_SEC CONFIG_HIBERNATE_PSL_COMPENSATE_RTC CONFIG_HIBERNATE_PSL_OUT_FLAGS CONFIG_HIBERNATE_PSL_VCC1_RST_WAKEUP @@ -549,6 +563,7 @@ CONFIG_ITE_FLASH_SUPPORT CONFIG_KEYBOARD_ASSISTANT_KEY CONFIG_KEYBOARD_BACKLIGHT CONFIG_KEYBOARD_BOOT_KEYS +CONFIG_KEYBOARD_FACTORY_TEST CONFIG_KEYBOARD_IRQ_GPIO CONFIG_KEYBOARD_KSO_BASE CONFIG_KEYBOARD_KSO_HIGH_DRIVE @@ -812,6 +827,7 @@ CONFIG_STM32_CLOCK_HSE_HZ CONFIG_STM32_CLOCK_LSE CONFIG_STM32_EXTENDED_RESET_FLAGS CONFIG_STM32_SPI1_CONTROLLER +CONFIG_STM_HWTIMER32 CONFIG_STREAM_SIGNATURE CONFIG_STREAM_USART CONFIG_STREAM_USART1 |