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, 71 insertions, 0 deletions

diff --git a/zephyr/program/nissa/BUILD.py b/zephyr/program/nissa/BUILD.py
new file mode 100644
index 0000000000..fa5c77baf9
--- /dev/null
+++ b/zephyr/program/nissa/BUILD.py
@@ -0,0 +1,71 @@
+# 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.
+
+"""Define zmake projects for nissa."""
+
+# Nivviks and Craask, Pujjo, Xivu, Xivur has NPCX993F, Nereid and Joxer, Yaviks has ITE81302
+
+
+def register_nissa_project(
+    project_name,
+    chip="it81302bx",
+):
+    """Register a variant of nissa."""
+    register_func = register_binman_project
+    if chip.startswith("npcx"):
+        register_func = register_npcx_project
+
+    chip_kconfig = {"it81302bx": "it8xxx2", "npcx9m3f": "npcx"}[chip]
+
+    return register_func(
+        project_name=project_name,
+        zephyr_board=chip,
+        dts_overlays=[here / project_name / "project.overlay"],
+        kconfig_files=[
+            here / "program.conf",
+            here / f"{chip_kconfig}_program.conf",
+            here / project_name / "project.conf",
+        ],
+    )
+
+
+nivviks = register_nissa_project(
+    project_name="nivviks",
+    chip="npcx9m3f",
+)
+
+nereid = register_nissa_project(
+    project_name="nereid",
+    chip="it81302bx",
+)
+
+craask = register_nissa_project(
+    project_name="craask",
+    chip="npcx9m3f",
+)
+
+pujjo = register_nissa_project(
+    project_name="pujjo",
+    chip="npcx9m3f",
+)
+
+xivu = register_nissa_project(
+    project_name="xivu",
+    chip="npcx9m3f",
+)
+
+xivur = register_nissa_project(
+    project_name="xivur",
+    chip="npcx9m3f",
+)
+
+joxer = register_nissa_project(
+    project_name="joxer",
+    chip="it81302bx",
+)
+
+yaviks = register_nissa_project(
+    project_name="yaviks",
+    chip="it81302bx",
+)