Merge remote-tracking branch cros/main into firmware-corsola-15194.B-main

Generated by: util/update_release_branch.py -r -z --board corsla --relevant_paths_file
util/corsola-relevant-paths.txt firmware-corsola-15194.B-main

Relevant changes:

git log --oneline 012bda0c99..44842a951c -- zephyr/program/corsla
common/charge_state_v2.c common/dps.c common/mkbp_* common/usb_charger.c
common/usb_common.c common/usbc/*_pd_* common/usbc/dp_alt_mode.c
common/usbc/usb_pe_drp_sm.c common/usbc/usb_prl_sm.c
common/usbc/usb_sm.c common/usbc/usb_tc_drp_acc_trysrc_sm.c
driver/battery/smart.c driver/bc12/pi3usb9201.* driver/charger/isl923x.*
driver/charger/rt949* driver/ppc/nx20p348x.* driver/ppc/rt1718s.*
driver/ppc/syv682x.* driver/tcpm/anx7447.* driver/tcpm/rt1718s.*
driver/tcpm/tcpci.* driver/usb_mux/it5205.* driver/usb_mux/ps8743.*
power/mt8186.c zephyr/boards/arm/npcx9/* zephyr/boards/riscv/it8xxx2/*
zephyr/drivers/* zephyr/program/corsola/* zephyr/shim/*
util/getversion.sh

ad568190dd USB-PD: Support Vconn swap during EPR entry for Sink
a421b3380f Zephyr: Add NX20P3481 CONFIG
53f35199ba Zephyr test: Test NXP PPC interrupts
eea95bc3d1 mt8186,mt8188: check the holder of AP_RST_ODL
171aa03229 zmake: Track project inheritance in ProjectConfig
67d4a05823 NX20P348X: Correct dead battery exit error handling
5056315df0 mt8186,mt8188: fix chipset_force_shutdown before power_chipset_init
76c0324c1b zephyr/tcpc_emul: automatically include prerequisites
2921b0afa3 zephyr: Don't include autoconf.h
fafe10a6fe ppc/nx20p348x: Do not set reserved bit
a514bea1d0 battery: Remove dead sbs_passthrough host cmds
d32a389718 Charger: CONFIG gate bypass mode
a4eb1414fd zephyr: tcpc: implement i2c transactions in rt1718s emulator
d8c8d452f7 zephyr: tcpc: add rt1718s as basic tcpc emulator

BRANCH=None
BUG=b:257320026 b:273854897 b:276229973 b:276468569 b:276947804
BUG=b:273722902 b:272518464 b:271118112 b:276458241
TEST=`make -j buildall`

Cq-Depend: chromium:4410221
Force-Relevant-Builds: all
Change-Id: I87dfb3549a3f228c1d4067965561a351999aa2c8
Signed-off-by: Eric Yilun Lin <yllin@chromium.org>

1 files changed, 19 insertions, 1 deletions

diff --git a/zephyr/zmake/zmake/project.py b/zephyr/zmake/zmake/project.py
index 3c18520b55..2c91e27ba7 100644
--- a/zephyr/zmake/zmake/project.py
+++ b/zephyr/zmake/zmake/project.py
@@ -52,6 +52,20 @@ class ProjectConfig:
         default_factory=list
     )
     project_dir: pathlib.Path = dataclasses.field(default_factory=pathlib.Path)
+    inherited_from: typing.Iterable[str] = dataclasses.field(
+        default_factory=list
+    )
+
+    @property
+    def full_name(self) -> str:
+        """Get the full project name, e.g. baseboard.variant"""
+        inherited_from = (
+            [self.inherited_from]
+            if isinstance(self.inherited_from, str)
+            else self.inherited_from
+        )
+
+        return ".".join([*inherited_from, self.project_name])
 
 
 class Project:
@@ -198,12 +212,16 @@ class ProjectRegistrationHandler:
             Another ProjectRegistrationHandler.
         """
         new_config = dataclasses.asdict(self.base_config)
+        new_config["inherited_from"] = [
+            *self.base_config.inherited_from,
+            self.base_config.project_name,
+        ]
+
         for key, value in kwargs.items():
             if isinstance(value, list):
                 new_config[key] = [*new_config[key], *value]
             else:
                 new_config[key] = value
-
         return self.register_func(**new_config)