summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew McRae <amcrae@google.com>2022-01-18 22:55:51 +1100
committerCommit Bot <commit-bot@chromium.org>2022-01-19 08:36:50 +0000
commita13821d34669aa01a863ad1ea5cc6292234fe006 (patch)
tree38737d572d1b5866acd28b34889b2271242eb08a
parent40c885d4cf1c8149ad03c3b698ebb2f0fc6d1688 (diff)
downloadchrome-ec-a13821d34669aa01a863ad1ea5cc6292234fe006.tar.gz
nissa: Configuration changes for nivviks
Adjust stack sizes to provide some head room. Add USB-C VBUS charger measurement option. 'kernel stacks' now reports free memory in the stacks. BUG=b:214881978 TEST=zmake configure -b nivviks; flash and run BRANCH=none Signed-off-by: Andrew McRae <amcrae@google.com> Change-Id: Icad59032f8afe2159fad3d024039e7c2e7611640 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3397885 Reviewed-by: Peter Marheine <pmarheine@chromium.org>
-rw-r--r--zephyr/Kconfig.usbc1
-rw-r--r--zephyr/projects/nissa/prj_nivviks.conf7
2 files changed, 7 insertions, 1 deletions
diff --git a/zephyr/Kconfig.usbc b/zephyr/Kconfig.usbc
index bba5c18c56..e84b748be1 100644
--- a/zephyr/Kconfig.usbc
+++ b/zephyr/Kconfig.usbc
@@ -1005,7 +1005,6 @@ config PLATFORM_EC_USB_PD_TCPM_TCPCI
# CONFIG_USB_PD_TCPM_ANX741X
# CONFIG_USB_PD_TCPM_ANX7688
# CONFIG_USB_PD_TCPM_MT6370
-# CONFIG_USB_PD_TCPM_RAA489000
# CONFIG_USB_PD_TCPM_FUSB307
# CONFIG_USB_PD_TCPM_STM32GX
# CONFIG_USB_PD_TCPM_CCGXXF
diff --git a/zephyr/projects/nissa/prj_nivviks.conf b/zephyr/projects/nissa/prj_nivviks.conf
index de5b111820..d28f99c7ec 100644
--- a/zephyr/projects/nissa/prj_nivviks.conf
+++ b/zephyr/projects/nissa/prj_nivviks.conf
@@ -15,6 +15,12 @@ CONFIG_LOG_BACKEND_UART=y
# TODO(b/214881978): Re-enable when charging fixed
CONFIG_PLATFORM_EC_USB_PD_TCPC_LOW_POWER=n
+# EC config
+CONFIG_SOC_SERIES_NPCX9=y
+CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=1024
+CONFIG_TASK_CHARGER_STACK_SIZE=840
+CONFIG_TASK_USB_CHG_STACK_SIZE=684
+
# Variant config
CONFIG_BOARD_NIVVIKS=y
@@ -98,6 +104,7 @@ CONFIG_PLATFORM_EC_USB_PD_TCPC_RUNTIME_CONFIG=y
CONFIG_PLATFORM_EC_USB_PD_TCPM_RAA489000=y
CONFIG_PLATFORM_EC_USB_PD_DISCHARGE_TCPC=y
CONFIG_PLATFORM_EC_USB_PD_5V_EN_CUSTOM=y
+CONFIG_PLATFORM_EC_USB_PD_VBUS_MEASURE_CHARGER=y
CONFIG_PLATFORM_EC_USB_MUX_VIRTUAL=y
CONFIG_PLATFORM_EC_BC12_DETECT_PI3USB9201=y