Merge remote-tracking branch cros/main into factory-brya-14517.B-main

Generated by: util/update_release_branch.py --baseboard brya --relevant_paths_file
baseboard/brya/relevant-paths.txt factory-brya-14517.B-main

Relevant changes:

git log --oneline 54462f034b..aa40b859b3 -- baseboard/brya board/agah
board/anahera board/banshee board/brya board/crota board/felwinter
board/gimble board/kano board/mithrax board/osiris board/primus
board/redrix board/taeko board/taniks board/vell board/volmar
driver/bc12/pi3usb9201_public.* driver/charger/bq25710.*
driver/ppc/nx20p348x.* driver/ppc/syv682x_public.*
driver/retimer/bb_retimer_public.* driver/tcpm/nct38xx.*
driver/tcpm/ps8xxx_public.* driver/tcpm/tcpci.* include/power/alderlake*
include/intel_x86.h power/alderlake* power/intel_x86.c
util/getversion.sh

e6da633c38 driver: Sort header files
234a87ae2d tcpci: Add FRS enable to driver structure
a56be59ccd tcpm_header: add test for tcpm_dump_registers
57b3256963 Rename CONFIG_CHARGER_INPUT_CURRENT to _CHARGER_DEFAULT_CURRENT_LIMIT
e420c8ff9a marasov: Modify TypeC and TypeA configuration.
43b53e0045 Add default implementation of board_set_charge_limit
b75dc90677 Add CONFIG_CHARGER_MIN_INPUT_CURRENT_LIMIT
f1b563c350 baseboard: Sort header files
7d01b1e58d driver/retimer/ps8818.h: Add I2C ADDR FLAGS 0x30, 0x58, 0x70
ec31407993 Add CONFIG_CHARGER_INPUT_CURRENT_DERATE_PCT
8f89f69a5b crota: disable lid angle sensor for clamshell

BRANCH=None
BUG=b:259002141 b:255184961 b:247100970 b:259354679 b:260630630
BUG=b:163093572 b:254328661
TEST=`emerge-brya chromeos-ec`

Force-Relevant-Builds: all
Change-Id: Ia85a701fbf6b8e67ec214b9e25e0e55e980a6f47
Signed-off-by: YH Lin <yueherngl@google.com>

1 files changed, 88 insertions, 0 deletions

diff --git a/zephyr/program/corsola/CMakeLists.txt b/zephyr/program/corsola/CMakeLists.txt
new file mode 100644
index 0000000000..33aa0804d2
--- /dev/null
+++ b/zephyr/program/corsola/CMakeLists.txt
@@ -0,0 +1,88 @@
+# 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.
+
+cmake_minimum_required(VERSION 3.13.1)
+
+find_package(Zephyr REQUIRED HINTS "${ZEPHYR_BASE}")
+
+cros_ec_library_include_directories(include)
+
+# Include selected EC source from the baseboard
+zephyr_library_sources(
+	"src/board.c"
+	"src/board_chipset.c"
+	"src/hibernate.c"
+)
+
+zephyr_library_sources_ifdef(CONFIG_PLATFORM_EC_USBC "src/usbc_config.c")
+zephyr_library_sources_ifdef(CONFIG_PLATFORM_EC_USBC "src/usb_pd_policy.c")
+zephyr_library_sources_ifdef(CONFIG_VARIANT_CORSOLA_DB_DETECTION
+			     "src/variant_db_detection.c")
+
+if(DEFINED CONFIG_BOARD_KRABBY)
+	project(krabby)
+	zephyr_library_sources("src/krabby/hooks.c"
+			       "src/krabby/charger_workaround.c"
+			       "src/krabby/ppc_krabby.c")
+	zephyr_library_sources_ifdef(CONFIG_PLATFORM_EC_I2C "src/krabby/i2c.c")
+	zephyr_library_sources_ifdef(CONFIG_PLATFORM_EC_USBC
+				     "src/krabby/usb_pd_policy.c")
+	zephyr_library_sources_ifdef(CONFIG_PLATFORM_EC_USBC
+				     "src/krabby/usbc_config.c")
+elseif(DEFINED CONFIG_BOARD_KINGLER)
+	project(kingler)
+	zephyr_library_sources_ifdef(CONFIG_PLATFORM_EC_I2C "src/kingler/i2c.c")
+	zephyr_library_sources_ifdef(CONFIG_PLATFORM_EC_LED_COMMON
+				     "src/kingler/led.c")
+	zephyr_library_sources_ifdef(CONFIG_PLATFORM_EC_USBC
+				     "src/kingler/usb_pd_policy.c")
+	zephyr_library_sources_ifdef(CONFIG_PLATFORM_EC_USBC
+				     "src/kingler/usbc_config.c")
+	zephyr_library_sources_ifdef(CONFIG_PLATFORM_EC_BUTTONS_RUNTIME_CONFIG
+				     "src/kingler/button.c")
+elseif(DEFINED CONFIG_BOARD_STEELIX)
+	project(steelix)
+	zephyr_library_sources("src/kingler/board_steelix.c")
+	zephyr_library_sources_ifdef(CONFIG_PLATFORM_EC_I2C "src/kingler/i2c.c")
+	zephyr_library_sources_ifdef(CONFIG_PLATFORM_EC_LED_COMMON
+				     "src/kingler/led_steelix.c")
+	zephyr_library_sources_ifdef(CONFIG_PLATFORM_EC_USBC
+				     "src/kingler/usb_pd_policy.c")
+	zephyr_library_sources_ifdef(CONFIG_PLATFORM_EC_USBC
+				     "src/kingler/usbc_config.c")
+
+elseif(DEFINED CONFIG_BOARD_TENTACRUEL)
+	project(tentacruel)
+	zephyr_library_sources("src/krabby/hooks.c"
+				"src/krabby/charger_workaround.c"
+				"src/krabby/sensor_tentacruel.c"
+				"src/krabby/temp_tentacruel.c"
+				"src/krabby/ppc_tentacruel.c")
+	zephyr_library_sources_ifdef(CONFIG_PLATFORM_EC_I2C "src/krabby/i2c.c")
+	zephyr_library_sources_ifdef(CONFIG_PLATFORM_EC_USBC
+				"src/krabby/usb_pd_policy.c")
+	zephyr_library_sources_ifdef(CONFIG_PLATFORM_EC_USBC
+				"src/krabby/usbc_config.c")
+
+elseif(DEFINED CONFIG_BOARD_MAGIKARP)
+	project(magikarp)
+	zephyr_library_sources("src/krabby/hooks.c"
+				"src/krabby/sensor_magikarp.c"
+				"src/krabby/ppc_magikarp.c"
+				"src/krabby/keyboard_magikarp.c")
+	zephyr_library_sources_ifdef(CONFIG_PLATFORM_EC_I2C "src/krabby/i2c.c")
+	zephyr_library_sources_ifdef(CONFIG_PLATFORM_EC_USBC
+				     "src/krabby/usb_pd_policy.c")
+	zephyr_library_sources_ifdef(CONFIG_PLATFORM_EC_USBC
+				     "src/krabby/usbc_config.c")
+
+elseif(DEFINED CONFIG_BOARD_VOLTORB)
+	project(voltorb)
+	zephyr_library_sources_ifdef(CONFIG_PLATFORM_EC_I2C "src/kingler/i2c.c")
+	zephyr_library_sources_ifdef(CONFIG_PLATFORM_EC_USBC
+				     "src/kingler/usb_pd_policy.c")
+	zephyr_library_sources_ifdef(CONFIG_PLATFORM_EC_USBC
+				     "src/kingler/usbc_config.c")
+
+endif()