diff options
| author | Peter Marheine <pmarheine@chromium.org> | 2022-11-08 09:48:14 +1100 |
|---|---|---|
| committer | Chromeos LUCI <chromeos-scoped@luci-project-accounts.iam.gserviceaccount.com> | 2022-11-09 00:07:02 +0000 |
| commit | 44da6f397ba3627735745cb704cbad3264ecd7e5 (patch) | |
| tree | e15ade407d44933372f5abd61b7e85e20379d18f | |
| parent | 00fb03e257cba6b00234de2fa7fb984a8c405df0 (diff) | |
| download | chrome-ec-44da6f397ba3627735745cb704cbad3264ecd7e5.tar.gz | |
zephyr/shell: enable convenience features by default
CONFIG_MINIMAL_SHELL provides meaningful flash size reduction (about 8k on
NPCX) but turns off features that are important to us. Add EC defaults that
keep those on, even if MINIMAL_SHELL=y.
BUG=b:230486318
TEST=no change in flash usage on nivviks
BRANCH=none
Signed-off-by: Peter Marheine <pmarheine@chromium.org>
Change-Id: I3e4e37f409a473ff38e145ecacb0c4f24382fd14
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/4011358
Code-Coverage: Zoss <zoss-cl-coverage@prod.google.com>
Reviewed-by: Keith Short <keithshort@chromium.org>
| -rw-r--r-- | zephyr/app/ec/Kconfig | 18 | ||||
| -rw-r--r-- | zephyr/program/nissa/npcx_program.conf | 8 |
2 files changed, 20 insertions, 6 deletions
diff --git a/zephyr/app/ec/Kconfig b/zephyr/app/ec/Kconfig index fbf6185740..f630c252ed 100644 --- a/zephyr/app/ec/Kconfig +++ b/zephyr/app/ec/Kconfig @@ -154,4 +154,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 diff --git a/zephyr/program/nissa/npcx_program.conf b/zephyr/program/nissa/npcx_program.conf index ae672cb63a..1af7c9531f 100644 --- a/zephyr/program/nissa/npcx_program.conf +++ b/zephyr/program/nissa/npcx_program.conf @@ -31,13 +31,9 @@ CONFIG_PLATFORM_EC_USB_PD_5V_EN_CUSTOM=y # type C port 1 redriver CONFIG_PLATFORM_EC_USBC_RETIMER_ANX7483=y -# Save some flash space, but retain some useful features +# Save some flash space by turning off features we don't care much about +# (EC Kconfig.console turns the ones we do care about on by default) CONFIG_SHELL_MINIMAL=y -CONFIG_SHELL_HISTORY=y -CONFIG_SHELL_TAB=y -CONFIG_SHELL_TAB_AUTOCOMPLETION=y -CONFIG_SHELL_HELP=y -CONFIG_KERNEL_SHELL=y # FRS enable CONFIG_PLATFORM_EC_USB_PD_FRS=y |