From e0c1795a9ab6599419b763054e89bcf2662a1f6e Mon Sep 17 00:00:00 2001 From: David Huang Date: Tue, 7 Jun 2022 18:28:03 +0800 Subject: zephyr: Add controlled EC_CBI_WP Control EC_CBI_WP based on WP_ODL state. BUG=b:234572033 b:236067475 b:235425819 BRANCH=none TEST=Check EC_CBI_WP status enable/disable when WP_ODL enable/disable. Signed-off-by: David Huang Change-Id: If1a6b4c9ccf663894c33978864acc60bd37a2e45 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3694916 Reviewed-by: Eric Yilun Lin Tested-by: David Huang Auto-Submit: David Huang Commit-Queue: Eric Yilun Lin --- zephyr/app/ec/ec_app_main.c | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'zephyr/app') diff --git a/zephyr/app/ec/ec_app_main.c b/zephyr/app/ec/ec_app_main.c index 12043a3c4a..17c6eeb697 100644 --- a/zephyr/app/ec/ec_app_main.c +++ b/zephyr/app/ec/ec_app_main.c @@ -11,6 +11,7 @@ #include "ap_power/ap_pwrseq.h" #include "button.h" #include "chipset.h" +#include "cros_board_info.h" #include "ec_tasks.h" #include "hooks.h" #include "keyboard_scan.h" @@ -76,6 +77,14 @@ void ec_app_main(void) hook_notify(HOOK_INIT); } + /* + * If the EC has exclusive control over the CBI EEPROM WP signal, have + * the EC set the WP if appropriate. Note that once the WP is set, the + * EC must be reset via EC_RST_ODL in order for the WP to become unset. + */ + if (IS_ENABLED(CONFIG_PLATFORM_EC_EEPROM_CBI_WP) && system_is_locked()) + cbi_latch_eeprom_wp(); + /* * Print the init time. Not completely accurate because it can't take * into account the time before timer_init(), but it'll at least catch -- cgit v1.2.1 From 5fffd06a2eefbf1a457e02da985f31de76cfdf4a Mon Sep 17 00:00:00 2001 From: Jack Rosenthal Date: Mon, 27 Jun 2022 15:27:46 -0600 Subject: zephyr/app/ec/ec_app_main.c: Format with clang-format BUG=b:236386294 BRANCH=none TEST=none Change-Id: Ic61005fe4bbfbe613ea88c8d8b0940dc137fc30f Signed-off-by: Jack Rosenthal Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3730667 Reviewed-by: Jeremy Bettis --- zephyr/app/ec/ec_app_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'zephyr/app') diff --git a/zephyr/app/ec/ec_app_main.c b/zephyr/app/ec/ec_app_main.c index 17c6eeb697..414ed65e9c 100644 --- a/zephyr/app/ec/ec_app_main.c +++ b/zephyr/app/ec/ec_app_main.c @@ -39,7 +39,7 @@ void ec_app_main(void) system_print_banner(); if (IS_ENABLED(CONFIG_PLATFORM_EC_WATCHDOG) && - !IS_ENABLED(CONFIG_WDT_DISABLE_AT_BOOT)) { + !IS_ENABLED(CONFIG_WDT_DISABLE_AT_BOOT)) { watchdog_init(); } -- cgit v1.2.1 From e616b66c76ddbdf03ed8d2179516c9c67cfc045a Mon Sep 17 00:00:00 2001 From: Peter Marheine Date: Mon, 4 Jul 2022 12:33:49 +1000 Subject: it8xxx2: disable eSPI inputs when in G3 eSPI CS# goes low when the AP is off, which prevents the EC from entering deep doze to save power. Disable the eSPI pad on G3 entry and re-enable before exiting G3 to enable EC power saving. This optimization is expected to be relevant to all boards that use eSPI to manage AP power with IT8xxx2, so the code is located such that it will be included for every board that has appropriate configuration. BUG=b:237717730 TEST=Nereid still boots from G3 and returns to G3 correctly; debug logs indicate eSPI pad control is running. BRANCH=none Signed-off-by: Peter Marheine Change-Id: Ia2f245b0fc84cdddf28471a13a69e73b6188f932 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3742840 Reviewed-by: Andrew McRae Reviewed-by: Keith Short --- zephyr/app/ec/CMakeLists.txt | 2 + zephyr/app/ec/chip/CMakeLists.txt | 1 + zephyr/app/ec/chip/riscv/CMakeLists.txt | 1 + zephyr/app/ec/chip/riscv/riscv-ite/CMakeLists.txt | 3 ++ zephyr/app/ec/chip/riscv/riscv-ite/it8xxx2-espi.c | 63 +++++++++++++++++++++++ 5 files changed, 70 insertions(+) create mode 100644 zephyr/app/ec/chip/CMakeLists.txt create mode 100644 zephyr/app/ec/chip/riscv/CMakeLists.txt create mode 100644 zephyr/app/ec/chip/riscv/riscv-ite/CMakeLists.txt create mode 100644 zephyr/app/ec/chip/riscv/riscv-ite/it8xxx2-espi.c (limited to 'zephyr/app') diff --git a/zephyr/app/ec/CMakeLists.txt b/zephyr/app/ec/CMakeLists.txt index fc7205462d..6ddac15080 100644 --- a/zephyr/app/ec/CMakeLists.txt +++ b/zephyr/app/ec/CMakeLists.txt @@ -7,3 +7,5 @@ zephyr_library_sources(ec_app_main.c) if(NOT DEFINED CONFIG_ZTEST) zephyr_library_sources(main_shim.c) endif() + +add_subdirectory(chip) \ No newline at end of file diff --git a/zephyr/app/ec/chip/CMakeLists.txt b/zephyr/app/ec/chip/CMakeLists.txt new file mode 100644 index 0000000000..e92dbc5d5d --- /dev/null +++ b/zephyr/app/ec/chip/CMakeLists.txt @@ -0,0 +1 @@ +add_subdirectory_ifdef(CONFIG_RISCV riscv) \ No newline at end of file diff --git a/zephyr/app/ec/chip/riscv/CMakeLists.txt b/zephyr/app/ec/chip/riscv/CMakeLists.txt new file mode 100644 index 0000000000..b11c4e9a90 --- /dev/null +++ b/zephyr/app/ec/chip/riscv/CMakeLists.txt @@ -0,0 +1 @@ +add_subdirectory_ifdef(CONFIG_SOC_FAMILY_RISCV_ITE riscv-ite) \ No newline at end of file diff --git a/zephyr/app/ec/chip/riscv/riscv-ite/CMakeLists.txt b/zephyr/app/ec/chip/riscv/riscv-ite/CMakeLists.txt new file mode 100644 index 0000000000..69608c33e3 --- /dev/null +++ b/zephyr/app/ec/chip/riscv/riscv-ite/CMakeLists.txt @@ -0,0 +1,3 @@ +if (CONFIG_ESPI_IT8XXX2) + zephyr_library_sources_ifdef(CONFIG_AP_POWER_CONTROL it8xxx2-espi.c) +endif () \ No newline at end of file diff --git a/zephyr/app/ec/chip/riscv/riscv-ite/it8xxx2-espi.c b/zephyr/app/ec/chip/riscv/riscv-ite/it8xxx2-espi.c new file mode 100644 index 0000000000..81d96c4328 --- /dev/null +++ b/zephyr/app/ec/chip/riscv/riscv-ite/it8xxx2-espi.c @@ -0,0 +1,63 @@ +/* Copyright 2022 The ChromiumOS Authors. + * Use of this source code is governed by a BSD-style license that can be + * found in the LICENSE file. + */ +#include +#include +#include +#include +#include + +LOG_MODULE_REGISTER(ec_chip_it8xxx2_espi, CONFIG_ESPI_LOG_LEVEL); + +/* + * When eSPI CS# is held low, it prevents IT8xxx2 from entering deep doze. + * To allow deep doze and save power, disable the eSPI inputs while the AP is + * in G3. + */ +static const struct device *const espi_device = + DEVICE_DT_GET(DT_NODELABEL(espi0)); + +static void espi_enable_callback(struct ap_power_ev_callback *cb, + struct ap_power_ev_data data) +{ + switch (data.event) { + case AP_POWER_INITIALIZED: + /* When AP power state becomes known, sync eSPI enable */ + if (chipset_in_state(CHIPSET_STATE_HARD_OFF)) { + LOG_DBG("AP off; disabling eSPI"); + espi_it8xxx2_enable_pad_ctrl(espi_device, false); + } + break; + case AP_POWER_PRE_INIT: + case AP_POWER_HARD_OFF: { + bool enable = data.event == AP_POWER_PRE_INIT; + + LOG_DBG("%sabling eSPI in response to AP power event", + enable ? "en" : "dis"); + espi_it8xxx2_enable_pad_ctrl(espi_device, enable); + break; + } + default: + __ASSERT(false, "%s: unhandled event: %d", __func__, + data.event); + break; + } +} + +static int init_espi_enable_callback(const struct device *unused) +{ + static struct ap_power_ev_callback cb; + + if (!device_is_ready(espi_device)) + k_oops(); + + ap_power_ev_init_callback(&cb, espi_enable_callback, + AP_POWER_INITIALIZED | AP_POWER_PRE_INIT | + AP_POWER_HARD_OFF); + ap_power_ev_add_callback(&cb); + + return 0; +} +/* Should run before power sequencing init so INITIALIZED callback can fire */ +SYS_INIT(init_espi_enable_callback, APPLICATION, 0); -- cgit v1.2.1 From 5d0edcf6d2db6a8d7701c8bcfc59c5bb58326e5f Mon Sep 17 00:00:00 2001 From: Keith Short Date: Thu, 21 Jul 2022 13:32:06 -0600 Subject: zephyr: Delete CONFIG_PLATFORM_EC_MPU CONFIG_PLATFORM_EC_MPU is redundant with the Zephyr Kconfig option, CONFIG_MPU. Use the Zephyr option directly. BUG=none BRANCH=none TEST=zmake testall --static; compare binaries Signed-off-by: Keith Short Change-Id: Iff92c7e9fe3a003366d153e618d2450b367fd169 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3791660 Reviewed-by: Aaron Massey --- zephyr/app/ec/chip/arm/microchip_xec/Kconfig.xec | 4 ++++ zephyr/app/ec/chip/arm/nuvoton_npcx/Kconfig.npcx | 4 ++++ 2 files changed, 8 insertions(+) (limited to 'zephyr/app') diff --git a/zephyr/app/ec/chip/arm/microchip_xec/Kconfig.xec b/zephyr/app/ec/chip/arm/microchip_xec/Kconfig.xec index d05ad020e7..6a78792733 100644 --- a/zephyr/app/ec/chip/arm/microchip_xec/Kconfig.xec +++ b/zephyr/app/ec/chip/arm/microchip_xec/Kconfig.xec @@ -8,6 +8,10 @@ if SOC_FAMILY_MEC +# Enable MPU for ARM targets +config ARM_MPU + default y + # ADC config PLATFORM_EC_ADC_RESOLUTION default 10 diff --git a/zephyr/app/ec/chip/arm/nuvoton_npcx/Kconfig.npcx b/zephyr/app/ec/chip/arm/nuvoton_npcx/Kconfig.npcx index 2da9252775..2e3d3c95a0 100644 --- a/zephyr/app/ec/chip/arm/nuvoton_npcx/Kconfig.npcx +++ b/zephyr/app/ec/chip/arm/nuvoton_npcx/Kconfig.npcx @@ -8,6 +8,10 @@ if SOC_FAMILY_NPCX +# Enable MPU for ARM targets +config ARM_MPU + default y + # Enable NPCX firmware header generator config NPCX_HEADER default y -- cgit v1.2.1 From 0096058366ada3cfbaf8aa3c1ffcca99d984f263 Mon Sep 17 00:00:00 2001 From: Fabio Baltieri Date: Thu, 4 Aug 2022 07:57:41 +0000 Subject: zephyr: shim: add all missing include/ prefixes Add all the missing include/ prefixes to the various #include around the zephyr tests so that they build with LEGACY_INCLUDE_PATH=n. BRANCH=none BUG=none TEST=zmake testall Cq-Depend: chromium:3807663 Change-Id: I81cea4f291eea61e674ef2fa61bdc60407c5f142 Signed-off-by: Fabio Baltieri Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3810411 Reviewed-by: Keith Short --- zephyr/app/ec/chip/riscv/riscv-ite/it8xxx2-espi.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'zephyr/app') diff --git a/zephyr/app/ec/chip/riscv/riscv-ite/it8xxx2-espi.c b/zephyr/app/ec/chip/riscv/riscv-ite/it8xxx2-espi.c index 81d96c4328..88fd96c9d2 100644 --- a/zephyr/app/ec/chip/riscv/riscv-ite/it8xxx2-espi.c +++ b/zephyr/app/ec/chip/riscv/riscv-ite/it8xxx2-espi.c @@ -5,8 +5,8 @@ #include #include #include -#include -#include +#include +#include LOG_MODULE_REGISTER(ec_chip_it8xxx2_espi, CONFIG_ESPI_LOG_LEVEL); -- cgit v1.2.1 From 38f6076bafcbe25ea8f0fee0d3df0212d0fc480b Mon Sep 17 00:00:00 2001 From: Aaron Massey Date: Thu, 8 Sep 2022 13:09:39 -0600 Subject: zephyr: Replace deprecated zephyr.h with kernel.h The zephyr.h header has been formally deprecated upstream thus causing a build failure when downstreaming. Replace zephyr.h with kernel.h BRANCH=none BUG=none TEST=zmake build -a Signed-off-by: Aaron Massey Change-Id: I0e6095160ab7248edde00f5c8336bc8d01c6b937 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3885035 Reviewed-by: Keith Short Reviewed-by: Al Semjonovs Code-Coverage: Zoss --- zephyr/app/ec/ec_app_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'zephyr/app') diff --git a/zephyr/app/ec/ec_app_main.c b/zephyr/app/ec/ec_app_main.c index 414ed65e9c..2e25d9aaca 100644 --- a/zephyr/app/ec/ec_app_main.c +++ b/zephyr/app/ec/ec_app_main.c @@ -6,7 +6,7 @@ #include #include #include -#include +#include #include "ap_power/ap_pwrseq.h" #include "button.h" -- cgit v1.2.1 From 758c32cb93264f371a945efe5a2d036851202af5 Mon Sep 17 00:00:00 2001 From: Aaron Massey Date: Fri, 9 Sep 2022 10:47:24 -0600 Subject: zephyr: Remove duplicate kernel.h include The zephyr.h include was replaced with kernel.h in many locations to quickly unblock downstreaming. However, some of these files included both zephyr.h and kernel.h, and now have a duplicate include of kernel.h. Remove duplicate includes of kernel.h BRANCH=none BUG=none TEST=zmake build -a TEST=twister -T zephyr/test -b Signed-off-by: Aaron Massey Change-Id: I20874243f92d368d4da0fa6b84c0f76025408953 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3887958 Reviewed-by: Al Semjonovs Code-Coverage: Zoss --- zephyr/app/ec/ec_app_main.c | 1 - 1 file changed, 1 deletion(-) (limited to 'zephyr/app') diff --git a/zephyr/app/ec/ec_app_main.c b/zephyr/app/ec/ec_app_main.c index 2e25d9aaca..3d2c42d34f 100644 --- a/zephyr/app/ec/ec_app_main.c +++ b/zephyr/app/ec/ec_app_main.c @@ -6,7 +6,6 @@ #include #include #include -#include #include "ap_power/ap_pwrseq.h" #include "button.h" -- cgit v1.2.1 From 71b2ef709dcb14260f5fdaa3ab4ced005a29fb46 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Mon, 12 Sep 2022 14:54:36 -0400 Subject: Update license boilerplate text in source code files Normally we don't do this, but enough changes have accumulated that we're doing a tree-wide one-off update of the name & style. BRANCH=none BUG=chromium:1098010 TEST=`repo upload` works Change-Id: Icd3a1723c20595356af83d190b2c6a9078b3013b Signed-off-by: Mike Frysinger Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3891203 Reviewed-by: Jeremy Bettis Reviewed-by: Jack Rosenthal --- zephyr/app/CMakeLists.txt | 2 +- zephyr/app/Kconfig | 2 +- zephyr/app/ec/CMakeLists.txt | 2 +- zephyr/app/ec/Kconfig | 2 +- zephyr/app/ec/chip/arm/microchip_xec/Kconfig.xec | 2 +- zephyr/app/ec/chip/arm/microchip_xec/Kconfig.xec_mec172x | 2 +- zephyr/app/ec/chip/arm/nuvoton_npcx/Kconfig.npcx | 2 +- zephyr/app/ec/chip/arm/nuvoton_npcx/Kconfig.npcx7 | 2 +- zephyr/app/ec/chip/arm/nuvoton_npcx/Kconfig.npcx9 | 2 +- zephyr/app/ec/chip/riscv/riscv-ite/Kconfig.it8xxx2 | 2 +- zephyr/app/ec/chip/riscv/riscv-ite/it8xxx2-espi.c | 2 +- zephyr/app/ec/ec_app_main.c | 2 +- zephyr/app/ec/include/ec_app_main.h | 2 +- zephyr/app/ec/main_shim.c | 2 +- zephyr/app/ec/soc/Kconfig | 2 +- 15 files changed, 15 insertions(+), 15 deletions(-) (limited to 'zephyr/app') diff --git a/zephyr/app/CMakeLists.txt b/zephyr/app/CMakeLists.txt index dfc45f19f9..0365782963 100644 --- a/zephyr/app/CMakeLists.txt +++ b/zephyr/app/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright 2020 The Chromium OS Authors. All rights reserved. +# Copyright 2020 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. diff --git a/zephyr/app/Kconfig b/zephyr/app/Kconfig index 3cac46afa7..7fb8c917ed 100644 --- a/zephyr/app/Kconfig +++ b/zephyr/app/Kconfig @@ -1,4 +1,4 @@ -# Copyright 2020 The Chromium OS Authors. All rights reserved. +# Copyright 2020 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. diff --git a/zephyr/app/ec/CMakeLists.txt b/zephyr/app/ec/CMakeLists.txt index 6ddac15080..ac3d3fe3d2 100644 --- a/zephyr/app/ec/CMakeLists.txt +++ b/zephyr/app/ec/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright 2020 The Chromium OS Authors. All rights reserved. +# Copyright 2020 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. diff --git a/zephyr/app/ec/Kconfig b/zephyr/app/ec/Kconfig index ebdeebfdf2..ddaab418c2 100644 --- a/zephyr/app/ec/Kconfig +++ b/zephyr/app/ec/Kconfig @@ -1,4 +1,4 @@ -# Copyright 2020 The Chromium OS Authors. All rights reserved. +# Copyright 2020 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. diff --git a/zephyr/app/ec/chip/arm/microchip_xec/Kconfig.xec b/zephyr/app/ec/chip/arm/microchip_xec/Kconfig.xec index 6a78792733..3baca08d04 100644 --- a/zephyr/app/ec/chip/arm/microchip_xec/Kconfig.xec +++ b/zephyr/app/ec/chip/arm/microchip_xec/Kconfig.xec @@ -1,4 +1,4 @@ -# Copyright 2022 The Chromium OS Authors. All rights reserved. +# Copyright 2022 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. diff --git a/zephyr/app/ec/chip/arm/microchip_xec/Kconfig.xec_mec172x b/zephyr/app/ec/chip/arm/microchip_xec/Kconfig.xec_mec172x index 9e37b6a534..bfcfeb8235 100644 --- a/zephyr/app/ec/chip/arm/microchip_xec/Kconfig.xec_mec172x +++ b/zephyr/app/ec/chip/arm/microchip_xec/Kconfig.xec_mec172x @@ -1,4 +1,4 @@ -# Copyright 2022 The Chromium OS Authors. All rights reserved. +# Copyright 2022 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. diff --git a/zephyr/app/ec/chip/arm/nuvoton_npcx/Kconfig.npcx b/zephyr/app/ec/chip/arm/nuvoton_npcx/Kconfig.npcx index 2e3d3c95a0..17936ab05d 100644 --- a/zephyr/app/ec/chip/arm/nuvoton_npcx/Kconfig.npcx +++ b/zephyr/app/ec/chip/arm/nuvoton_npcx/Kconfig.npcx @@ -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. diff --git a/zephyr/app/ec/chip/arm/nuvoton_npcx/Kconfig.npcx7 b/zephyr/app/ec/chip/arm/nuvoton_npcx/Kconfig.npcx7 index 37561f4dad..cb00db3345 100644 --- a/zephyr/app/ec/chip/arm/nuvoton_npcx/Kconfig.npcx7 +++ b/zephyr/app/ec/chip/arm/nuvoton_npcx/Kconfig.npcx7 @@ -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. diff --git a/zephyr/app/ec/chip/arm/nuvoton_npcx/Kconfig.npcx9 b/zephyr/app/ec/chip/arm/nuvoton_npcx/Kconfig.npcx9 index aceec4f3ca..9c807a732c 100644 --- a/zephyr/app/ec/chip/arm/nuvoton_npcx/Kconfig.npcx9 +++ b/zephyr/app/ec/chip/arm/nuvoton_npcx/Kconfig.npcx9 @@ -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. diff --git a/zephyr/app/ec/chip/riscv/riscv-ite/Kconfig.it8xxx2 b/zephyr/app/ec/chip/riscv/riscv-ite/Kconfig.it8xxx2 index 809b9a6401..e0ea15c5b7 100644 --- a/zephyr/app/ec/chip/riscv/riscv-ite/Kconfig.it8xxx2 +++ b/zephyr/app/ec/chip/riscv/riscv-ite/Kconfig.it8xxx2 @@ -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. diff --git a/zephyr/app/ec/chip/riscv/riscv-ite/it8xxx2-espi.c b/zephyr/app/ec/chip/riscv/riscv-ite/it8xxx2-espi.c index 88fd96c9d2..6109964cb9 100644 --- a/zephyr/app/ec/chip/riscv/riscv-ite/it8xxx2-espi.c +++ b/zephyr/app/ec/chip/riscv/riscv-ite/it8xxx2-espi.c @@ -1,4 +1,4 @@ -/* Copyright 2022 The ChromiumOS Authors. +/* Copyright 2022 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/zephyr/app/ec/ec_app_main.c b/zephyr/app/ec/ec_app_main.c index 3d2c42d34f..9b13c8ab86 100644 --- a/zephyr/app/ec/ec_app_main.c +++ b/zephyr/app/ec/ec_app_main.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/zephyr/app/ec/include/ec_app_main.h b/zephyr/app/ec/include/ec_app_main.h index a5043be84a..472e0b5c0e 100644 --- a/zephyr/app/ec/include/ec_app_main.h +++ b/zephyr/app/ec/include/ec_app_main.h @@ -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. */ diff --git a/zephyr/app/ec/main_shim.c b/zephyr/app/ec/main_shim.c index 7e54c83295..a14cff2dcb 100644 --- a/zephyr/app/ec/main_shim.c +++ b/zephyr/app/ec/main_shim.c @@ -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. */ diff --git a/zephyr/app/ec/soc/Kconfig b/zephyr/app/ec/soc/Kconfig index 9d3c851a36..3dccfa3a2a 100644 --- a/zephyr/app/ec/soc/Kconfig +++ b/zephyr/app/ec/soc/Kconfig @@ -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. -- cgit v1.2.1 From e9950b7805212adef77964fc989ca68f95d9863d Mon Sep 17 00:00:00 2001 From: Diana Z Date: Fri, 16 Sep 2022 12:02:06 -0600 Subject: Zephyr: Set default eSPI log level to error The eSPI shim can be quite chatty, so default it to the error level on all boards. BRANCH=None BUG=None TEST=CQ+1 pass, boot on skyrim and observe no "KB put" info prints Signed-off-by: Diana Z Change-Id: Iaf9c3805a2f657e525f09cf591563395c6358c87 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3902030 Reviewed-by: Keith Short Commit-Queue: Keith Short --- zephyr/app/ec/Kconfig | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'zephyr/app') diff --git a/zephyr/app/ec/Kconfig b/zephyr/app/ec/Kconfig index ddaab418c2..fbf6185740 100644 --- a/zephyr/app/ec/Kconfig +++ b/zephyr/app/ec/Kconfig @@ -34,6 +34,11 @@ config NUM_PREEMPT_PRIORITIES config SYSTEM_WORKQUEUE_PRIORITY default 24 +# eSPI is chatty, so default to Error only +choice ESPI_LOG_LEVEL_CHOICE + default ESPI_LOG_LEVEL_ERR +endchoice + config LTO bool "Link Time Optimization (LTO)" default y if !SOC_POSIX -- cgit v1.2.1