summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew McRae <amcrae@google.com>2022-01-29 23:22:15 +1100
committerCommit Bot <commit-bot@chromium.org>2022-01-31 00:12:38 +0000
commite20dd2bf168fa225e03b972f1abeacd567397ef3 (patch)
treefef8a394f9721791e9f8a9d4a4feb7ea9616de62
parent793a6d68d307e4ccd55d406898a4f38aa0ac6ccf (diff)
downloadchrome-ec-e20dd2bf168fa225e03b972f1abeacd567397ef3.tar.gz
nissa: Nivviks config fixes
Fix some config items: - Use charger TCPC to detect VBUS - Remove redundant SYSINFO config (on by default) - Turn off CONFIG_SOC_POWER_MANAGEMENT_TRACE until chromium:3426238 lands BUG=b:201000681 TEST=zmake configure -b nivviks; flash and run BRANCH=none Signed-off-by: Andrew McRae <amcrae@google.com> Cq-Depend: chromium:3426239 Change-Id: I05390aa4a8ba81a0871c9df016e087940f58a41a Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3426240 Reviewed-by: Peter Marheine <pmarheine@chromium.org>
-rw-r--r--zephyr/projects/nissa/prj_nivviks.conf9
1 files changed, 5 insertions, 4 deletions
diff --git a/zephyr/projects/nissa/prj_nivviks.conf b/zephyr/projects/nissa/prj_nivviks.conf
index 795d49ac12..16c3ff2ecd 100644
--- a/zephyr/projects/nissa/prj_nivviks.conf
+++ b/zephyr/projects/nissa/prj_nivviks.conf
@@ -14,9 +14,10 @@ CONFIG_LOG_BACKEND_UART=y
# 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
+#
+# TODO(b/216921645): Remove when fixed
+#
+CONFIG_SOC_POWER_MANAGEMENT_TRACE=n
# Variant config
CONFIG_BOARD_NIVVIKS=y
@@ -29,7 +30,6 @@ CONFIG_CROS_FLASH_NPCX=y
CONFIG_CROS_SYSTEM_NPCX=y
CONFIG_PLATFORM_EC_VBOOT_EFS2=y
CONFIG_PLATFORM_EC_VBOOT_HASH=y
-CONFIG_PLATFORM_EC_CONSOLE_CMD_SYSINFO=y
CONFIG_PLATFORM_EC_I2C=y
CONFIG_PLATFORM_EC_BACKLIGHT_LID=y
@@ -102,6 +102,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_DETECT_TCPC=y
CONFIG_PLATFORM_EC_USB_PD_VBUS_MEASURE_CHARGER=y
CONFIG_PLATFORM_EC_USB_MUX_VIRTUAL=y