diff options
| author | Zhuohao Lee <zhuohao@chromium.org> | 2022-09-13 22:25:52 +0800 |
|---|---|---|
| committer | Zhuohao Lee <zhuohao@chromium.org> | 2022-09-13 22:25:52 +0800 |
| commit | 447de52bf857ca5ce0cbfa952d28269f5794e261 (patch) | |
| tree | a011234c567cc6ec47796803f0fc1afa6499e60e /zephyr/projects/nissa/prj.conf | |
| parent | a1c1b694ad02efd59b3573b3e7390ee8218dbba5 (diff) | |
| parent | e8fdcaa03f1057fae35abc15d3d9259b6e469329 (diff) | |
| download | chrome-ec-447de52bf857ca5ce0cbfa952d28269f5794e261.tar.gz | |
Merge remote-tracking branch cros/main into firmware-dedede-13606.B-master
Generated by: util/update_release_branch.py --baseboard dedede --relevant_paths_file
util/dedede-relevant-paths.txt firmware-dedede-13606.B-master
Relevant changes:
git log --oneline a1c1b694ad..e8fdcaa03f -- baseboard/dedede
board/beadrix board/beetley board/blipper board/boten board/bugzzy
board/corori2 board/cret board/drawcia board/drawcia_riscv board/galtic
board/kracko board/lantis board/madoo board/magolor board/metaknight
board/pirika board/sasuke board/sasukette board/shotzo board/storo
board/waddledee board/waddledoo board/wheelie common/charge_state_v2.c
common/mkbp_* common/ocpc.c common/usbc/usb_tc_drp_acc_trysrc_sm.c
common/usbc/usb_sm.c common/usbc/*_pd_* common/usbc/dp_alt_mode.c
common/usbc/usb_prl_sm.c common/usbc/usb_pe_drp_sm.c
common/usb_charger.c common/usb_common.c common/usbc_ocp.c
driver/charger/sm5803.* driver/charger/isl923x.* driver/tcpm/raa489000.*
driver/tcpm/it83* include/power/icelake.h include/intel_x86.h
power/icelake.c power/intel_x86.c util/getversion.sh
e8f7493381 dedede: usb_mux: Split struct usb_mux in dedede boards
953d4674e6 zephyr: tests: Test host command EC_CMD_GET_NEXT_EVENT in `mkbp_event.c`
71b2ef709d Update license boilerplate text in source code files
234a3fd7dd shotzo: Modify power led behavior when suspending
BRANCH=None
BUG=b:236274003 b:245531291 chromium:1098010 b:235791717
TEST=`make -j buildall`
Signed-off-by: Zhuohao Lee <zhuohao@chromium.org>
Change-Id: I77e992e4f74e2db18da629a88a2a15564c7c5ab2
Diffstat (limited to 'zephyr/projects/nissa/prj.conf')
| -rw-r--r-- | zephyr/projects/nissa/prj.conf | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/zephyr/projects/nissa/prj.conf b/zephyr/projects/nissa/prj.conf index 9c30396fe8..e86271959b 100644 --- a/zephyr/projects/nissa/prj.conf +++ b/zephyr/projects/nissa/prj.conf @@ -1,4 +1,4 @@ -# Copyright 2021 The Chromium OS Authors. All rights reserved. +# 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. @@ -39,8 +39,8 @@ CONFIG_AP=y CONFIG_AP_X86_INTEL_ADL=y CONFIG_ESPI=y CONFIG_ESPI_LOG_LEVEL_ERR=y -CONFIG_PLATFORM_EC_ESPI_VW_SLP_S4=y -CONFIG_PLATFORM_EC_ESPI_VW_SLP_S5=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 |