diff options
| author | YH Lin <yueherngl@google.com> | 2022-11-30 21:44:08 +0000 |
|---|---|---|
| committer | YH Lin <yueherngl@google.com> | 2022-11-30 21:44:08 +0000 |
| commit | af25602b15b22b9ef5821dcba9934311f2157c48 (patch) | |
| tree | d0c89ae8814c2ba35c238c6c0644ec6b1602c63a /zephyr/app/ec/Kconfig | |
| parent | 54462f034b635260dd09173b3d082e47fc960ef3 (diff) | |
| parent | aa40b859b3a73e5a205bc561c1a29eff38485461 (diff) | |
| download | chrome-ec-af25602b15b22b9ef5821dcba9934311f2157c48.tar.gz | |
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>
Diffstat (limited to 'zephyr/app/ec/Kconfig')
| -rw-r--r-- | zephyr/app/ec/Kconfig | 26 |
1 files changed, 26 insertions, 0 deletions
diff --git a/zephyr/app/ec/Kconfig b/zephyr/app/ec/Kconfig index fbf6185740..72c80f5d3a 100644 --- a/zephyr/app/ec/Kconfig +++ b/zephyr/app/ec/Kconfig @@ -27,6 +27,14 @@ config NUM_PREEMPT_PRIORITIES default 26 # +# Override the LOG_PRINTK to be no as it currently makes multiple +# tests timeout and a few others fail in console assertions +# TODO(b/http://b/260772137) Fix LOG_PRINTK issue and remove override +# +config LOG_PRINTK + default n + +# # In Zephyr, the default system workqueue thread priority level is the lowest # cooperative priority. Override its priority to the second lowest preempt # priority. (i.e. NUM_PREEMPT_PRIORITIES - 1) @@ -154,4 +162,22 @@ config SHIMMED_TASKS build. The CROS_EC_TASK_LIST defines a list of CROS_EC_TASK that should be shimmed in. +# +# These shell options are turned off by MINIMAL_SHELL, but are important to us; +# override Zephyr's default to keep them on. +# +config SHELL_HISTORY + default y + +config SHELL_TAB + default y + +config SHELL_TAB_AUTOCOMPLETION + default y if SHELL_TAB + +config SHELL_HELP + default y + +config KERNEL_SHELL + default y endif # CROS_EC |