diff options
author | YH Lin <yueherngl@chromium.org> | 2022-12-03 00:19:30 +0000 |
---|---|---|
committer | Chromeos LUCI <chromeos-scoped@luci-project-accounts.iam.gserviceaccount.com> | 2022-12-05 17:43:05 +0000 |
commit | c8af732351cc5c7167f27e8390e26f0556f53a5a (patch) | |
tree | bdff671e5ad3e71e30ab56f4f084f34a2fd72e28 /zephyr/program/nissa/program.conf | |
parent | af25602b15b22b9ef5821dcba9934311f2157c48 (diff) | |
download | chrome-ec-factory-brya-14517.B-main.tar.gz |
Revert "Merge remote-tracking branch cros/main into factory-brya-14517.B-main"factory-brya-14517.B-main
This reverts commit af25602b15b22b9ef5821dcba9934311f2157c48.
Reason for revert: broken build due to ec-utils.
Original change's description:
> Merge remote-tracking branch cros/main into factory-brya-14517.B-main
>
> Generated by: util/update_release_branch.py --baseboard brya --relevant_paths_file
> baseboard/brya/relevant-paths.txt factory-brya-14517.B-main
>
> Relevant changes:
>
> git log --oneline 54462f034b..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:259002141 b:255184961 b:247100970 b:259354679 b:260630630
> BUG=b:163093572 b:254328661
> TEST=`emerge-brya chromeos-ec`
>
> Force-Relevant-Builds: all
> Change-Id: Ia85a701fbf6b8e67ec214b9e25e0e55e980a6f47
> Signed-off-by: YH Lin <yueherngl@google.com>
Bug: b:259002141 b:255184961 b:247100970 b:259354679 b:260630630
Bug: b:163093572 b:254328661
Change-Id: I48d5aa4cc67a69ee1f6ac9255ac3087d34da4c72
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/4077248
Tested-by: YH Lin <yueherngl@chromium.org>
Commit-Queue: YH Lin <yueherngl@chromium.org>
Reviewed-by: Boris Mittelberg <bmbm@google.com>
Auto-Submit: YH Lin <yueherngl@chromium.org>
Diffstat (limited to 'zephyr/program/nissa/program.conf')
-rw-r--r-- | zephyr/program/nissa/program.conf | 145 |
1 files changed, 0 insertions, 145 deletions
diff --git a/zephyr/program/nissa/program.conf b/zephyr/program/nissa/program.conf deleted file mode 100644 index ade406671a..0000000000 --- a/zephyr/program/nissa/program.conf +++ /dev/null @@ -1,145 +0,0 @@ -# Copyright 2021 The ChromiumOS Authors -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -# Core EC configuration: build the EC application, using ECOS shims -# (which are currently required for a number of features). -CONFIG_CROS_EC=y -CONFIG_PLATFORM_EC=y -CONFIG_SHIMMED_TASKS=y -CONFIG_LTO=y - -# RAM-saving options -# flash shell command is unused, allocated a 4kB buffer for flash test -CONFIG_FLASH_SHELL=n -# EC default 1kB buffer seems unnecessarily large, Zephyr default is 8 bytes -CONFIG_SHELL_BACKEND_SERIAL_TX_RING_BUFFER_SIZE=128 - -# Standard shimmed features -CONFIG_PLATFORM_EC_BACKLIGHT_LID=y -CONFIG_PLATFORM_EC_CONSOLE_CMD_SYSINFO=y -CONFIG_PLATFORM_EC_EEPROM_CBI_WP=y -CONFIG_PLATFORM_EC_LID_SWITCH=y -CONFIG_PLATFORM_EC_POWER_BUTTON=y -CONFIG_PLATFORM_EC_SWITCH=y -CONFIG_PLATFORM_EC_GMR_TABLET_MODE=y -CONFIG_PLATFORM_EC_TABLET_MODE=y -CONFIG_PLATFORM_EC_TABLET_MODE_SWITCH=y -CONFIG_PLATFORM_EC_VBOOT_EFS2=y -CONFIG_PLATFORM_EC_VBOOT_HASH=y - -# Application processor; communicates with EC via eSPI -CONFIG_AP=y -CONFIG_AP_X86_INTEL_ADL=y -CONFIG_ESPI=y -CONFIG_PLATFORM_EC_HOST_INTERFACE_ESPI_VW_SLP_S4=y -CONFIG_PLATFORM_EC_HOST_INTERFACE_ESPI_VW_SLP_S5=y -CONFIG_PLATFORM_EC_HOSTCMD=y -CONFIG_HCDEBUG_OFF=y -CONFIG_PLATFORM_EC_THROTTLE_AP=y -CONFIG_PLATFORM_EC_PORT80=y -CONFIG_PLATFORM_EC_PORT80_QUIET=y - -# AP Power Sequencing -CONFIG_AP_PWRSEQ=y -CONFIG_X86_NON_DSX_PWRSEQ_ADL=y -CONFIG_X86_NON_DSX_PWRSEQ_CONSOLE=y -CONFIG_X86_NON_DSX_PWRSEQ_HOST_CMD=y -CONFIG_AP_PWRSEQ_S0IX=y -CONFIG_AP_PWRSEQ_S0IX_ERROR_RECOVERY=y - -# Keyboard support -CONFIG_PLATFORM_EC_KBLIGHT_ENABLE_PIN=y -CONFIG_PLATFORM_EC_KEYBOARD_PROTOCOL_8042=y -CONFIG_PLATFORM_EC_VOLUME_BUTTONS=y -CONFIG_PLATFORM_EC_CMD_BUTTON=n -# Column 2 is driven through the GSC, which inverts the signal going through it -CONFIG_PLATFORM_EC_KEYBOARD_COL2_INVERTED=y - -# LED -CONFIG_PLATFORM_EC_LED_COMMON=y -CONFIG_PLATFORM_EC_LED_ONOFF_STATES=y -CONFIG_PLATFORM_EC_CONSOLE_CMD_LEDTEST=n - -# MKBP event -CONFIG_PLATFORM_EC_MKBP_EVENT=y -CONFIG_PLATFORM_EC_MKBP_INPUT_DEVICES=y -CONFIG_PLATFORM_EC_MKBP_USE_GPIO_AND_HOST_EVENT=y - -# Temperature sensor support -CONFIG_PLATFORM_EC_TEMP_SENSOR_FIRST_READ_DELAY=y - -# CBI EEPROM support -CONFIG_EEPROM=y -CONFIG_PLATFORM_EC_BOARD_VERSION_CBI=y - -# PWM support -CONFIG_PWM_SHELL=y - -# Sensors support -CONFIG_PLATFORM_EC_LID_ANGLE=y -CONFIG_PLATFORM_EC_LID_ANGLE_UPDATE=y -CONFIG_PLATFORM_EC_MOTIONSENSE=y -CONFIG_PLATFORM_EC_CONSOLE_CMD_ACCELS=y -CONFIG_PLATFORM_EC_CONSOLE_CMD_ACCEL_INFO=y -CONFIG_PLATFORM_EC_ACCEL_FIFO=y -CONFIG_PLATFORM_EC_SENSOR_TIGHT_TIMESTAMPS=y - -# USB-C: enable PD on up to two ports -CONFIG_PLATFORM_EC_USBC=y -CONFIG_PLATFORM_EC_USBC_PPC=n -CONFIG_PLATFORM_EC_USB_VID=0x18d1 -CONFIG_PLATFORM_EC_USB_PID=0x505a -# USB4 and TBT are unsupported -CONFIG_PLATFORM_EC_USB_PD_USB4=n -CONFIG_PLATFORM_EC_USB_PD_TBT_COMPAT_MODE=n - -CONFIG_PLATFORM_EC_USB_MUX_RUNTIME_CONFIG=y -CONFIG_PLATFORM_EC_USB_MUX_VIRTUAL=y -CONFIG_PLATFORM_EC_USB_PD_REQUIRE_AP_MODE_ENTRY=y -# ADL integrated muxes are slow: unblock PD -CONFIG_PLATFORM_EC_USB_MUX_TASK=y - -# USB-C TCPC and PPC standard options -CONFIG_PLATFORM_EC_USB_PD_TCPC_LOW_POWER=y -CONFIG_PLATFORM_EC_USB_PD_VBUS_MEASURE_CHARGER=y - -# USB-A host ports -CONFIG_PLATFORM_EC_USB_PORT_ENABLE_DYNAMIC=y -# Both ports use a smart switch with CTL1..3 fixed high, for SDP2 or CDP only: -# either SLGC55545 or PI5USB2546. -CONFIG_PLATFORM_EC_USB_PORT_POWER_SMART=y -CONFIG_PLATFORM_EC_USB_PORT_POWER_SMART_CDP_SDP_ONLY=y -CONFIG_PLATFORM_EC_USB_PORT_POWER_SMART_DEFAULT_CDP=y -CONFIG_PLATFORM_EC_USB_PORT_POWER_SMART_INVERTED=y - -# Battery support -CONFIG_PLATFORM_EC_BATTERY_CUT_OFF=y -CONFIG_PLATFORM_EC_BATTERY_PRESENT_GPIO=y -CONFIG_PLATFORM_EC_BATTERY_FUEL_GAUGE=y -CONFIG_PLATFORM_EC_BATTERY_SMART=y -CONFIG_PLATFORM_EC_BATTERY_REVIVE_DISCONNECT=y - -# Charger support -CONFIG_PLATFORM_EC_CHARGER_SENSE_RESISTOR=10 -CONFIG_PLATFORM_EC_CHARGER_SENSE_RESISTOR_AC=10 -CONFIG_PLATFORM_EC_CHARGER_DISCHARGE_ON_AC=y -CONFIG_PLATFORM_EC_CHARGER_DISCHARGE_ON_AC_CHARGER=y -CONFIG_PLATFORM_EC_OCPC_DEF_DRIVELIMIT_MILLIVOLTS=200 -# Assume 4% overdraw, which could be changed with actual characterization -CONFIG_PLATFORM_EC_CHARGER_INPUT_CURRENT_DERATE_PCT=4 -CONFIG_PLATFORM_EC_CHARGER_MIN_INPUT_CURRENT_LIMIT=512 - -# Reduce logging so that state transitions do not cause protocol issues -# pd dump [1-3] can be used to increase the debugging level -CONFIG_PLATFORM_EC_USB_PD_INITIAL_DEBUG_LEVEL=0 - -# System-side power distribution is designed to be robust up to about 45W, and -# higher input power may have negative reliability implications (especially for -# systems with 2S batteries). Most devices can't exceed 45W sinking anyway, so -# limit charger power to keep system input current within the design range. -CONFIG_PLATFORM_EC_PD_MAX_POWER_MW=45000 -# 15V input is slightly more efficient than 20V for all supported chargers, and -# because power is limited to 45W for other reasons (see above) limiting input -# voltage like this does not compromise the total power capacity of the system. -CONFIG_PLATFORM_EC_PD_MAX_VOLTAGE_MV=15000
\ No newline at end of file |