[nrf noup] ci: enable custom brase for manifest-PR

.github/workflows/manifest-PR.yml

@@ -3,7 +3,7 @@ on:
   pull_request_target:
     types: [opened, synchronize, closed]
     branches:
-      - main
+      - ncs-v3.1-branch
 
 
 jobs:
@@ -15,3 +15,4 @@ jobs:
         with:
           token: ${{ secrets.NCS_GITHUB_TOKEN }}
           manifest-pr-title-details: ${{ github.event.pull_request.title }}
+          base-branch: v3.1-branch

cmake/mcuboot.cmake

@@ -152,6 +152,13 @@ function(zephyr_mcuboot_tasks)
     set(imgtool_args --align ${write_block_size} ${imgtool_args})
   endif()
 
+  # Set proper hash calculation algorithm for signing
+  if(CONFIG_MCUBOOT_BOOTLOADER_SIGNATURE_TYPE_PURE)
+    set(imgtool_args --pure ${imgtool_args})
+  elseif(CONFIG_MCUBOOT_BOOTLOADER_USES_SHA512)
+    set(imgtool_args --sha 512 ${imgtool_args})
+  endif()
+
   # Extensionless prefix of any output file.
   set(output ${ZEPHYR_BINARY_DIR}/${KERNEL_NAME})
 

doc/_extensions/zephyr/kconfig/__init__.py

@@ -70,19 +70,24 @@
 ZEPHYR_BASE = Path(__file__).parents[4]
 
 
-def kconfig_load(app: Sphinx) -> tuple[kconfiglib.Kconfig, dict[str, str]]:
+def kconfig_load(app: Sphinx) -> tuple[kconfiglib.Kconfig, kconfiglib.Kconfig, dict[str, str]]:
     """Load Kconfig"""
     with TemporaryDirectory() as td:
         modules = zephyr_module.parse_modules(ZEPHYR_BASE)
 
         # generate Kconfig.modules file
         kconfig = ""
+        sysbuild_kconfig = ""
         for module in modules:
             kconfig += zephyr_module.process_kconfig(module.project, module.meta)
+            sysbuild_kconfig += zephyr_module.process_sysbuildkconfig(module.project, module.meta)
 
         with open(Path(td) / "Kconfig.modules", "w") as f:
             f.write(kconfig)
 
+        with open(Path(td) / "Kconfig.sysbuild.modules", "w") as f:
+            f.write(sysbuild_kconfig)
+
         # generate dummy Kconfig.dts file
         kconfig = ""
 
@@ -145,6 +150,13 @@ def kconfig_load(app: Sphinx) -> tuple[kconfiglib.Kconfig, dict[str, str]]:
         os.environ["BOARD"] = "boards"
         os.environ["KCONFIG_BOARD_DIR"] = str(Path(td) / "boards")
 
+        # Sysbuild runs first
+        os.environ["CONFIG_"] = "SB_CONFIG_"
+        sysbuild_output = kconfiglib.Kconfig(ZEPHYR_BASE / "share" / "sysbuild" / "Kconfig")
+
+        # Normal Kconfig runs second
+        os.environ["CONFIG_"] = "CONFIG_"
+
         # insert external Kconfigs to the environment
         module_paths = dict()
         for module in modules:
@@ -172,7 +184,7 @@ def kconfig_load(app: Sphinx) -> tuple[kconfiglib.Kconfig, dict[str, str]]:
                     if kconfig.exists():
                         os.environ[f"ZEPHYR_{name_var}_KCONFIG"] = str(kconfig)
 
-        return kconfiglib.Kconfig(ZEPHYR_BASE / "Kconfig"), module_paths
+        return kconfiglib.Kconfig(ZEPHYR_BASE / "Kconfig"), sysbuild_output, module_paths
 
 
 class KconfigSearchNode(nodes.Element):
@@ -332,13 +344,15 @@ def add_option(self, option):
 
 
 def sc_fmt(sc):
+    prefix = os.environ["CONFIG_"]
+
     if isinstance(sc, kconfiglib.Symbol):
         if sc.nodes:
-            return f'<a href="#CONFIG_{sc.name}">CONFIG_{sc.name}</a>'
+            return f'<a href="#{prefix}{sc.name}">{prefix}{sc.name}</a>'
     elif isinstance(sc, kconfiglib.Choice):
         if not sc.name:
             return "&ltchoice&gt"
-        return f'&ltchoice <a href="#CONFIG_{sc.name}">CONFIG_{sc.name}</a>&gt'
+        return f'&ltchoice <a href="#{prefix}{sc.name}">{prefix}{sc.name}</a>&gt'
 
     return kconfiglib.standard_sc_expr_str(sc)
 
@@ -350,137 +364,139 @@ def kconfig_build_resources(app: Sphinx) -> None:
         return
 
     with progress_message("Building Kconfig database..."):
-        kconfig, module_paths = kconfig_load(app)
+        kconfig, sysbuild_kconfig, module_paths = kconfig_load(app)
         db = list()
 
-        for sc in sorted(
-            chain(kconfig.unique_defined_syms, kconfig.unique_choices),
-            key=lambda sc: sc.name if sc.name else "",
-        ):
-            # skip nameless symbols
-            if not sc.name:
-                continue
-
-            # store alternative defaults (from defconfig files)
-            alt_defaults = list()
-            for node in sc.nodes:
-                if "defconfig" not in node.filename:
+        for kconfig_obj in [kconfig, sysbuild_kconfig]:
+            os.environ["CONFIG_"] = kconfig_obj.config_prefix
+            for sc in sorted(
+                chain(kconfig_obj.unique_defined_syms, kconfig_obj.unique_choices),
+                key=lambda sc: sc.name if sc.name else "",
+            ):
+                # skip nameless symbols
+                if not sc.name:
                     continue
 
-                for value, cond in node.orig_defaults:
-                    fmt = kconfiglib.expr_str(value, sc_fmt)
-                    if cond is not sc.kconfig.y:
-                        fmt += f" if {kconfiglib.expr_str(cond, sc_fmt)}"
-                    alt_defaults.append([fmt, node.filename])
-
-            # build list of symbols that select/imply the current one
-            # note: all reverse dependencies are ORed together, and conditionals
-            # (e.g. select/imply A if B) turns into A && B. So we first split
-            # by OR to include all entries, and we split each one by AND to just
-            # take the first entry.
-            selected_by = list()
-            if isinstance(sc, kconfiglib.Symbol) and sc.rev_dep != sc.kconfig.n:
-                for select in kconfiglib.split_expr(sc.rev_dep, kconfiglib.OR):
-                    sym = kconfiglib.split_expr(select, kconfiglib.AND)[0]
-                    selected_by.append(f"CONFIG_{sym.name}")
-
-            implied_by = list()
-            if isinstance(sc, kconfiglib.Symbol) and sc.weak_rev_dep != sc.kconfig.n:
-                for select in kconfiglib.split_expr(sc.weak_rev_dep, kconfiglib.OR):
-                    sym = kconfiglib.split_expr(select, kconfiglib.AND)[0]
-                    implied_by.append(f"CONFIG_{sym.name}")
-
-            # only process nodes with prompt or help
-            nodes = [node for node in sc.nodes if node.prompt or node.help]
-
-            inserted_paths = list()
-            for node in nodes:
-                # avoid duplicate symbols by forcing unique paths. this can
-                # happen due to dependencies on 0, a trick used by some modules
-                path = f"{node.filename}:{node.linenr}"
-                if path in inserted_paths:
-                    continue
-                inserted_paths.append(path)
-
-                dependencies = None
-                if node.dep is not sc.kconfig.y:
-                    dependencies = kconfiglib.expr_str(node.dep, sc_fmt)
-
-                defaults = list()
-                for value, cond in node.orig_defaults:
-                    fmt = kconfiglib.expr_str(value, sc_fmt)
-                    if cond is not sc.kconfig.y:
-                        fmt += f" if {kconfiglib.expr_str(cond, sc_fmt)}"
-                    defaults.append(fmt)
-
-                selects = list()
-                for value, cond in node.orig_selects:
-                    fmt = kconfiglib.expr_str(value, sc_fmt)
-                    if cond is not sc.kconfig.y:
-                        fmt += f" if {kconfiglib.expr_str(cond, sc_fmt)}"
-                    selects.append(fmt)
-
-                implies = list()
-                for value, cond in node.orig_implies:
-                    fmt = kconfiglib.expr_str(value, sc_fmt)
-                    if cond is not sc.kconfig.y:
-                        fmt += f" if {kconfiglib.expr_str(cond, sc_fmt)}"
-                    implies.append(fmt)
-
-                ranges = list()
-                for min, max, cond in node.orig_ranges:
-                    fmt = (
-                        f"[{kconfiglib.expr_str(min, sc_fmt)}, "
-                        f"{kconfiglib.expr_str(max, sc_fmt)}]"
+                # store alternative defaults (from defconfig files)
+                alt_defaults = list()
+                for node in sc.nodes:
+                    if "defconfig" not in str(node.filename):
+                        continue
+
+                    for value, cond in node.orig_defaults:
+                        fmt = kconfiglib.expr_str(value, sc_fmt)
+                        if cond is not sc.kconfig.y:
+                            fmt += f" if {kconfiglib.expr_str(cond, sc_fmt)}"
+                        alt_defaults.append([fmt, node.filename])
+
+                # build list of symbols that select/imply the current one
+                # note: all reverse dependencies are ORed together, and conditionals
+                # (e.g. select/imply A if B) turns into A && B. So we first split
+                # by OR to include all entries, and we split each one by AND to just
+                # take the first entry.
+                selected_by = list()
+                if isinstance(sc, kconfiglib.Symbol) and sc.rev_dep != sc.kconfig.n:
+                    for select in kconfiglib.split_expr(sc.rev_dep, kconfiglib.OR):
+                        sym = kconfiglib.split_expr(select, kconfiglib.AND)[0]
+                        selected_by.append(f"{kconfig_obj.config_prefix}{sym.name}")
+
+                implied_by = list()
+                if isinstance(sc, kconfiglib.Symbol) and sc.weak_rev_dep != sc.kconfig.n:
+                    for select in kconfiglib.split_expr(sc.weak_rev_dep, kconfiglib.OR):
+                        sym = kconfiglib.split_expr(select, kconfiglib.AND)[0]
+                        implied_by.append(f"{kconfig_obj.config_prefix}{sym.name}")
+
+                # only process nodes with prompt or help
+                nodes = [node for node in sc.nodes if node.prompt or node.help]
+
+                inserted_paths = list()
+                for node in nodes:
+                    # avoid duplicate symbols by forcing unique paths. this can
+                    # happen due to dependencies on 0, a trick used by some modules
+                    path = f"{node.filename}:{node.linenr}"
+                    if path in inserted_paths:
+                        continue
+                    inserted_paths.append(path)
+
+                    dependencies = None
+                    if node.dep is not sc.kconfig.y:
+                        dependencies = kconfiglib.expr_str(node.dep, sc_fmt)
+
+                    defaults = list()
+                    for value, cond in node.orig_defaults:
+                        fmt = kconfiglib.expr_str(value, sc_fmt)
+                        if cond is not sc.kconfig.y:
+                            fmt += f" if {kconfiglib.expr_str(cond, sc_fmt)}"
+                        defaults.append(fmt)
+
+                    selects = list()
+                    for value, cond in node.orig_selects:
+                        fmt = kconfiglib.expr_str(value, sc_fmt)
+                        if cond is not sc.kconfig.y:
+                            fmt += f" if {kconfiglib.expr_str(cond, sc_fmt)}"
+                        selects.append(fmt)
+
+                    implies = list()
+                    for value, cond in node.orig_implies:
+                        fmt = kconfiglib.expr_str(value, sc_fmt)
+                        if cond is not sc.kconfig.y:
+                            fmt += f" if {kconfiglib.expr_str(cond, sc_fmt)}"
+                        implies.append(fmt)
+
+                    ranges = list()
+                    for min, max, cond in node.orig_ranges:
+                        fmt = (
+                            f"[{kconfiglib.expr_str(min, sc_fmt)}, "
+                            f"{kconfiglib.expr_str(max, sc_fmt)}]"
+                        )
+                        if cond is not sc.kconfig.y:
+                            fmt += f" if {kconfiglib.expr_str(cond, sc_fmt)}"
+                        ranges.append(fmt)
+
+                    choices = list()
+                    if isinstance(sc, kconfiglib.Choice):
+                        for sym in sc.syms:
+                            choices.append(kconfiglib.expr_str(sym, sc_fmt))
+
+                    menupath = ""
+                    iternode = node
+                    while iternode.parent is not iternode.kconfig.top_node:
+                        iternode = iternode.parent
+                        if iternode.prompt:
+                            title = iternode.prompt[0]
+                        else:
+                            title = kconfiglib.standard_sc_expr_str(iternode.item)
+                        menupath = f" > {title}" + menupath
+
+                    menupath = "(Top)" + menupath
+
+                    filename = str(node.filename)
+                    for name, path in module_paths.items():
+                        path += "/"
+                        if str(node.filename).startswith(path):
+                            filename = str(node.filename).replace(path, f"<module:{name}>/")
+                            break
+
+                    db.append(
+                        {
+                            "name": f"{kconfig_obj.config_prefix}{sc.name}",
+                            "prompt": node.prompt[0] if node.prompt else None,
+                            "type": kconfiglib.TYPE_TO_STR[sc.type],
+                            "help": node.help,
+                            "dependencies": dependencies,
+                            "defaults": defaults,
+                            "alt_defaults": alt_defaults,
+                            "selects": selects,
+                            "selected_by": selected_by,
+                            "implies": implies,
+                            "implied_by": implied_by,
+                            "ranges": ranges,
+                            "choices": choices,
+                            "filename": filename,
+                            "linenr": node.linenr,
+                            "menupath": menupath,
+                        }
                     )
-                    if cond is not sc.kconfig.y:
-                        fmt += f" if {kconfiglib.expr_str(cond, sc_fmt)}"
-                    ranges.append(fmt)
-
-                choices = list()
-                if isinstance(sc, kconfiglib.Choice):
-                    for sym in sc.syms:
-                        choices.append(kconfiglib.expr_str(sym, sc_fmt))
-
-                menupath = ""
-                iternode = node
-                while iternode.parent is not iternode.kconfig.top_node:
-                    iternode = iternode.parent
-                    if iternode.prompt:
-                        title = iternode.prompt[0]
-                    else:
-                        title = kconfiglib.standard_sc_expr_str(iternode.item)
-                    menupath = f" > {title}" + menupath
-
-                menupath = "(Top)" + menupath
-
-                filename = node.filename
-                for name, path in module_paths.items():
-                    path += "/"
-                    if node.filename.startswith(path):
-                        filename = node.filename.replace(path, f"<module:{name}>/")
-                        break
-
-                db.append(
-                    {
-                        "name": f"CONFIG_{sc.name}",
-                        "prompt": node.prompt[0] if node.prompt else None,
-                        "type": kconfiglib.TYPE_TO_STR[sc.type],
-                        "help": node.help,
-                        "dependencies": dependencies,
-                        "defaults": defaults,
-                        "alt_defaults": alt_defaults,
-                        "selects": selects,
-                        "selected_by": selected_by,
-                        "implies": implies,
-                        "implied_by": implied_by,
-                        "ranges": ranges,
-                        "choices": choices,
-                        "filename": filename,
-                        "linenr": node.linenr,
-                        "menupath": menupath,
-                    }
-                )
 
         app.env.kconfig_db = db  # type: ignore
 

doc/connectivity/networking/api/coap_server.rst

@@ -243,7 +243,7 @@ following example simply prints when an event occurs.
     #define COAP_EVENTS_SET (NET_EVENT_COAP_OBSERVER_ADDED | NET_EVENT_COAP_OBSERVER_REMOVED | \
                              NET_EVENT_COAP_SERVICE_STARTED | NET_EVENT_COAP_SERVICE_STOPPED)
 
-    void coap_event_handler(uint32_t mgmt_event, struct net_if *iface,
+    void coap_event_handler(uint64_t mgmt_event, struct net_if *iface,
                             void *info, size_t info_length, void *user_data)
     {
         switch (mgmt_event) {

doc/connectivity/networking/api/net_mgmt.rst

@@ -97,7 +97,7 @@ An example follows.
 	struct net_mgmt_event_callback ipv4_callback;
 
 	void callback_handler(struct net_mgmt_event_callback *cb,
-			      uint32_t mgmt_event,
+			      uint64_t mgmt_event,
 			      struct net_if *iface)
 	{
 		if (mgmt_event == NET_EVENT_IF_xxx) {
@@ -139,7 +139,7 @@ Or similarly using :c:macro:`NET_MGMT_REGISTER_EVENT_HANDLER`.
 	#define EVENT_IFACE_SET (NET_EVENT_IF_xxx | NET_EVENT_IF_yyy)
 	#define EVENT_IPV4_SET (NET_EVENT_IPV4_xxx | NET_EVENT_IPV4_yyy)
 
-	static void event_handler(uint32_t mgmt_event, struct net_if *iface,
+	static void event_handler(uint64_t mgmt_event, struct net_if *iface,
 				  void *info, size_t info_length,
 				  void *user_data)
 	{
@@ -183,7 +183,7 @@ You define your handler modeled with this signature:
 
 .. code-block:: c
 
-   static int your_handler(uint32_t mgmt_event, struct net_if *iface,
+   static int your_handler(uint64_t mgmt_event, struct net_if *iface,
                            void *data, size_t len);
 
 and then register it with an associated mgmt_request code: