ci: manifest: do not persist git credentials

With this setting enabled, Git credentials are not kept after checkout.
Credentials are not necessary after the checkout step, since we do not
do any further manual push/pull operations.

Signed-off-by: Gerard Marull-Paretas <gerard.marull@nordicsemi.no>

.buildkite/daily.yml

@@ -0,0 +1,32 @@
+steps:
+  - command:
+    - .buildkite/run.sh
+    env:
+      ZEPHYR_TOOLCHAIN_VARIANT: "zephyr"
+      ZEPHYR_SDK_INSTALL_DIR: "/opt/sdk/zephyr-sdk-0.12.2"
+    parallelism: 400
+    timeout_in_minutes: 210
+    retry:
+      manual: true
+    plugins:
+      - docker#v3.5.0:
+          image: "zephyrprojectrtos/ci:v0.11.13"
+          propagate-environment: true
+          volumes:
+            - "/var/lib/buildkite-agent/git-mirrors:/var/lib/buildkite-agent/git-mirrors"
+            - "/var/lib/buildkite-agent/zephyr-module-cache:/var/lib/buildkite-agent/zephyr-module-cache"
+            - "/var/lib/buildkite-agent/zephyr-ccache:/root/.ccache"
+          workdir: "/workdir/zephyr"
+    agents:
+    - "queue=default"
+
+  - wait: ~
+    continue_on_failure: true
+
+  - plugins:
+      - junit-annotate#v1.7.0:
+          artifacts: twister-*.xml
+
+notify:
+  - email: "builds+int+399+7809482394022958124@lists.zephyrproject.org"
+    if: build.state != "passed"

.buildkite/hooks/post-command

@@ -0,0 +1,8 @@
+#!/bin/bash
+# Copyright (c) 2020 Linaro Limited
+#
+# SPDX-License-Identifier: Apache-2.0
+
+# report disk usage:
+echo "--- $0 disk usage"
+df -h

.buildkite/hooks/pre-command

@@ -0,0 +1,44 @@
+#!/bin/bash
+# Copyright (c) 2020 Linaro Limited
+#
+# SPDX-License-Identifier: Apache-2.0
+
+# Save off where we started so we can go back there
+WORKDIR=${PWD}
+
+echo "--- $0 disk usage"
+df -h
+du -hs /var/lib/buildkite-agent/*
+docker images -a
+docker system df -v
+
+if [ -n "${BUILDKITE_PULL_REQUEST_BASE_BRANCH}" ]; then
+   git fetch -v origin ${BUILDKITE_PULL_REQUEST_BASE_BRANCH}
+   git checkout FETCH_HEAD
+   git config --local user.email "builds@zephyrproject.org"
+   git config --local user.name "Zephyr CI"
+   git merge --no-edit "${BUILDKITE_COMMIT}" || {
+       local merge_result=$?
+       echo "Merge failed: ${merge_result}"
+       git merge --abort
+       exit $merge_result
+   }
+fi
+
+mkdir -p /var/lib/buildkite-agent/zephyr-ccache/
+
+# create cache dirs, no-op if they already exist
+mkdir -p /var/lib/buildkite-agent/zephyr-module-cache/modules
+mkdir -p /var/lib/buildkite-agent/zephyr-module-cache/tools
+mkdir -p /var/lib/buildkite-agent/zephyr-module-cache/bootloader
+
+# Clean cache - if it already exists
+cd /var/lib/buildkite-agent/zephyr-module-cache
+find -type f -not -path "*/.git/*" -not -name ".git" -delete
+
+# Remove any stale locks
+find -name index.lock -delete
+
+# return from where we started so we can find pipeline files from
+# git repo
+cd ${WORKDIR}

.buildkite/pipeline.yml

@@ -0,0 +1,28 @@
+steps:
+  - command:
+    - .buildkite/run.sh
+    env:
+      ZEPHYR_TOOLCHAIN_VARIANT: "zephyr"
+      ZEPHYR_SDK_INSTALL_DIR: "/opt/sdk/zephyr-sdk-0.12.2"
+    parallelism: 20
+    timeout_in_minutes: 180
+    retry:
+      manual: true
+    plugins:
+      - docker#v3.5.0:
+          image: "zephyrprojectrtos/ci:v0.11.13"
+          propagate-environment: true
+          volumes:
+            - "/var/lib/buildkite-agent/git-mirrors:/var/lib/buildkite-agent/git-mirrors"
+            - "/var/lib/buildkite-agent/zephyr-module-cache:/var/lib/buildkite-agent/zephyr-module-cache"
+            - "/var/lib/buildkite-agent/zephyr-ccache:/root/.ccache"
+          workdir: "/workdir/zephyr"
+    agents:
+    - "queue=default"
+
+  - wait: ~
+    continue_on_failure: true
+
+  - plugins:
+      - junit-annotate#v1.7.0:
+          artifacts: twister-*.xml

.buildkite/run.sh

@@ -0,0 +1,75 @@
+#!/bin/bash
+# Copyright (c) 2020 Linaro Limited
+#
+# SPDX-License-Identifier: Apache-2.0
+set -eE
+
+function cleanup()
+{
+	# Rename twister junit xml for use with junit-annotate-buildkite-plugin
+	# create dummy file if twister did nothing
+	if [ ! -f twister-out/twister.xml ]; then
+	   touch twister-out/twister.xml
+	fi
+	mv twister-out/twister.xml twister-${BUILDKITE_JOB_ID}.xml
+	buildkite-agent artifact upload twister-${BUILDKITE_JOB_ID}.xml
+
+
+	# Upload test_file to get list of tests that are build/run
+	if [ -f test_file.txt ]; then
+		buildkite-agent artifact upload test_file.txt
+	fi
+
+	# ccache stats
+	echo "--- ccache stats at finish"
+	ccache -s
+
+	# disk usage
+	echo "--- disk usage at finish"
+	df -h
+}
+
+trap cleanup ERR
+
+echo "--- run $0"
+
+git log -n 5 --oneline --decorate --abbrev=12
+
+# Setup module cache
+cd /workdir
+ln -s /var/lib/buildkite-agent/zephyr-module-cache/modules
+ln -s /var/lib/buildkite-agent/zephyr-module-cache/tools
+ln -s /var/lib/buildkite-agent/zephyr-module-cache/bootloader
+cd /workdir/zephyr
+
+export JOB_NUM=$((${BUILDKITE_PARALLEL_JOB}+1))
+
+# ccache stats
+echo ""
+echo "--- ccache stats at start"
+ccache -s
+
+
+if [ -n "${DAILY_BUILD}" ]; then
+   TWISTER_OPTIONS=" --inline-logs -N --build-only --all --retry-failed 3 -v "
+   echo "--- DAILY BUILD"
+   west init -l .
+   west update 1> west.update.log || west update 1> west.update-2.log
+   west forall -c 'git reset --hard HEAD'
+   source zephyr-env.sh
+   ./scripts/twister --subset ${JOB_NUM}/${BUILDKITE_PARALLEL_JOB_COUNT} ${TWISTER_OPTIONS}
+else
+   if [ -n "${BUILDKITE_PULL_REQUEST_BASE_BRANCH}" ]; then
+      ./scripts/ci/run_ci.sh  -c -b ${BUILDKITE_PULL_REQUEST_BASE_BRANCH} -r origin \
+	   -m ${JOB_NUM} -M ${BUILDKITE_PARALLEL_JOB_COUNT} -p ${BUILDKITE_PULL_REQUEST}
+   else
+       ./scripts/ci/run_ci.sh -c -b ${BUILDKITE_BRANCH} -r origin \
+	   -m ${JOB_NUM} -M ${BUILDKITE_PARALLEL_JOB_COUNT};
+   fi
+fi
+
+TWISTER_EXIT_STATUS=$?
+
+cleanup
+
+exit ${TWISTER_EXIT_STATUS}

.checkpatch.conf

@@ -27,6 +27,4 @@
 --ignore TRAILING_SEMICOLON
 --ignore COMPLEX_MACRO
 --ignore MULTISTATEMENT_MACRO_USE_DO_WHILE
---ignore ENOSYS
---ignore IS_ENABLED_CONFIG
---ignore EXPORT_SYMBOL
+--exclude ext

.clang-format

@@ -1,45 +1,76 @@
-# SPDX-License-Identifier: Apache-2.0
+# SPDX-License-Identifier: GPL-2.0
 #
-# Note: The list of ForEachMacros can be obtained using:
+# clang-format configuration file. Intended for clang-format >= 4.
 #
-#    git grep -h '^#define [^[:space:]]*FOR_EACH[^[:space:]]*(' include/ \
-#    | sed "s,^#define \([^[:space:]]*FOR_EACH[^[:space:]]*\)(.*$,  - '\1'," \
-#    | sort | uniq
+# For more information, see:
+#
+#   Documentation/process/clang-format.rst
+#   https://clang.llvm.org/docs/ClangFormat.html
+#   https://clang.llvm.org/docs/ClangFormatStyleOptions.html
 #
-# References:
-#   - https://clang.llvm.org/docs/ClangFormatStyleOptions.html
-
 ---
-BasedOnStyle: LLVM
-AlignConsecutiveMacros: AcrossComments
-AllowShortBlocksOnASingleLine: Never
+AccessModifierOffset: -4
+AlignAfterOpenBracket: Align
+AlignConsecutiveAssignments: false
+AlignConsecutiveDeclarations: false
+#AlignEscapedNewlines: Left # Unknown to clang-format-4.0
+AlignOperands: true
+AlignTrailingComments: false
+AllowAllParametersOfDeclarationOnNextLine: false
+AllowShortBlocksOnASingleLine: false
 AllowShortCaseLabelsOnASingleLine: false
-AllowShortEnumsOnASingleLine: false
 AllowShortFunctionsOnASingleLine: None
 AllowShortIfStatementsOnASingleLine: false
 AllowShortLoopsOnASingleLine: false
-AttributeMacros:
-  - __aligned
-  - __deprecated
-  - __packed
-  - __printf_like
-  - __syscall
-  - __syscall_always_inline
-  - __subsystem
-BitFieldColonSpacing: After
-BreakBeforeBraces: Linux
-ColumnLimit: 100
+AlwaysBreakAfterDefinitionReturnType: None
+AlwaysBreakAfterReturnType: None
+AlwaysBreakBeforeMultilineStrings: false
+AlwaysBreakTemplateDeclarations: false
+BinPackArguments: true
+BinPackParameters: true
+BraceWrapping:
+  AfterClass: false
+  AfterControlStatement: false
+  AfterEnum: false
+  AfterFunction: true
+  AfterNamespace: true
+  AfterObjCDeclaration: false
+  AfterStruct: false
+  AfterUnion: false
+  #AfterExternBlock: false # Unknown to clang-format-5.0
+  BeforeCatch: false
+  BeforeElse: false
+  IndentBraces: false
+  #SplitEmptyFunction: true # Unknown to clang-format-4.0
+  #SplitEmptyRecord: true # Unknown to clang-format-4.0
+  #SplitEmptyNamespace: true # Unknown to clang-format-4.0
+BreakBeforeBinaryOperators: None
+BreakBeforeBraces: Custom
+#BreakBeforeInheritanceComma: false # Unknown to clang-format-4.0
+BreakBeforeTernaryOperators: false
+BreakConstructorInitializersBeforeComma: false
+#BreakConstructorInitializers: BeforeComma # Unknown to clang-format-4.0
+BreakAfterJavaFieldAnnotations: false
+BreakStringLiterals: false
+ColumnLimit: 80
+CommentPragmas: '^ IWYU pragma:'
+#CompactNamespaces: false # Unknown to clang-format-4.0
+ConstructorInitializerAllOnOneLineOrOnePerLine: false
 ConstructorInitializerIndentWidth: 8
 ContinuationIndentWidth: 8
+Cpp11BracedListStyle: false
+DerivePointerAlignment: false
+DisableFormat: false
+ExperimentalAutoDetectBinPacking: false
+#FixNamespaceComments: false # Unknown to clang-format-4.0
+
+# Taken from:
+#   git grep -h '^#define [^[:space:]]*FOR_EACH[^[:space:]]*(' include/ \
+#   | sed "s,^#define \([^[:space:]]*FOR_EACH[^[:space:]]*\)(.*$,  - '\1'," \
+#   | sort | uniq
 ForEachMacros:
-  - 'ARRAY_FOR_EACH'
-  - 'ARRAY_FOR_EACH_PTR'
   - 'FOR_EACH'
   - 'FOR_EACH_FIXED_ARG'
-  - 'FOR_EACH_IDX'
-  - 'FOR_EACH_IDX_FIXED_ARG'
-  - 'FOR_EACH_NONEMPTY_TERM'
-  - 'FOR_EACH_FIXED_ARG_NONEMPTY_TERM'
   - 'RB_FOR_EACH'
   - 'RB_FOR_EACH_CONTAINER'
   - 'SYS_DLIST_FOR_EACH_CONTAINER'
@@ -54,52 +85,61 @@ ForEachMacros:
   - 'SYS_SLIST_FOR_EACH_CONTAINER_SAFE'
   - 'SYS_SLIST_FOR_EACH_NODE'
   - 'SYS_SLIST_FOR_EACH_NODE_SAFE'
-  - '_WAIT_Q_FOR_EACH'
-  - 'Z_FOR_EACH'
-  - 'Z_FOR_EACH_ENGINE'
-  - 'Z_FOR_EACH_EXEC'
-  - 'Z_FOR_EACH_FIXED_ARG'
-  - 'Z_FOR_EACH_FIXED_ARG_EXEC'
-  - 'Z_FOR_EACH_IDX'
-  - 'Z_FOR_EACH_IDX_EXEC'
-  - 'Z_FOR_EACH_IDX_FIXED_ARG'
-  - 'Z_FOR_EACH_IDX_FIXED_ARG_EXEC'
   - 'Z_GENLIST_FOR_EACH_CONTAINER'
   - 'Z_GENLIST_FOR_EACH_CONTAINER_SAFE'
   - 'Z_GENLIST_FOR_EACH_NODE'
   - 'Z_GENLIST_FOR_EACH_NODE_SAFE'
-  - 'STRUCT_SECTION_FOREACH'
-  - 'STRUCT_SECTION_FOREACH_ALTERNATE'
-  - 'TYPE_SECTION_FOREACH'
-  - 'K_SPINLOCK'
-  - 'COAP_RESOURCE_FOREACH'
-  - 'COAP_SERVICE_FOREACH'
-  - 'COAP_SERVICE_FOREACH_RESOURCE'
-  - 'HTTP_RESOURCE_FOREACH'
-  - 'HTTP_SERVER_CONTENT_TYPE_FOREACH'
-  - 'HTTP_SERVICE_FOREACH'
-  - 'HTTP_SERVICE_FOREACH_RESOURCE'
-IfMacros:
-  - 'CHECKIF'
-# Disabled for now, see bug https://github.com/zephyrproject-rtos/zephyr/issues/48520
-#IncludeBlocks: Regroup
+  - '_WAIT_Q_FOR_EACH'
+
+#IncludeBlocks: Preserve # Unknown to clang-format-5.0
 IncludeCategories:
-  - Regex: '^".*\.h"$'
-    Priority: 0
-  - Regex: '^<(assert|complex|ctype|errno|fenv|float|inttypes|limits|locale|math|setjmp|signal|stdarg|stdbool|stddef|stdint|stdio|stdlib|string|tgmath|time|wchar|wctype)\.h>$'
-    Priority: 1
-  - Regex: '^\<zephyr/.*\.h\>$'
-    Priority: 2
   - Regex: '.*'
-    Priority: 3
+    Priority: 1
+IncludeIsMainRegex: '(Test)?$'
 IndentCaseLabels: false
-IndentGotoLabels: false
+#IndentPPDirectives: None # Unknown to clang-format-5.0
 IndentWidth: 8
-InsertBraces: true
-SpaceBeforeInheritanceColon: False
-SpaceBeforeParens: ControlStatementsExceptControlMacros
-SortIncludes: Never
-UseTab: ForContinuationAndIndentation
-WhitespaceSensitiveMacros:
-  - STRINGIFY
-  - Z_STRINGIFY
+IndentWrappedFunctionNames: false
+JavaScriptQuotes: Leave
+JavaScriptWrapImports: true
+KeepEmptyLinesAtTheStartOfBlocks: false
+MacroBlockBegin: ''
+MacroBlockEnd: ''
+MaxEmptyLinesToKeep: 1
+NamespaceIndentation: Inner
+#ObjCBinPackProtocolList: Auto # Unknown to clang-format-5.0
+ObjCBlockIndentWidth: 8
+ObjCSpaceAfterProperty: true
+ObjCSpaceBeforeProtocolList: true
+
+# Taken from git's rules
+#PenaltyBreakAssignment: 10 # Unknown to clang-format-4.0
+PenaltyBreakBeforeFirstCallParameter: 30
+PenaltyBreakComment: 10
+PenaltyBreakFirstLessLess: 0
+PenaltyBreakString: 10
+PenaltyExcessCharacter: 100
+PenaltyReturnTypeOnItsOwnLine: 60
+
+PointerAlignment: Right
+ReflowComments: false
+SortIncludes: false
+#SortUsingDeclarations: false # Unknown to clang-format-4.0
+SpaceAfterCStyleCast: false
+SpaceAfterTemplateKeyword: true
+SpaceBeforeAssignmentOperators: true
+#SpaceBeforeCtorInitializerColon: true # Unknown to clang-format-5.0
+#SpaceBeforeInheritanceColon: true # Unknown to clang-format-5.0
+SpaceBeforeParens: ControlStatements
+#SpaceBeforeRangeBasedForLoopColon: true # Unknown to clang-format-5.0
+SpaceInEmptyParentheses: false
+SpacesBeforeTrailingComments: 1
+SpacesInAngles: false
+SpacesInContainerLiterals: false
+SpacesInCStyleCastParentheses: false
+SpacesInParentheses: false
+SpacesInSquareBrackets: false
+Standard: Cpp03
+TabWidth: 8
+UseTab: Always
+...

.codecov.yml

@@ -12,10 +12,10 @@ coverage:
     patch: yes
     changes: no
 
-# ignore:
-#   - "tests/**/*"
-#   - "samples/**/*"
-#   - "ext/hal/**/*"
+#ignore:
+#  - "tests/**/*"
+#  - "samples/**/*"
+#  - "ext/hal/**/*"
 
 parsers:
   gcov:

.editorconfig

@@ -9,7 +9,7 @@ charset = utf-8
 end_of_line = lf
 insert_final_newline = true
 trim_trailing_whitespace = true
-max_line_length = 100
+max_line_length = 80
 
 # Assembly
 [*.S]
@@ -21,16 +21,6 @@ indent_size = 8
 indent_style = tab
 indent_size = 8
 
-# C++
-[*.{cpp,hpp}]
-indent_style = tab
-indent_size = 8
-
-# Linker Script
-[*.ld]
-indent_style = tab
-indent_size = 8
-
 # Python
 [*.py]
 indent_style = space
@@ -41,11 +31,6 @@ indent_size = 4
 indent_style = tab
 indent_size = 8
 
-# reStructuredText
-[*.rst]
-indent_style = space
-indent_size = 3
-
 # YAML
 [*.{yml,yaml}]
 indent_style = space
@@ -75,7 +60,6 @@ indent_size = 2
 # Makefile
 [Makefile]
 indent_style = tab
-indent_size = 8
 
 # Device tree
 [*.{dts,dtsi,overlay}]
@@ -84,9 +68,8 @@ indent_size = 8
 
 # Git commit messages
 [COMMIT_EDITMSG]
-max_line_length = 75
+max_line_length = 72
 
 # Kconfig
 [Kconfig*]
-indent_style = tab
-indent_size = 8
+indent_style=tab

.gitattributes

@@ -4,10 +4,6 @@
 .gitignore export-ignore
 .mailmap export-ignore
 
-# Tell git to not diff certain files
-*.svg -diff
-
 # Tell linguist that generated test pattern files should not be included in the
 # language statistics.
-*.pat linguist-generated
-*.svg linguist-generated
+*.pat linguist-generated=true

.github/ISSUE_TEMPLATE/001_bug_report.md

@@ -1,71 +0,0 @@
----
-name: Bug report
-about: Create a report to help us improve Zephyr
-title: ''
-labels: bug
-assignees: ''
-
----
-<!--
-**Notes**
-Github Discussions (https://github.com/zephyrproject-rtos/zephyr/discussions)
-are available to first verify that the issue is a genuine Zephyr bug and not a
-consequence of Zephyr services misuse.
-
-This issue list is only for bugs in the main Zephyr code base
-(https://github.com/zephyrproject-rtos/zephyr/). If the bug is for a project
-fork (such as NCS) specific feature, please open an issue in the fork project
-instead.
--->
-
-**Describe the bug**
-<!--
-A clear and concise description of what the bug is.
-
-Please also mention any information which could help others to understand
-the problem you're facing:
- - What target platform are you using?
- - What have you tried to diagnose or workaround this issue?
- - Is this a regression? If yes, have you been able to "git bisect" it to a
-   specific commit?
- - ...
--->
-
-**To Reproduce**
-<!--
-Steps to reproduce the behavior:
-1. mkdir build; cd build
-2. cmake -DBOARD=board\_xyz
-3. make
-4. See error
--->
-
-**Expected behavior**
-<!--
-A clear and concise description of what you expected to happen.
--->
-
-**Impact**
-<!--
-What impact does this issue have on your progress (e.g., annoyance, showstopper)
--->
-
-**Logs and console output**
-<!--
-If applicable, add console logs or other types of debug information
-e.g Wireshark capture or Logic analyzer capture (upload in zip archive).
-copy-and-paste text and put a code fence (\`\`\`) before and after, to help
-explain the issue. (if unable to obtain text log, add a screenshot)
--->
-
-**Environment (please complete the following information):**
-
- - OS: (e.g. Linux, MacOS, Windows)
- - Toolchain (e.g Zephyr SDK, ...)
- - Commit SHA or Version used
-
-**Additional context**
-<!--
-Add any other context that could be relevant to your issue, such as pin setting,
-target configuration, ...
--->

.github/ISSUE_TEMPLATE/002_enhancement.md

@@ -1,28 +0,0 @@
----
-name: Enhancement
-about: Suggest enhancements to existing features
-title: ''
-labels: Enhancement
-assignees: ''
-
----
-
-**Is your enhancement proposal related to a problem? Please describe.**
-<!--
-A clear and concise description of what the problem is.
--->
-
-**Describe the solution you'd like**
-<!--
-A clear and concise description of what you want to happen.
--->
-
-**Describe alternatives you've considered**
-<!--
-A clear and concise description of any alternative solutions or features you've considered.
--->
-
-**Additional context**
-<!--
-Add any other context or graphics (drag-and-drop an image) about the feature request here.
--->

.github/ISSUE_TEMPLATE/003_rfc-proposal.md

@@ -1,60 +0,0 @@
----
-name: RFC / Proposal
-about: Submit an RFC / Proposal
-title: ''
-labels: RFC
-assignees: ''
-
----
-
-## Introduction
-
-<!--
-This section targets end users, TSC members, maintainers and anyone else that might
-need a quick explanation of your proposed change.
--->
-
-### Problem description
-<!--
-Why do we want this change and what problem are we trying to address?
--->
-
-### Proposed change
-<!--
-A brief summary of the proposed change - the 10,000 ft view on what it will
-change once this change is implemented.
--->
-
-## Detailed RFC
-<!--
-In this section of the document the target audience is the dev team. Upon
-reading this section each engineer should have a rather clear picture of what
-needs to be done in order to implement the described feature.
--->
-
-### Proposed change (Detailed)
-<!--
-This section is freeform - you should describe your change in as much detail
-as possible. Please also ensure to include any context or background info here.
-For example, do we have existing components which can be reused or altered.
-
-By reading this section, each team member should be able to know what exactly
-you're planning to change and how.
--->
-
-### Dependencies
-<!--
-Highlight how the change may affect the rest of the project (new components,
-modifications in other areas), or other teams/projects.
--->
-
-### Concerns and Unresolved Questions
-<!--
-List any concerns, unknowns, and generally unresolved questions etc.
--->
-
-## Alternatives
-<!--
-List any alternatives considered, and the reasons for choosing this option
-over them.
--->

.github/ISSUE_TEMPLATE/004_feature_request.md

@@ -1,28 +0,0 @@
----
-name: Feature request
-about: Suggest an idea for this project
-title: ''
-labels: Feature Request
-assignees: ''
-
----
-
-**Is your feature request related to a problem? Please describe.**
-<!--
-A clear and concise description of what the problem is.
--->
-
-**Describe the solution you'd like**
-<!--
-A clear and concise description of what you want to happen.
--->
-
-**Describe alternatives you've considered**
-<!--
-A clear and concise description of any alternative solutions or features you've considered.
--->
-
-**Additional context**
-<!--
-Add any other context or graphics (drag-and-drop an image) about the feature request here.
--->

.github/ISSUE_TEMPLATE/006_nomination.md

@@ -1,42 +0,0 @@
----
-name: Contributor Nomination
-about: Nominate a GitHub user for additional rights on the Zephyr Project
-title: ''
-labels: Role Nomination
-assignees: ''
-
----
-
-# Background
-
-The [TSC Project Roles] defines the main roles for the Zephyr Project, including
-Maintainer, Collaborator, and Contributor.
-
-By default anyone that contributes code or documentation is a Contributor, but
-with the lowest [GitHub Permission Level] of Read. For example, Contributors
-with Read permission do not have the permission to add reviewers to a pull
-request.
-
-Use this template to nominate a GitHub user for the Contributor role with
-Triage permission level, which allows the user to add reviewers to a pull
-request and be added as a reviewer by other users.
-
-# Nomination
-
-## GitHub User
-
-Provide the following information about the GitHub user:
-
-1. Full Name
-1. GitHub username
-1. Organization (optional)
-
-## Supporting Documents
-
-Add links to 3-5 GitHub pull requests, in the Zephyr project, authored or
-reviewed by the GitHub user that demonstrate the user's dedication to the
-Zephyr project.
-
-
-[TSC Project Roles]: <https://docs.zephyrproject.org/latest/project/project_roles.html>
-[GitHub Permission Level]: <https://docs.github.com/en/organizations/managing-access-to-your-organizations-repositories/repository-roles-for-an-organization>

.github/ISSUE_TEMPLATE/007_ext-source.md

@@ -1,68 +0,0 @@
----
-name: External Source Code
-about: Submit a proposal to integrate external source code
-title: ''
-labels: TSC
-assignees: ''
-
----
-
-## Origin
-
-Name of project hosting the original open source code
-Provide a link to the source
-
-## Purpose
-
-Brief description of what this software does
-
-## Mode of integration
-
-Describe whether you'd like to integrate this external component in the main tree
-or as a module, and why. If the mode of integration is a module, suggest a
-repository name for the module
-
-## Maintainership
-
-List the person(s) that will be maintaining the integration of this external code
-for the foreseeable future. Please use GitHub IDs to identify them. You can
-choose to identify a single maintainer only or add collaborators as well
-
-## Pull Request
-
-Pull request (if any) with the actual implementation of the integration, be it
-in the main tree or as a module (pointing to your own fork for now). Make sure
-the PR is correctly labeled as "DNM"
-
-## Description
-
-Long description that will help reviewers discuss suitability of the
-component to solve the problem at hand (there may be a better options
-available.)
-
-What is its primary functionality (e.g., SQLLite is a lightweight
-database)?
-
-What problem are you trying to solve? (e.g., a state store is
-required to maintain ...)
-
-Why is this the right component to solve it (e.g., SQLite is small,
-easy to use, and has a very liberal license.)
-
-## Dependencies
-
-What other components does this package depend on?
-
-Will the Zephyr project have a direct dependency on the component, or
-will it be included via an abstraction layer with this component as a
-replaceable implementation?
-
-## Revision
-
-Version or SHA you would like to integrate initially
-
-## License
-
-Please use an SPDX identifier (https://spdx.org/licenses/), such as
-``BSD-3-Clause``
-

.github/ISSUE_TEMPLATE/008_bin-blobs.md

@@ -1,41 +0,0 @@
----
-name: Binary blobs
-about: Submit a proposal to integrate binary blob(s)
-title: ''
-labels: TSC
-assignees: ''
-
----
-
-## Origin
-
-Describe where the binary blob(s) originate from
-
-## Type
-
-- [ ] Precompiled library
-- [ ] Firmware image
-
-## Module
-
-The Zephyr module that this blob(s) will be referenced from
-
-## Purpose
-
-Brief description of what the blob(s) do. It is especially important to describe
-the functionality that the blob(s) provide, to the largest extent possible
-
-## Pull Request
-
-Link to the Pull request with the actual implementation of the integration. If
-you are submitting this as part of a new module you may link to the same Pull
-Request that introduced the new module.
-
-## Dependencies
-
-What other components do the blob(s) depend on, if any?
-
-## License
-
-Document the license the blob(s) are distributed under
-

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,40 @@
+---
+name: Bug report
+about: Create a report to help us improve Zephyr
+title: ''
+labels: bug
+assignees: ''
+
+---
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+What have you tried to diagnose or workaround this issue?
+
+**To Reproduce**
+Steps to reproduce the behavior:
+1. mkdir build; cd build
+2. cmake -DBOARD=board\_xyz
+3. make
+4. See error
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Impact**
+What impact does this issue have on your progress (e.g., annoyance, showstopper)
+
+**Logs and console output**
+If applicable, add console logs or other types of debug information
+e.g Wireshark capture or Logic analyzer capture (upload in zip archive).
+copy-and-paste text and put a code fence (\`\`\`) before and after, to help
+explain the issue. (if unable to obtain text log, add a screenshot)
+
+**Environment (please complete the following information):**
+ - OS: (e.g. Linux, MacOS, Windows)
+ - Toolchain (e.g Zephyr SDK, ...)
+ - Commit SHA or Version used
+
+
+**Additional context**
+Add any other context about the problem here.

.github/ISSUE_TEMPLATE/enhancement.md

@@ -0,0 +1,20 @@
+---
+name: Enhancement
+about: Suggest enhancements to existing features
+title: ''
+labels: Enhancement
+assignees: ''
+
+---
+
+**Is your enhancement proposal related to a problem? Please describe.**
+A clear and concise description of what the problem is.
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or graphics (drag-and-drop an image) about the feature request here.

.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,20 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: ''
+labels: feature request
+assignees: ''
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is.
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or graphics (drag-and-drop an image) about the feature request here.

.github/ISSUE_TEMPLATE/hardware_support.md

@@ -0,0 +1,19 @@
+---
+name: Hardware Support
+about: Suggest adding hardware support
+title: ''
+labels: Hardware Support
+assignees: ''
+
+---
+
+**Is this request related to a missing driver support for a particular hardware platform, SoC or board? Please describe.**
+Describe in details the hardware support being requested and why this support benefits Zephyr.
+
+**Describe why you are asking for this support?**
+Describe why you are asking for this support instead of contributing it directly to the tree
+
+If this is a new board or SoC, please state whether you are willing to maintain the Zephyr support for it if it is included in the main tree
+
+**Additional context**
+Add any other context or graphics (drag-and-drop an image) about the hardware here.

.github/ISSUE_TEMPLATE/rfc-proposal.md

@@ -0,0 +1,51 @@
+---
+name: RFC / Proposal
+about: Submit an RFC / Proposal
+title: ''
+labels: RFC
+assignees: ''
+
+---
+
+## Introduction
+
+This section targets end users, TSC members, maintainers and anyone else that might
+need a quick explanation of your proposed change.
+
+### Problem description
+
+Why do we want this change and what problem are we trying to address?
+
+### Proposed change
+
+A brief summary of the proposed change - the 10,000 ft view on what it will
+change once this change is implemented.
+
+## Detailed RFC
+
+In this section of the document the target audience is the dev team. Upon
+reading this section each engineer should have a rather clear picture of what
+needs to be done in order to implement the described feature.
+
+### Proposed change (Detailed)
+
+This section is freeform - you should describe your change in as much detail
+as possible. Please also ensure to include any context or background info here.
+For example, do we have existing components which can be reused or altered.
+
+By reading this section, each team member should be able to know what exactly
+you're planning to change and how.
+
+### Dependencies
+
+Highlight how the change may affect the rest of the project (new components,
+modifications in other areas), or other teams/projects.
+
+### Concerns and Unresolved Questions
+
+List any concerns, unknowns, and generally unresolved questions etc.
+
+## Alternatives
+
+List any alternatives considered, and the reasons for choosing this option
+over them.

.github/SECURITY.md

@@ -1,22 +0,0 @@
-# Security Policy
-
-## Supported versions
-
-The Zephyr project supports the following versions with security
-updates:
-
-  - The most recent release, and the release prior to that.
-  - Active LTS releases.
-
-At this time, with the latest release of v3.6, the supported
-versions are:
-
-  - v3.7: Current LTS
-  - v3.6: Prior release
-  - v2.7: Prior LTS
-
-## Reporting process
-
-Please see our [Security Vulnerability
-Reporting](https://docs.zephyrproject.org/latest/security/reporting.html)
-page for details on the process.

.github/labeler.yml

@@ -0,0 +1,161 @@
+"Release Notes":
+  - "doc/releases/**/*"
+"area: Modem":
+  - "drivers/modem/**/*"
+"area: PWM":
+  - "drivers/pwm/**/*"
+"area: Watchdog":
+  - "drivers/watchdog/**/*"
+"area: Sensors":
+  - "drivers/sensors/**/*"
+"area: ADC":
+  - "drivers/adc/**/*"
+"area: Counter":
+  - "drivers/counter/**/*"
+"area: CAN":
+  - "include/drivers/can.h"
+  - "include/canbus/*/**"
+  - "drivers/can/**/*"
+  - "subsys/canbus/*/**"
+"area: EEPROM":
+  - "include/drivers/eeprom.h"
+  - "drivers/eeprom/**/*"
+"area: Timer":
+  - "drivers/timer/**/*"
+"area: I2S":
+  - "drivers/i2s/**/*"
+"area: C Library":
+  - "lib/libc/**/*"
+"area: Devicetree":
+  - "dts/**/*"
+  - "**/*.dts"
+  - "**/*.dtsi"
+  - "include/devicetree.h"
+  - "include/devicetree/*"
+  - "doc/guides/dts/**/*"
+"area: Devicetree Binding":
+  - "include/dt-bindings/**/*"
+  - "dts/bindings/**/*"
+"area: Devicetree Tooling":
+  - "scripts/dts/**/*"
+"area: I2C":
+  - "drivers/i2c/**/*"
+"area: SPI":
+  - "drivers/spi/**/*"
+"area: Boards":
+  - "boards/**/*"
+"area: POSIX":
+  - "lib/posix/**/*"
+"area: native port":
+  - "arch/posix/**/*"
+  - "include/arch/posix/**/*"
+  - "soc/posix/**/*"
+  - "**/*native_posix*"
+"area: X86":
+  - "arch/x86/**/*"
+  - "include/arch/x86/**/*"
+"area: ARM":
+  - "arch/arm/**/*"
+  - "include/arch/arm/**/*"
+"area: ARM_64":
+  - "arch/arm/core/aarch64/**/*"
+  - "include/arch/arm/aarch64/**/*"
+"area: NIOS2":
+  - "arch/nios2/**/*"
+  - "include/arch/nios2/**/*"
+"area: Xtensa":
+  - "arch/xtensa/**/*"
+  - "include/arch/xtensa/**/*"
+"area: RISCv32/64":
+  - "arch/risv/**/*"
+  - "include/arch/riscv/**/*"
+"area: ARC":
+  - "arch/arc/**/*"
+  - "include/arch/arc/**/*"
+"area: Networking":
+  - "subsys/net/**/*"
+  - "samples/net/**/*"
+  - "tests/net/**/*"
+  - "include/net/**/*"
+  - "include/drivers/ieee802154/**/*"
+  - "drivers/ethernet/**/*"
+  - "drivers/ieee802154/**/*"
+  - "drivers/wifi/**/*"
+  - "drivers/ptp_clock/**/*"
+  - "drivers/net/**/*"
+"area: Logging":
+  - "subsys/logging/**/*"
+"area: Shell":
+  - "subsys/shell/**/*"
+"area: Console":
+  - "subsys/console/**/*"
+"area: Test Framework":
+  - "subsys/testsuite/**/*"
+"area: Settings":
+  - "subsys/settings/**/*"
+"area: File System":
+  - "subsys/fs/**/*"
+"area: Storage":
+  - "subsys/storage/**/*"
+"area: Bluetooth":
+  - "subsys/bluetooth/**/*"
+  - "**/*bluetooth*"
+"area: Bluetooth Mesh":
+  - "subsys/bluetooth/mesh/**/*"
+"area: Bluetooth Controller":
+  - "subsys/bluetooth/controller/**/*"
+"area: Bluetooth Host":
+  - "subsys/bluetooth/host/**/*"
+  - "subsys/bluetooth/services/**/*"
+"area: API":
+  - "include/**/*"
+"area: Samples":
+  - "samples/**/*"
+"area: Tests":
+  - "tests/**/*"
+"area: Kernel":
+  - "kernel/**/*"
+  - "tests/kernel/**/*"
+"area: Documentation":
+  - "**/*.rst"
+  - "**/*.md"
+"area: Build System":
+  - "cmake/**/*"
+  - "CmakeLists.txt"
+"area: Kconfig":
+  - "scripts/kconfig/**/*"
+  - "Kconfig"
+  - "Kconfig.zephyr"
+"area: Twister":
+  - "scripts/twister"
+  - "scripts/pylib/twister/**/*"
+"area: Modules":
+  - "west.yml"
+  - "modules/**/*"
+"area: Shields":
+  - "boards/shields/**"
+  - "samples/shields/**"
+"platform: NXP":
+  - "boards/arm/frdm*/**"
+  - "boards/arm/hexiwear*/**"
+  - "boards/arm/lpcxpresso*/**"
+  - "boards/arm/*imx*/**"
+  - "drivers/**/*imx*"
+  - "drivers/**/*mcux*"
+  - "dts/arm/nxp/*/*"
+  - "dts/bindings/**/nxp*"
+  - "soc/arm/nxp*/**"
+"platform: STM32":
+  - "boards/arm/nucleo_*/**"
+  - "boards/arm/*stm32*/**"
+  - "drivers/**/*stm32*"
+  - "dts/arm/st/*/*"
+  - "include/drivers/*/*stm32*"
+  - "soc/arm/st_stm32/**"
+"platform: SiLabs":
+  - "boards/arm/efr32_*/**/*"
+  - "boards/arm/efm32_*/**/*"
+  - "drivers/**/*gecko*"
+  - "dts/arm/silabs/**/*"
+  - "dts/bindings/**/silabs,gecko*"
+  - "soc/arm/silabs_exx32/**/*"

.github/workflows/assigner.yml

@@ -1,52 +0,0 @@
-name: Pull Request Assigner
-
-on:
-  pull_request_target:
-    types:
-    - opened
-    - synchronize
-    - reopened
-    - ready_for_review
-    branches:
-    - main
-    - collab-*
-    - v*-branch
-  issues:
-    types:
-    - labeled
-
-jobs:
-  assignment:
-    name: Pull Request Assignment
-    if: github.event.pull_request.draft == false
-    runs-on: ubuntu-22.04
-
-    steps:
-    - name: Install Python dependencies
-      run: |
-        sudo pip3 install -U setuptools wheel pip
-        pip3 install -U PyGithub>=1.55 west
-
-    - name: Check out source code
-      uses: actions/checkout@v4
-
-    - name: Run assignment script
-      env:
-        GITHUB_TOKEN: ${{ secrets.ZB_GITHUB_TOKEN }}
-      run: |
-        FLAGS="-v"
-        FLAGS+=" -o ${{ github.event.repository.owner.login }}"
-        FLAGS+=" -r ${{ github.event.repository.name }}"
-        FLAGS+=" -M MAINTAINERS.yml"
-        if [ "${{ github.event_name }}" = "pull_request_target" ]; then
-            FLAGS+=" -P ${{ github.event.pull_request.number }}"
-        elif [ "${{ github.event_name }}" = "issues" ]; then
-            FLAGS+=" -I ${{ github.event.issue.number }}"
-        elif [ "${{ github.event_name }}" = "schedule" ]; then
-            FLAGS+=" --modules"
-        else
-          echo "Unknown event: ${{ github.event_name }}"
-          exit 1
-        fi
-
-        python3 scripts/set_assignees.py $FLAGS

.github/workflows/backport.yml

@@ -4,28 +4,13 @@ on:
     types:
       - closed
       - labeled
-    branches:
-      - main
 
 jobs:
   backport:
+    runs-on: ubuntu-18.04
     name: Backport
-    runs-on: ubuntu-22.04
-    # Only react to merged PRs for security reasons.
-    # See https://docs.github.com/en/actions/using-workflows/events-that-trigger-workflows#pull_request_target.
-    if: >
-      github.event.pull_request.merged &&
-      (
-        github.event.action == 'closed' ||
-        (
-          github.event.action == 'labeled' &&
-          contains(github.event.label.name, 'backport')
-        )
-      )
     steps:
       - name: Backport
-        uses: zephyrproject-rtos/action-backport@v2.0.3-3
+        uses: zephyrproject-rtos/action-backport@v1.1.99
         with:
-          github_token: ${{ secrets.ZB_GITHUB_TOKEN }}
-          issue_labels: Backport
-          labels_template: '["Backport"]'
+          github_token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/backport_issue_check.yml

@@ -1,31 +0,0 @@
-name: Backport Issue Check
-
-on:
-  pull_request_target:
-    branches:
-      - v*-branch
-
-jobs:
-  backport:
-    name: Backport Issue Check
-    runs-on: ubuntu-22.04
-    if: github.repository == 'zephyrproject-rtos/zephyr'
-
-    steps:
-      - name: Check out source code
-        uses: actions/checkout@v4
-
-      - name: Install Python dependencies
-        run: |
-          sudo pip3 install -U setuptools wheel pip
-          pip3 install -U pygithub
-
-      - name: Run backport issue checker
-        env:
-          GITHUB_TOKEN: ${{ secrets.ZB_GITHUB_TOKEN }}
-        run: |
-          ./scripts/release/list_backports.py \
-            -o ${{ github.event.repository.owner.login }} \
-            -r ${{ github.event.repository.name }} \
-            -b ${{ github.event.pull_request.base.ref }} \
-            -p ${{ github.event.pull_request.number }}

.github/workflows/bsim-tests-publish.yaml

@@ -1,28 +0,0 @@
-name: Publish BabbleSim Tests Results
-
-on:
-  workflow_run:
-    workflows: ["BabbleSim Tests"]
-    types:
-      - completed
-jobs:
-  bsim-test-results:
-    name: "Publish BabbleSim Test Results"
-    runs-on: ubuntu-22.04
-    if: github.event.workflow_run.conclusion != 'skipped'
-
-    steps:
-      - name: Download artifacts
-        uses: dawidd6/action-download-artifact@v3
-        with:
-          run_id: ${{ github.event.workflow_run.id }}
-
-      - name: Publish BabbleSim Test Results
-        uses: EnricoMi/publish-unit-test-result-action@v2
-        with:
-          check_name: BabbleSim Test Results
-          comment_mode: off
-          commit: ${{ github.event.workflow_run.head_sha }}
-          event_file: event/event.json
-          event_name: ${{ github.event.workflow_run.event }}
-          files: "bsim-test-results/**/bsim_results.xml"

.github/workflows/bsim-tests.yaml

@@ -1,191 +0,0 @@
-name: BabbleSim Tests
-
-on:
-  pull_request:
-    paths:
-      - ".github/workflows/bsim-tests.yaml"
-      - ".github/workflows/bsim-tests-publish.yaml"
-      - "west.yml"
-      - "subsys/bluetooth/**"
-      - "tests/bsim/**"
-      - "tests/bluetooth/common/testlib/**"
-      - "samples/bluetooth/**"
-      - "boards/posix/**"
-      - "soc/posix/**"
-      - "arch/posix/**"
-      - "include/zephyr/arch/posix/**"
-      - "scripts/native_simulator/**"
-      - "samples/net/sockets/echo_*/**"
-      - "modules/openthread/**"
-      - "subsys/net/l2/openthread/**"
-      - "include/zephyr/net/openthread.h"
-      - "drivers/ieee802154/**"
-      - "include/zephyr/net/ieee802154*"
-      - "drivers/serial/*nrfx*"
-      - "tests/drivers/uart/**"
-
-concurrency:
-  group: ${{ github.workflow }}-${{ github.event_name }}-${{ github.head_ref || github.ref }}
-  cancel-in-progress: true
-
-jobs:
-  bsim-test:
-    if: github.repository_owner == 'zephyrproject-rtos'
-    runs-on:
-      group: zephyr-runner-v2-linux-x64-4xlarge
-    container:
-      image: ghcr.io/zephyrproject-rtos/ci-repo-cache:v0.26.13.20240601
-      options: '--entrypoint /bin/bash'
-    env:
-      ZEPHYR_TOOLCHAIN_VARIANT: zephyr
-      BSIM_OUT_PATH: /opt/bsim/
-      BSIM_COMPONENTS_PATH: /opt/bsim/components
-      EDTT_PATH: ../tools/edtt
-    steps:
-      - name: Apply container owner mismatch workaround
-        run: |
-          # FIXME: The owner UID of the GITHUB_WORKSPACE directory may not
-          #        match the container user UID because of the way GitHub
-          #        Actions runner is implemented. Remove this workaround when
-          #        GitHub comes up with a fundamental fix for this problem.
-          git config --global --add safe.directory ${GITHUB_WORKSPACE}
-
-      - name: Print cloud service information
-        run: |
-          echo "ZEPHYR_RUNNER_CLOUD_PROVIDER = ${ZEPHYR_RUNNER_CLOUD_PROVIDER}"
-          echo "ZEPHYR_RUNNER_CLOUD_NODE = ${ZEPHYR_RUNNER_CLOUD_NODE}"
-          echo "ZEPHYR_RUNNER_CLOUD_POD = ${ZEPHYR_RUNNER_CLOUD_POD}"
-
-      - name: Clone cached Zephyr repository
-        continue-on-error: true
-        run: |
-          git clone --shared /repo-cache/zephyrproject/zephyr .
-          git remote set-url origin ${GITHUB_SERVER_URL}/${GITHUB_REPOSITORY}
-
-      - name: Checkout
-        uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-
-      - name: Environment Setup
-        env:
-          BASE_REF: ${{ github.base_ref }}
-        run: |
-          git config --global user.email "bot@zephyrproject.org"
-          git config --global user.name "Zephyr Bot"
-          rm -fr ".git/rebase-apply"
-          git rebase origin/${BASE_REF}
-          git log  --pretty=oneline | head -n 10
-          west init -l . || true
-          west config manifest.group-filter -- +ci
-          west config --global update.narrow true
-          west update --path-cache /repo-cache/zephyrproject 2>&1 1> west.update.log || west update --path-cache /repo-cache/zephyrproject 2>&1 1> west.update.log || ( rm -rf ../modules ../bootloader ../tools && west update --path-cache /repo-cache/zephyrproject)
-          west forall -c 'git reset --hard HEAD'
-
-          echo "ZEPHYR_SDK_INSTALL_DIR=/opt/toolchains/zephyr-sdk-$( cat SDK_VERSION )" >> $GITHUB_ENV
-
-      - name: Check common triggering files
-        uses: tj-actions/changed-files@v44
-        id: check-common-files
-        with:
-          files: |
-            .github/workflows/bsim-tests.yaml
-            .github/workflows/bsim-tests-publish.yaml
-            west.yml
-            boards/posix/
-            soc/posix/
-            arch/posix/
-            include/zephyr/arch/posix/
-            scripts/native_simulator/
-            tests/bsim/*
-
-      - name: Check if Bluethooth files changed
-        uses: tj-actions/changed-files@v44
-        id: check-bluetooth-files
-        with:
-          files: |
-            tests/bsim/bluetooth/
-            samples/bluetooth/
-            subsys/bluetooth/
-
-      - name: Check if Networking files changed
-        uses: tj-actions/changed-files@v44
-        id: check-networking-files
-        with:
-          files: |
-            tests/bsim/net/
-            samples/net/sockets/echo_*/
-            modules/openthread/
-            subsys/net/l2/openthread/
-            include/zephyr/net/openthread.h
-            drivers/ieee802154/
-            include/zephyr/net/ieee802154*
-
-      - name: Check if UART files changed
-        uses: tj-actions/changed-files@v44
-        id: check-uart-files
-        with:
-          files: |
-            tests/bsim/drivers/uart/
-            drivers/serial/*nrfx*
-            tests/drivers/uart/
-
-      - name: Update BabbleSim to manifest revision
-        if: >
-          steps.check-bluetooth-files.outputs.any_changed == 'true'
-          || steps.check-networking-files.outputs.any_changed == 'true'
-          || steps.check-uart-files.outputs.any_changed == 'true'
-          || steps.check-common-files.outputs.any_changed == 'true'
-        run: |
-          export BSIM_VERSION=$( west list bsim -f {revision} )
-          echo "Manifest points to bsim sha $BSIM_VERSION"
-          cd /opt/bsim_west/bsim
-          git fetch -n origin ${BSIM_VERSION}
-          git -c advice.detachedHead=false checkout ${BSIM_VERSION}
-          west update
-          make everything -s -j 8
-
-      - name: Run Bluetooth Tests with BSIM
-        if: steps.check-bluetooth-files.outputs.any_changed == 'true' || steps.check-common-files.outputs.any_changed == 'true'
-        run: |
-          tests/bsim/ci.bt.sh
-
-      - name: Run Networking Tests with BSIM
-        if: steps.check-networking-files.outputs.any_changed == 'true' || steps.check-common-files.outputs.any_changed == 'true'
-        run: |
-          tests/bsim/ci.net.sh
-
-      - name: Run UART Tests with BSIM
-        if: steps.check-uart-files.outputs.any_changed == 'true' || steps.check-common-files.outputs.any_changed == 'true'
-        run: |
-          tests/bsim/ci.uart.sh
-
-      - name: Merge Test Results
-        run: |
-          pip3 install junitparser junit2html
-          junitparser merge --glob "./bsim_*/*bsim_results.*.xml" "./twister-out/twister.xml" junit.xml
-          junit2html junit.xml junit.html
-
-      - name: Upload Unit Test Results in HTML
-        if: always()
-        uses: actions/upload-artifact@v4
-        with:
-          name: HTML Unit Test Results
-          if-no-files-found: ignore
-          path: |
-            junit.html
-
-      - name: Publish Unit Test Results
-        uses: EnricoMi/publish-unit-test-result-action@v2
-        with:
-          check_name: Bsim Test Results
-          files: "junit.xml"
-          comment_mode: off
-
-      - name: Upload Event Details
-        if: always()
-        uses: actions/upload-artifact@v4
-        with:
-          name: event
-          path: |
-            ${{ github.event_path }}

.github/workflows/bug_snapshot.yaml

@@ -1,67 +0,0 @@
-# Copyright (c) 2021, 2022 Nordic Semiconductor ASA
-# SPDX-License-Identifier: Apache-2.0
-
-# Make a snapshot of open bugs as a python pickle file, compressed
-# using xz. Upload the xz file to Amazon S3.
-
-name: Bug Snapshot
-
-on:
-  workflow_dispatch:
-    branches: [main]
-  schedule:
-  # Run daily at 14:05
-  - cron: '5 14 * * *'
-
-jobs:
-  make_bugs_pickle:
-    name: Make bugs pickle
-    runs-on: ubuntu-22.04
-    if: github.repository_owner == 'zephyrproject-rtos'
-
-    steps:
-    - name: Checkout
-      uses: actions/checkout@v4
-
-    - name: Install Python dependencies
-      run: |
-        sudo pip3 install -U setuptools wheel pip
-        pip3 install -U pygithub
-
-    - name: Snapshot bugs
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      run: |
-        BUGS_PICKLE_FILENAME="zephyr-bugs-$(date -I).pickle.xz"
-        BUGS_PICKLE_PATH="${RUNNER_TEMP}/${BUGS_PICKLE_FILENAME}"
-
-        set -euo pipefail
-        python3 scripts/make_bugs_pickle.py | xz > ${BUGS_PICKLE_PATH}
-
-        echo "BUGS_PICKLE_FILENAME=${BUGS_PICKLE_FILENAME}" >> ${GITHUB_ENV}
-        echo "BUGS_PICKLE_PATH=${BUGS_PICKLE_PATH}" >> ${GITHUB_ENV}
-
-    - name: Configure AWS Credentials
-      uses: aws-actions/configure-aws-credentials@v4
-      with:
-        aws-access-key-id: ${{ vars.AWS_BUILDS_ZEPHYR_BUG_SNAPSHOT_ACCESS_KEY_ID }}
-        aws-secret-access-key: ${{ secrets.AWS_BUILDS_ZEPHYR_BUG_SNAPSHOT_SECRET_ACCESS_KEY }}
-        aws-region: us-east-1
-
-    - name: Upload to AWS S3
-      run: |
-        REPOSITORY_NAME="${GITHUB_REPOSITORY#*/}"
-
-        PUBLISH_BUCKET="builds.zephyrproject.org"
-        PUBLISH_DOMAIN="builds.zephyrproject.io"
-        if [ "${{github.event_name}}" = "schedule" ]; then
-          PUBLISH_ROOT="${REPOSITORY_NAME}/bug-snapshot/daily"
-        else
-          PUBLISH_ROOT="${REPOSITORY_NAME}/bug-snapshot"
-        fi
-
-        PUBLISH_UPLOAD_URI="s3://${PUBLISH_BUCKET}/${PUBLISH_ROOT}/${BUGS_PICKLE_FILENAME}"
-        PUBLISH_DOWNLOAD_URI="https://${PUBLISH_DOMAIN}/${PUBLISH_ROOT}/${BUGS_PICKLE_FILENAME}"
-
-        aws s3 cp --quiet ${BUGS_PICKLE_PATH} ${PUBLISH_UPLOAD_URI}
-        echo "Bug pickle is available at: ${PUBLISH_DOWNLOAD_URI}" >> ${GITHUB_STEP_SUMMARY}

.github/workflows/clang.yaml

@@ -1,164 +0,0 @@
-name: Build with Clang/LLVM
-
-on: pull_request_target
-
-concurrency:
-  group: ${{ github.workflow }}-${{ github.event_name }}-${{ github.head_ref || github.ref }}
-  cancel-in-progress: true
-
-jobs:
-  clang-build:
-    if: github.repository_owner == 'zephyrproject-rtos'
-    runs-on:
-      group: zephyr-runner-v2-linux-x64-4xlarge
-    container:
-      image: ghcr.io/zephyrproject-rtos/ci-repo-cache:v0.26.13.20240601
-      options: '--entrypoint /bin/bash'
-    strategy:
-      fail-fast: false
-      matrix:
-        platform: ["native_sim"]
-    env:
-      CCACHE_DIR: /node-cache/ccache-zephyr
-      CCACHE_REMOTE_STORAGE: "redis://cache-*.keydb-cache.svc.cluster.local|shards=1,2,3"
-      CCACHE_REMOTE_ONLY: "true"
-      LLVM_TOOLCHAIN_PATH: /usr/lib/llvm-16
-      COMMIT_RANGE: ${{ github.event.pull_request.base.sha }}..${{ github.event.pull_request.head.sha }}
-      BASE_REF: ${{ github.base_ref }}
-    outputs:
-      report_needed: ${{ steps.twister.outputs.report_needed }}
-    steps:
-      - name: Apply container owner mismatch workaround
-        run: |
-          # FIXME: The owner UID of the GITHUB_WORKSPACE directory may not
-          #        match the container user UID because of the way GitHub
-          #        Actions runner is implemented. Remove this workaround when
-          #        GitHub comes up with a fundamental fix for this problem.
-          git config --global --add safe.directory ${GITHUB_WORKSPACE}
-
-      - name: Print cloud service information
-        run: |
-          echo "ZEPHYR_RUNNER_CLOUD_PROVIDER = ${ZEPHYR_RUNNER_CLOUD_PROVIDER}"
-          echo "ZEPHYR_RUNNER_CLOUD_NODE = ${ZEPHYR_RUNNER_CLOUD_NODE}"
-          echo "ZEPHYR_RUNNER_CLOUD_POD = ${ZEPHYR_RUNNER_CLOUD_POD}"
-
-      - name: Clone cached Zephyr repository
-        continue-on-error: true
-        run: |
-          git clone --shared /repo-cache/zephyrproject/zephyr .
-          git remote set-url origin ${GITHUB_SERVER_URL}/${GITHUB_REPOSITORY}
-
-      - name: Checkout
-        uses: actions/checkout@v4
-        with:
-          ref: ${{ github.event.pull_request.head.sha }}
-          fetch-depth: 0
-          persist-credentials: false
-
-      - name: Environment Setup
-        run: |
-          echo "$HOME/.local/bin" >> $GITHUB_PATH
-          git config --global user.email "bot@zephyrproject.org"
-          git config --global user.name "Zephyr Bot"
-          rm -fr ".git/rebase-apply"
-          git rebase origin/${BASE_REF}
-          git log  --pretty=oneline | head -n 10
-          west init -l . || true
-          west config --global update.narrow true
-          west config manifest.group-filter -- +ci,+optional
-          # In some cases modules are left in a state where they can't be
-          # updated (i.e. when we cancel a job and the builder is killed),
-          # So first retry to update, if that does not work, remove all modules
-          # and start over. (Workaround until we implement more robust module
-          # west caching).
-          west update --path-cache /repo-cache/zephyrproject 2>&1 1> west.log || west update --path-cache /repo-cache/zephyrproject 2>&1 1> west2.log || ( rm -rf ../modules ../bootloader ../tools && west update --path-cache /repo-cache/zephyrproject)
-
-          echo "ZEPHYR_SDK_INSTALL_DIR=/opt/toolchains/zephyr-sdk-$( cat SDK_VERSION )" >> $GITHUB_ENV
-
-      - name: Check Environment
-        run: |
-          cmake --version
-          ${LLVM_TOOLCHAIN_PATH}/bin/clang --version
-          gcc --version
-          ls -la
-
-      - name: Set up ccache
-        run: |
-          mkdir -p ${CCACHE_DIR}
-          ccache -M 10G
-          ccache -p
-          ccache -z -s -vv
-
-      - name: Update BabbleSim to manifest revision
-        run: |
-          export BSIM_VERSION=$( west list bsim -f {revision} )
-          echo "Manifest points to bsim sha $BSIM_VERSION"
-          cd /opt/bsim_west/bsim
-          git fetch -n origin ${BSIM_VERSION}
-          git -c advice.detachedHead=false checkout ${BSIM_VERSION}
-          west update
-          make everything -s -j 8
-
-      - name: Run Tests with Twister
-        id: twister
-        run: |
-          export ZEPHYR_BASE=${PWD}
-          export ZEPHYR_TOOLCHAIN_VARIANT=llvm
-
-          # check if we need to run a full twister or not based on files changed
-          python3 ./scripts/ci/test_plan.py --platform ${{ matrix.platform }} -c origin/${BASE_REF}..
-
-          # We can limit scope to just what has changed
-          if [ -s testplan.json ]; then
-            echo "report_needed=1" >> $GITHUB_OUTPUT
-            # Full twister but with options based on changes
-            ./scripts/twister --force-color --inline-logs -M -N -v --load-tests testplan.json --retry-failed 2
-          else
-            # if nothing is run, skip reporting step
-            echo "report_needed=0" >> $GITHUB_OUTPUT
-          fi
-
-      - name: Print ccache stats
-        if: always()
-        run: |
-          ccache -s -vv
-
-      - name: Upload Unit Test Results
-        if: always() && steps.twister.outputs.report_needed != 0
-        uses: actions/upload-artifact@v4
-        with:
-          name: Unit Test Results (Subset ${{ matrix.platform }})
-          path: twister-out/twister.xml
-
-  clang-build-results:
-    name: "Publish Unit Tests Results"
-    needs: clang-build
-    runs-on: ubuntu-22.04
-    if: (success() || failure() ) && needs.clang-build.outputs.report_needed != 0
-    steps:
-      - name: Download Artifacts
-        uses: actions/download-artifact@v4
-        with:
-          path: artifacts
-      - name: Merge Test Results
-        run: |
-          pip3 install junitparser junit2html
-          junitparser merge artifacts/*/twister.xml junit.xml
-          junit2html junit.xml junit-clang.html
-
-      - name: Upload Unit Test Results in HTML
-        if: always()
-        uses: actions/upload-artifact@v4
-        with:
-          name: HTML Unit Test Results
-          if-no-files-found: ignore
-          path: |
-            junit-clang.html
-
-      - name: Publish Unit Test Results
-        uses: EnricoMi/publish-unit-test-result-action@v2
-        if: always()
-        with:
-          check_name: Unit Test Results
-          files: "**/twister.xml"
-          comment_mode: off

.github/workflows/codecov.yaml

@@ -1,229 +0,0 @@
-name: Code Coverage with codecov
-
-on:
-  schedule:
-    - cron: '25 06,18 * * *'
-
-concurrency:
-  group: ${{ github.workflow }}-${{ github.event_name }}-${{ github.head_ref || github.ref }}
-  cancel-in-progress: true
-
-jobs:
-  codecov:
-    if: github.repository_owner == 'zephyrproject-rtos'
-    runs-on:
-      group: zephyr-runner-v2-linux-x64-4xlarge
-    container:
-      image: ghcr.io/zephyrproject-rtos/ci-repo-cache:v0.26.13.20240601
-      options: '--entrypoint /bin/bash'
-    strategy:
-      fail-fast: false
-      matrix:
-        platform: ["mps2/an385", "native_sim", "qemu_x86", "unit_testing"]
-        include:
-          - platform: 'mps2/an385'
-            normalized: 'mps2_an385'
-          - platform: 'native_sim'
-            normalized: 'native_sim'
-          - platform: 'qemu_x86'
-            normalized: 'qemu_x86'
-          - platform: 'unit_testing'
-            normalized: 'unit_testing'
-    env:
-      CCACHE_DIR: /node-cache/ccache-zephyr
-      CCACHE_REMOTE_STORAGE: "redis://cache-*.keydb-cache.svc.cluster.local|shards=1,2,3"
-      CCACHE_REMOTE_ONLY: "true"
-      # `--specs` is ignored because ccache is unable to resovle the toolchain specs file path.
-      CCACHE_IGNOREOPTIONS: '--specs=*'
-    steps:
-      - name: Apply container owner mismatch workaround
-        run: |
-          # FIXME: The owner UID of the GITHUB_WORKSPACE directory may not
-          #        match the container user UID because of the way GitHub
-          #        Actions runner is implemented. Remove this workaround when
-          #        GitHub comes up with a fundamental fix for this problem.
-          git config --global --add safe.directory ${GITHUB_WORKSPACE}
-
-      - name: Print cloud service information
-        run: |
-          echo "ZEPHYR_RUNNER_CLOUD_PROVIDER = ${ZEPHYR_RUNNER_CLOUD_PROVIDER}"
-          echo "ZEPHYR_RUNNER_CLOUD_NODE = ${ZEPHYR_RUNNER_CLOUD_NODE}"
-          echo "ZEPHYR_RUNNER_CLOUD_POD = ${ZEPHYR_RUNNER_CLOUD_POD}"
-
-      - name: Update PATH for west
-        run: |
-          echo "$HOME/.local/bin" >> $GITHUB_PATH
-
-      - name: Clone cached Zephyr repository
-        continue-on-error: true
-        run: |
-          git clone --shared /repo-cache/zephyrproject/zephyr .
-          git remote set-url origin ${GITHUB_SERVER_URL}/${GITHUB_REPOSITORY}
-
-      - name: checkout
-        uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-
-      - name: west setup
-        run: |
-          west init -l . || true
-          west update 1> west.update.log || west update 1> west.update-2.log
-
-      - name: Environment Setup
-        run: |
-          cmake --version
-          gcc --version
-          ls -la
-
-          echo "ZEPHYR_SDK_INSTALL_DIR=/opt/toolchains/zephyr-sdk-$( cat SDK_VERSION )" >> $GITHUB_ENV
-
-      - name: Set up ccache
-        run: |
-          mkdir -p ${CCACHE_DIR}
-          ccache -M 10G
-          ccache -p
-          ccache -z -s -vv
-
-      - name: Update BabbleSim to manifest revision
-        run: |
-          export BSIM_VERSION=$( west list bsim -f {revision} )
-          echo "Manifest points to bsim sha $BSIM_VERSION"
-          cd /opt/bsim_west/bsim
-          git fetch -n origin ${BSIM_VERSION}
-          git -c advice.detachedHead=false checkout ${BSIM_VERSION}
-          west update
-          make everything -s -j 8
-
-      - name: Run Tests with Twister (Push)
-        continue-on-error: true
-        run: |
-          export ZEPHYR_BASE=${PWD}
-          export ZEPHYR_TOOLCHAIN_VARIANT=zephyr
-          mkdir -p coverage/reports
-          pip3 install gcovr==6.0
-          ./scripts/twister -E ${{matrix.normalized}}-testplan.json
-          ls -la
-          ./scripts/twister \
-            -i --force-color -N -v --filter runnable -p ${{ matrix.platform }} --coverage \
-            -T tests --coverage-tool gcovr -xCONFIG_TEST_EXTRA_STACK_SIZE=4096 -e nano \
-            --timeout-multiplier 2
-
-      - name: Print ccache stats
-        if: always()
-        run: |
-          ccache -s -vv
-
-      - name: Rename coverage files
-        if: always()
-        run: |
-          mv twister-out/coverage.json coverage/reports/${{matrix.normalized}}.json
-
-      - name: Upload Coverage Results
-        if: always()
-        uses: actions/upload-artifact@v4
-        with:
-          name: Coverage Data (Subset ${{ matrix.normalized }})
-          path: |
-            coverage/reports/${{ matrix.normalized }}.json
-            ${{ matrix.normalized }}-testplan.json
-
-  codecov-results:
-    name: "Publish Coverage Results"
-    needs: codecov
-    runs-on: ubuntu-22.04
-    # the codecov job might be skipped, we don't need to run this job then
-    if: success() || failure()
-
-    steps:
-      - name: checkout
-        uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-
-      - name: Download Artifacts
-        uses: actions/download-artifact@v4
-        with:
-          path: coverage/reports
-
-      - name: Move coverage files
-        run: |
-          ls -lRt  ./coverage/reports
-          mv ./coverage/reports/*/*testplan.json .
-          mv ./coverage/reports/*/coverage/reports/*.json ./coverage/reports
-          ls -la ./coverage/reports
-
-      - name: Generate list of coverage files
-        id: get-coverage-files
-        shell: cmake -P {0}
-        run: |
-          file(GLOB INPUT_FILES_LIST  "coverage/reports/*.json")
-          set(MERGELIST "")
-          set(FILELIST "")
-          foreach(ITEM ${INPUT_FILES_LIST})
-            get_filename_component(f ${ITEM} NAME)
-            if(FILELIST STREQUAL "")
-              set(FILELIST "${f}")
-            else()
-              set(FILELIST "${FILELIST},${f}")
-            endif()
-          endforeach()
-          foreach(ITEM ${INPUT_FILES_LIST})
-            get_filename_component(f ${ITEM} NAME)
-            if(MERGELIST STREQUAL "")
-              set(MERGELIST "--add-tracefile ${f}")
-            else()
-              set(MERGELIST "${MERGELIST} -a ${f}")
-            endif()
-          endforeach()
-          file(APPEND $ENV{GITHUB_OUTPUT} "mergefiles=${MERGELIST}\n")
-          file(APPEND $ENV{GITHUB_OUTPUT} "covfiles=${FILELIST}\n")
-
-      - name: Merge coverage files
-        run: |
-          pushd ./coverage/reports
-          pip3 install gcovr==6.0
-          gcovr ${{ steps.get-coverage-files.outputs.mergefiles }}  --merge-mode-functions=separate --json merged.json
-          gcovr ${{ steps.get-coverage-files.outputs.mergefiles }} --merge-mode-functions=separate --cobertura merged.xml
-          popd
-
-      - name: Get current date
-        id: run_date
-        run: |
-            echo "run_date=$(date --iso-8601=minutes)" >> "$GITHUB_OUTPUT"
-            echo "run_date_short=$(date +'%Y-%m-%d')" >> "$GITHUB_OUTPUT"
-            echo "run_date_year=$(date +'%Y')" >> "$GITHUB_OUTPUT"
-            echo "run_date_month=$(date +'%m')" >> "$GITHUB_OUTPUT"
-
-      - name: Generate Coverage Report
-        if: always()
-        run: |
-          pip install xlsxwriter ijson
-          python3 ./scripts/ci/coverage/coverage_analysis.py \
-            -t native_sim-testplan.json \
-            -m MAINTAINERS.yml \
-            -c coverage/reports/merged.json \
-            -o coverage-report-${{ steps.run_date.outputs.run_date_short }} \
-            -f all
-          cp coverage-report-* coverage/reports/
-
-      - name: Upload Merged Coverage Results and Report
-        if: always()
-        uses: actions/upload-artifact@v4
-        with:
-          name: Coverage Data and report
-          path: |
-            coverage/reports/merged.json
-            coverage/reports/merged.xml
-            coverage/reports/coverage-report-${{ steps.run_date.outputs.run_date_short }}.json
-            coverage/reports/coverage-report-${{ steps.run_date.outputs.run_date_short }}.xlsx
-
-      - name: Upload coverage to Codecov
-        if: always()
-        uses: codecov/codecov-action@v4
-        with:
-          env_vars: OS,PYTHON
-          fail_ci_if_error: false
-          verbose: true
-          token: ${{ secrets.CODECOV_TOKEN }}
-          files: coverage/reports/merged.xml

.github/workflows/coding_guidelines.yml

@@ -1,59 +0,0 @@
-name: Coding Guidelines
-
-on: pull_request
-
-jobs:
-  compliance_job:
-    runs-on: ubuntu-22.04
-    name: Run coding guidelines checks on patch series (PR)
-    steps:
-    - name: Checkout the code
-      uses: actions/checkout@v4
-      with:
-        ref: ${{ github.event.pull_request.head.sha }}
-        fetch-depth: 0
-
-    - name: cache-pip
-      uses: actions/cache@v4
-      with:
-        path: ~/.cache/pip
-        key: ${{ runner.os }}-pip-${{ hashFiles('.github/workflows/coding_guidelines.yml') }}
-
-    - name: Install python dependencies
-      run: |
-        pip3 install unidiff
-        pip3 install wheel
-        pip3 install sh
-
-    - name: Install Packages
-      run: |
-        sudo apt-get update
-        sudo apt-get install coccinelle
-
-    - name: Run Coding Guildeines Checks
-      continue-on-error: true
-      id: coding_guidelines
-      env:
-        BASE_REF: ${{ github.base_ref }}
-      run: |
-        export ZEPHYR_BASE=$PWD
-        git config --global user.email "actions@zephyrproject.org"
-        git config --global user.name "Github Actions"
-        git remote -v
-        git rebase origin/${BASE_REF}
-        source zephyr-env.sh
-        # debug
-        ls -la
-        git log  --pretty=oneline | head -n 10
-        ./scripts/ci/guideline_check.py --output output.txt -c origin/${BASE_REF}..
-
-    - name: check-warns
-      run: |
-        if [[ -s "output.txt" ]]; then
-            errors=$(cat output.txt)
-            errors="${errors//'%'/'%25'}"
-            errors="${errors//$'\n'/'%0A'}"
-            errors="${errors//$'\r'/'%0D'}"
-            echo "::error file=output.txt::$errors"
-            exit 1;
-        fi

.github/workflows/compliance.yml

@@ -1,16 +1,10 @@
-name: Compliance Checks
+name: Compliance
 
-on:
-  pull_request:
-    types:
-    - edited
-    - opened
-    - reopened
-    - synchronize
+on: pull_request
 
 jobs:
-  check_compliance:
-    runs-on: ubuntu-22.04
+  compliance_job:
+    runs-on: ubuntu-latest
     name: Run compliance checks on patch series (PR)
     steps:
     - name: Update PATH for west
@@ -18,27 +12,22 @@ jobs:
         echo "$HOME/.local/bin" >> $GITHUB_PATH
 
     - name: Checkout the code
-      uses: actions/checkout@v4
+      uses: actions/checkout@v2
       with:
         ref: ${{ github.event.pull_request.head.sha }}
         fetch-depth: 0
 
-    - name: Set up Python
-      uses: actions/setup-python@v5
-      with:
-        python-version: 3.11
-
     - name: cache-pip
-      uses: actions/cache@v4
+      uses: actions/cache@v1
       with:
         path: ~/.cache/pip
-        key: ${{ runner.os }}-pip-${{ hashFiles('.github/workflows/compliance.yml') }}
+        key: ${{ runner.os }}-doc-pip
 
     - name: Install python dependencies
       run: |
         pip3 install setuptools
         pip3 install wheel
-        pip3 install python-magic lxml junitparser gitlint pylint pykwalify yamllint clang-format unidiff
+        pip3 install python-magic junitparser==1.6.3 gitlint pylint pykwalify
         pip3 install west
 
     - name: west setup
@@ -48,23 +37,11 @@ jobs:
         git config --global user.email "you@example.com"
         git config --global user.name "Your Name"
         git remote -v
-        # Ensure there's no merge commits in the PR
-        [[ "$(git rev-list --merges --count origin/${BASE_REF}..)" == "0" ]] || \
-        (echo "::error ::Merge commits not allowed, rebase instead";false)
         git rebase origin/${BASE_REF}
         # debug
         git log  --pretty=oneline | head -n 10
         west init -l . || true
-        west config manifest.group-filter -- +ci,-optional
-        west update -o=--depth=1 -n 2>&1 1> west.update.log || west update -o=--depth=1 -n 2>&1 1> west.update2.log
-
-    - name: Check for PR description
-      if: ${{ github.event.pull_request.body == '' }}
-      continue-on-error: true
-      id: pr_description
-      run: |
-        echo "Pull request description cannot be empty."
-        exit 1
+        west update
 
     - name: Run Compliance Tests
       continue-on-error: true
@@ -76,14 +53,11 @@ jobs:
         # debug
         ls -la
         git log  --pretty=oneline | head -n 10
-        # Increase rename limit to allow for large PRs
-        git config diff.renameLimit 10000
-        ./scripts/ci/check_compliance.py --annotate -e KconfigBasic \
-        -c origin/${BASE_REF}..
+        ./scripts/ci/check_compliance.py -m Codeowners -m Devicetree -m Gitlint -m Identity -m Nits -m pylint -m checkpatch -m Kconfig -c origin/${BASE_REF}..
 
     - name: upload-results
-      uses: actions/upload-artifact@v4
-      continue-on-error: true
+      uses: actions/upload-artifact@master
+      continue-on-error: True
       with:
         name: compliance.xml
         path: compliance.xml
@@ -94,33 +68,17 @@ jobs:
           exit 1;
         fi
 
-        warns=("ClangFormat")
-        files=($(./scripts/ci/check_compliance.py -l))
-
-        for file in "${files[@]}"; do
-          f="${file}.txt"
-          if [[ -s $f ]]; then
-            results=$(cat $f)
-            results="${results//'%'/'%25'}"
-            results="${results//$'\n'/'%0A'}"
-            results="${results//$'\r'/'%0D'}"
-
-            if [[ "${warns[@]}" =~ "${file}" ]]; then
-              echo "::warning file=${f}::$results"
-            else
-              echo "::error file=${f}::$results"
-              exit=1
-            fi
+        for file in Nits.txt checkpatch.txt Identity.txt Gitlint.txt pylint.txt Devicetree.txt Kconfig.txt Codeowners.txt; do
+          if [[ -s $file ]]; then
+            errors=$(cat $file)
+            errors="${errors//'%'/'%25'}"
+            errors="${errors//$'\n'/'%0A'}"
+            errors="${errors//$'\r'/'%0D'}"
+            echo "::error file=${file}::$errors"
+            exit=1
           fi
         done
 
-        if [ "${exit}" == "1" ]; then
-          echo "Compliance error, check for error messages in the \"Run Compliance Tests\" step"
-          echo "You can run this step locally with the ./scripts/ci/check_compliance.py script."
-          exit 1;
-        fi
-
-        if [ "${{ steps.pr_description.outcome }}" == "failure" ]; then
-          echo "PR description cannot be empty"
+        if [ ${exit} == 1 ]; then
           exit 1;
         fi

.github/workflows/conflict.yml

@@ -0,0 +1,14 @@
+name: Conflict Finder
+
+on:
+  push:
+    branches-ignore:
+      - '**'
+jobs:
+  conflict:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: mschilde/auto-label-merge-conflicts@master
+        with:
+          CONFLICT_LABEL_NAME: "has conflicts"
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/daily_test_version.yml

@@ -5,22 +5,22 @@ name: Publish commit for daily testing
 
 on:
   schedule:
-  - cron: '50 22 * * *'
+    - cron:  '50 22 * * *'
   push:
     branches:
-    - refs/tags/*
+      - refs/tags/*
 
 jobs:
   get_version:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest
     if: github.repository == 'zephyrproject-rtos/zephyr'
 
     steps:
     - name: Configure AWS Credentials
-      uses: aws-actions/configure-aws-credentials@v4
+      uses: aws-actions/configure-aws-credentials@v1
       with:
-        aws-access-key-id: ${{ vars.AWS_TESTING_ACCESS_KEY_ID }}
-        aws-secret-access-key: ${{ secrets.AWS_TESTING_SECRET_ACCESS_KEY }}
+        aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID_TESTING }}
+        aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY_TESTING }}
         aws-region: us-east-1
 
     - name: install-pip
@@ -28,7 +28,7 @@ jobs:
         pip3 install gitpython
 
     - name: checkout
-      uses: actions/checkout@v4
+      uses: actions/checkout@v2
       with:
         fetch-depth: 0
 

.github/workflows/devicetree_checks.yml

@@ -6,16 +6,10 @@ name: Devicetree script tests
 
 on:
   push:
-    branches:
-    - main
-    - v*-branch
     paths:
     - 'scripts/dts/**'
     - '.github/workflows/devicetree_checks.yml'
   pull_request:
-    branches:
-    - main
-    - v*-branch
     paths:
     - 'scripts/dts/**'
     - '.github/workflows/devicetree_checks.yml'
@@ -26,23 +20,18 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        python-version: ['3.10', '3.11', '3.12']
-        os: [ubuntu-22.04, macos-14, windows-2022]
-        exclude:
-        - os: macos-14
-          python-version: 3.6
-        - os: windows-2022
-          python-version: 3.6
+        python-version: [3.6, 3.7, 3.8]
+        os: [ubuntu-latest, macos-latest, windows-latest]
     steps:
     - name: checkout
-      uses: actions/checkout@v4
+      uses: actions/checkout@v2
     - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v5
+      uses: actions/setup-python@v1
       with:
         python-version: ${{ matrix.python-version }}
     - name: cache-pip-linux
       if: startsWith(runner.os, 'Linux')
-      uses: actions/cache@v4
+      uses: actions/cache@v1
       with:
         path: ~/.cache/pip
         key: ${{ runner.os }}-pip-${{ matrix.python-version }}
@@ -50,7 +39,7 @@ jobs:
           ${{ runner.os }}-pip-${{ matrix.python-version }}
     - name: cache-pip-mac
       if: startsWith(runner.os, 'macOS')
-      uses: actions/cache@v4
+      uses: actions/cache@v1
       with:
         path: ~/Library/Caches/pip
         # Trailing '-' was just to get a different cache name
@@ -59,7 +48,7 @@ jobs:
           ${{ runner.os }}-pip-${{ matrix.python-version }}-
     - name: cache-pip-win
       if: startsWith(runner.os, 'Windows')
-      uses: actions/cache@v4
+      uses: actions/cache@v1
       with:
         path: ~\AppData\Local\pip\Cache
         key: ${{ runner.os }}-pip-${{ matrix.python-version }}
@@ -68,8 +57,8 @@ jobs:
     - name: install python dependencies
       run: |
         pip3 install wheel
-        pip3 install pytest pyyaml tox
-    - name: run tox
-      working-directory: scripts/dts/python-devicetree
+        pip3 install pytest pyyaml
+    - name: run pytest
+      working-directory: scripts/dts
       run: |
-        tox
+        python -m pytest testdtlib.py testedtlib.py

.github/workflows/do_not_merge.yml

@@ -1,20 +0,0 @@
-name: Do Not Merge
-
-on:
-  pull_request:
-    types: [synchronize, opened, reopened, labeled, unlabeled]
-
-jobs:
-  do-not-merge:
-    if: ${{ contains(github.event.*.labels.*.name, 'DNM') ||
-            contains(github.event.*.labels.*.name, 'TSC') ||
-            contains(github.event.*.labels.*.name, 'Architecture Review') ||
-            contains(github.event.*.labels.*.name, 'dev-review') }}
-    name: Prevent Merging
-    runs-on: ubuntu-22.04
-    steps:
-      - name: Check for label
-        run: |
-          echo "Pull request is labeled as 'DNM', 'TSC', 'Architecture Review' or 'dev-review'."
-          echo "This workflow fails so that the pull request cannot be merged."
-          exit 1

.github/workflows/doc-build.yml

@@ -1,279 +1,79 @@
 # Copyright (c) 2020 Linaro Limited.
 # SPDX-License-Identifier: Apache-2.0
 
-name: Documentation Build
+name: Documentation GitHub Workflow
 
 on:
-  schedule:
-  - cron: '0 */3 * * *'
-  push:
-    tags:
-    - v*
   pull_request:
-
-env:
-  # NOTE: west docstrings will be extracted from the version listed here
-  WEST_VERSION: 1.2.0
-  # The latest CMake available directly with apt is 3.18, but we need >=3.20
-  # so we fetch that through pip.
-  CMAKE_VERSION: 3.20.5
-  DOXYGEN_VERSION: 1.12.0
-  # Job count is set to 2 less than the vCPU count of 16 because the total available RAM is 32GiB
-  # and each sphinx-build process may use more than 2GiB of RAM.
-  JOB_COUNT: 14
+    paths:
+    - 'Makefile'
+    - 'doc/**'
+    - '**.rst'
+    - 'include/**'
+    - 'kernel/include/kernel_arch_interface.h'
+    - 'lib/libc/**'
+    - 'subsys/testsuite/ztest/include/**'
+    - 'tests/**'
+    - '.known-issues/doc/**'
+    - '**/Kconfig*'
+    - 'west.yml'
+    - '.github/workflows/doc-build.yml'
 
 jobs:
-  doc-file-check:
-    name: Check for doc changes
-    runs-on: ubuntu-22.04
-    if: >
-      github.repository_owner == 'zephyrproject-rtos'
-    outputs:
-      file_check: ${{ steps.check-doc-files.outputs.any_changed }}
-    steps:
-    - name: checkout
-      uses: actions/checkout@v4
-      with:
-        ref: ${{ github.event.pull_request.head.sha }}
-        fetch-depth: 0
-    - name: Check if Documentation related files changed
-      uses: tj-actions/changed-files@v44
-      id: check-doc-files
-      with:
-        files: |
-          doc/
-          **.rst
-          include/
-          kernel/include/kernel_arch_interface.h
-          lib/libc/**
-          subsys/testsuite/ztest/include/**
-          tests/
-          **/Kconfig*
-          west.yml
-          scripts/dts/
-          doc/requirements.txt
-          .github/workflows/doc-build.yml
-          scripts/pylib/pytest-twister-harness/src/twister_harness/device/device_adapter.py
-          scripts/pylib/pytest-twister-harness/src/twister_harness/helpers/shell.py
-
-  doc-build-html:
-    name: "Documentation Build (HTML)"
-    needs: [doc-file-check]
-    if: >
-      github.repository_owner == 'zephyrproject-rtos' &&
-        ( needs.doc-file-check.outputs.file_check == 'true' || github.event_name != 'pull_request' )
-    runs-on:
-      group: zephyr-runner-v2-linux-x64-4xlarge
-    timeout-minutes: 90
-    concurrency:
-      group: doc-build-html-${{ github.ref }}
-      cancel-in-progress: true
+  doc-build:
+    name: "Documentation Build"
+    runs-on: ubuntu-latest
 
     steps:
-    - name: Print cloud service information
+    - name: Update PATH for west
       run: |
-        echo "ZEPHYR_RUNNER_CLOUD_PROVIDER = ${ZEPHYR_RUNNER_CLOUD_PROVIDER}"
-        echo "ZEPHYR_RUNNER_CLOUD_NODE = ${ZEPHYR_RUNNER_CLOUD_NODE}"
-        echo "ZEPHYR_RUNNER_CLOUD_POD = ${ZEPHYR_RUNNER_CLOUD_POD}"
+        echo "$HOME/.local/bin" >> $GITHUB_PATH
+
+    - name: checkout
+      uses: actions/checkout@v2
 
     - name: install-pkgs
       run: |
-        sudo apt-get update
-        sudo apt-get install -y wget python3-pip git ninja-build graphviz lcov
-        wget --no-verbose "https://github.com/doxygen/doxygen/releases/download/Release_${DOXYGEN_VERSION//./_}/doxygen-${DOXYGEN_VERSION}.linux.bin.tar.gz"
-        sudo tar xf doxygen-${DOXYGEN_VERSION}.linux.bin.tar.gz -C /opt
-        echo "/opt/doxygen-${DOXYGEN_VERSION}/bin" >> $GITHUB_PATH
-        echo "${HOME}/.local/bin" >> $GITHUB_PATH
-
-    - name: checkout
-      uses: actions/checkout@v4
-      with:
-        ref: ${{ github.event.pull_request.head.sha }}
-        fetch-depth: 0
-
-    - name: Rebase
-      if: github.event_name == 'pull_request'
-      continue-on-error: true
-      env:
-        BASE_REF: ${{ github.base_ref }}
-        PR_HEAD: ${{ github.event.pull_request.head.sha }}
-      run: |
-        git config --global user.email "actions@zephyrproject.org"
-        git config --global user.name "Github Actions"
-        git rebase origin/${BASE_REF}
-        git log --graph --oneline HEAD...${PR_HEAD}
+        sudo apt-get install -y ninja-build doxygen
 
     - name: cache-pip
-      uses: actions/cache@v4
+      uses: actions/cache@v1
       with:
         path: ~/.cache/pip
-        key: pip-${{ hashFiles('doc/requirements.txt') }}
+        key: ${{ runner.os }}-doc-pip
 
     - name: install-pip
       run: |
-        sudo pip3 install -U setuptools wheel pip
-        pip3 install -r doc/requirements.txt
-        pip3 install west==${WEST_VERSION}
-        pip3 install cmake==${CMAKE_VERSION}
-        pip3 install coverxygen
+        pip3 install setuptools wheel
+        pip3 install -r scripts/requirements-base.txt
+        pip3 install -r scripts/requirements-doc.txt
+        pip3 install west==0.9.0
 
     - name: west setup
       run: |
-        west init -l .
+        west init -l . || true
 
     - name: build-docs
-      shell: bash
       run: |
-        if [[ "$GITHUB_REF" =~ "refs/tags/v" ]]; then
-          DOC_TAG="release"
-        else
-          DOC_TAG="development"
-        fi
-
-        if [[ "${{ github.event_name }}" == "pull_request" ]]; then
-          DOC_TARGET="html-fast"
-        else
-          DOC_TARGET="html"
-        fi
-
-        DOC_TAG=${DOC_TAG} \
-        SPHINXOPTS="-j ${JOB_COUNT} -W --keep-going -T" \
-        SPHINXOPTS_EXTRA="-q -t publish" \
-        make -C doc ${DOC_TARGET}
-
-        # API documentation coverage
-        python3 -m coverxygen --xml-dir  doc/_build/html/doxygen/xml/ --src-dir include/ --output doc-coverage.info
-        # deprecated page causing issues
-        lcov --remove doc-coverage.info \*/deprecated > new.info
-        genhtml --no-function-coverage --no-branch-coverage new.info -o coverage-report
-
-    - name: compress-docs
-      run: |
-        tar --use-compress-program="xz -T0" -cf html-output.tar.xz --directory=doc/_build html
-        tar --use-compress-program="xz -T0" -cf api-output.tar.xz --directory=doc/_build html/doxygen/html
-        tar --use-compress-program="xz -T0" -cf api-coverage.tar.xz coverage-report
+        source zephyr-env.sh
+        make htmldocs
+        tar cvf htmldocs.tar --directory=./doc/_build html
 
     - name: upload-build
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@master
+      continue-on-error: True
       with:
-        name: html-output
-        path: html-output.tar.xz
+        name: htmldocs.tar
+        path: htmldocs.tar
 
-    - name: upload-api-coverage
-      uses: actions/upload-artifact@v4
-      with:
-        name: api-coverage
-        path: api-coverage.tar.xz
-
-    - name: process-pr
-      if: github.event_name == 'pull_request'
+    - name: check-warns
       run: |
-        REPO_NAME="${{ github.event.repository.name }}"
-        PR_NUM="${{ github.event.pull_request.number }}"
-        DOC_URL="https://builds.zephyrproject.io/${REPO_NAME}/pr/${PR_NUM}/docs/"
-        API_DOC_URL="https://builds.zephyrproject.io/${REPO_NAME}/pr/${PR_NUM}/docs/doxygen/html/"
-        API_COVERAGE_URL="https://builds.zephyrproject.io/${REPO_NAME}/pr/${PR_NUM}/api-coverage/"
-
-        echo "${PR_NUM}" > pr_num
-        echo "Documentation will be available shortly at: ${DOC_URL}" >> $GITHUB_STEP_SUMMARY
-        echo "API Documentation will be available shortly at: ${API_DOC_URL}" >> $GITHUB_STEP_SUMMARY
-        echo "API Coverage Report will be available shortly at: ${API_COVERAGE_URL}" >> $GITHUB_STEP_SUMMARY
-
-    - name: upload-pr-number
-      uses: actions/upload-artifact@v4
-      if: github.event_name == 'pull_request'
-      with:
-        name: pr_num
-        path: pr_num
-
-  doc-build-pdf:
-    name: "Documentation Build (PDF)"
-    needs: [doc-file-check]
-    if: |
-      github.event_name != 'pull_request' &&
-      github.repository_owner == 'zephyrproject-rtos'
-    runs-on:
-      group: zephyr-runner-v2-linux-x64-4xlarge
-    container: texlive/texlive:latest
-    timeout-minutes: 120
-    concurrency:
-      group: doc-build-pdf-${{ github.ref }}
-      cancel-in-progress: true
-
-    steps:
-    - name: Apply container owner mismatch workaround
-      run: |
-        git config --global --add safe.directory ${GITHUB_WORKSPACE}
-
-    - name: Print cloud service information
-      run: |
-        echo "ZEPHYR_RUNNER_CLOUD_PROVIDER = ${ZEPHYR_RUNNER_CLOUD_PROVIDER}"
-        echo "ZEPHYR_RUNNER_CLOUD_NODE = ${ZEPHYR_RUNNER_CLOUD_NODE}"
-        echo "ZEPHYR_RUNNER_CLOUD_POD = ${ZEPHYR_RUNNER_CLOUD_POD}"
-
-    - name: checkout
-      uses: actions/checkout@v4
-
-    - name: install-pkgs
-      run: |
-        apt-get update
-        apt-get install -y python3-pip python3-venv ninja-build doxygen graphviz librsvg2-bin imagemagick
-
-    - name: cache-pip
-      uses: actions/cache@v4
-      with:
-        path: ~/.cache/pip
-        key: pip-${{ hashFiles('doc/requirements.txt') }}
-
-    - name: setup-venv
-      run: |
-        python3 -m venv .venv
-        . .venv/bin/activate
-        echo PATH=$PATH >> $GITHUB_ENV
-
-    - name: install-pip
-      run: |
-        pip3 install -U setuptools wheel pip
-        pip3 install -r doc/requirements.txt
-        pip3 install west==${WEST_VERSION}
-        pip3 install cmake==${CMAKE_VERSION}
-
-    - name: west setup
-      run: |
-        west init -l .
-
-    - name: build-docs
-      shell: bash
-      continue-on-error: true
-      run: |
-        if [[ "$GITHUB_REF" =~ "refs/tags/v" ]]; then
-          DOC_TAG="release"
-        else
-          DOC_TAG="development"
+        if [ -s doc/_build/doc.warnings ]; then
+           docwarn=$(cat doc/_build/doc.warnings)
+           docwarn="${docwarn//'%'/'%25'}"
+           docwarn="${docwarn//$'\n'/'%0A'}"
+           docwarn="${docwarn//$'\r'/'%0D'}"
+           # We treat doc warnings as errors
+           echo "::error file=doc.warnings::$docwarn"
+           exit 1
         fi
-
-        DOC_TAG=${DOC_TAG} \
-        SPHINXOPTS="-q -j ${JOB_COUNT}" \
-        LATEXMKOPTS="-quiet -halt-on-error" \
-        make -C doc pdf
-
-    - name: upload-build
-      if: always()
-      uses: actions/upload-artifact@v4
-      with:
-        name: pdf-output
-        if-no-files-found: ignore
-        path: |
-          doc/_build/latex/zephyr.pdf
-          doc/_build/latex/zephyr.log
-
-  doc-build-status-check:
-    if: always()
-    name: "Documentation Build Status"
-    needs:
-    - doc-build-pdf
-    - doc-file-check
-    - doc-build-html
-    uses: ./.github/workflows/ready-to-merge.yml
-    with:
-      needs_context: ${{ toJson(needs) }}

.github/workflows/doc-publish-pr.yml

@@ -1,71 +0,0 @@
-# Copyright (c) 2020 Linaro Limited.
-# Copyright (c) 2021 Nordic Semiconductor ASA
-# SPDX-License-Identifier: Apache-2.0
-
-name: Documentation Publish (Pull Request)
-
-on:
-  workflow_run:
-    workflows: ["Documentation Build"]
-    types:
-    - completed
-
-jobs:
-  doc-publish:
-    name: Publish Documentation
-    runs-on: ubuntu-22.04
-    if: |
-      github.event.workflow_run.event == 'pull_request' &&
-      github.event.workflow_run.conclusion == 'success' &&
-      github.repository == 'zephyrproject-rtos/zephyr'
-
-    steps:
-    - name: Download artifacts
-      uses: dawidd6/action-download-artifact@v3
-      with:
-        workflow: doc-build.yml
-        run_id: ${{ github.event.workflow_run.id }}
-
-    - name: Load PR number
-      run: |
-        echo "PR_NUM=$(<pr_num/pr_num)" >> $GITHUB_ENV
-
-    - name: Check PR number
-      id: check-pr
-      uses: carpentries/actions/check-valid-pr@v0.14.0
-      with:
-        pr: ${{ env.PR_NUM }}
-        sha: ${{ github.event.workflow_run.head_sha }}
-
-    - name: Validate PR number
-      if: steps.check-pr.outputs.VALID != 'true'
-      run: |
-        echo "ABORT: PR number validation failed!"
-        exit 1
-
-    - name: Uncompress HTML docs
-      run: |
-        tar xf html-output/html-output.tar.xz -C html-output
-        if [ -f api-coverage/api-coverage.tar.xz ]; then
-          tar xf api-coverage/api-coverage.tar.xz -C api-coverage
-        fi
-
-    - name: Configure AWS Credentials
-      uses: aws-actions/configure-aws-credentials@v4
-      with:
-        aws-access-key-id: ${{ vars.AWS_BUILDS_ZEPHYR_PR_ACCESS_KEY_ID }}
-        aws-secret-access-key: ${{ secrets.AWS_BUILDS_ZEPHYR_PR_SECRET_ACCESS_KEY }}
-        aws-region: us-east-1
-
-    - name: Upload to AWS S3
-      env:
-        HEAD_BRANCH: ${{ github.event.workflow_run.head_branch }}
-      run: |
-        aws s3 sync --quiet html-output/html \
-          s3://builds.zephyrproject.org/${{ github.event.repository.name }}/pr/${PR_NUM}/docs \
-          --delete
-        if [ -d api-coverage/coverage-report ]; then
-          aws s3 sync --quiet api-coverage/coverage-report/ \
-            s3://builds.zephyrproject.org/${{ github.event.repository.name }}/pr/${PR_NUM}/api-coverage \
-            --delete
-        fi

.github/workflows/doc-publish.yml

@@ -1,61 +1,116 @@
 # Copyright (c) 2020 Linaro Limited.
-# Copyright (c) 2021 Nordic Semiconductor ASA
 # SPDX-License-Identifier: Apache-2.0
 
-name: Documentation Publish
+name: Doc build for Release or Daily
 
+# Either a daily based on schedule/cron or only on tag push
 on:
-  workflow_run:
-    workflows: ["Documentation Build"]
-    branches:
-    - main
-    - v*
-    types:
-    - completed
+  schedule:
+    - cron:  '50 22 * * *'
+  push:
+    tags:
+      # only publish v* tags, do not care about zephyr-v* which point to the
+      # same commit
+      - 'v*'
 
 jobs:
   doc-publish:
     name: Publish Documentation
-    runs-on: ubuntu-22.04
-    if: |
-      github.event.workflow_run.event != 'pull_request' &&
-      github.event.workflow_run.conclusion == 'success' &&
-      github.repository == 'zephyrproject-rtos/zephyr'
+    runs-on: ubuntu-latest
+    if: github.repository == 'zephyrproject-rtos/zephyr'
 
     steps:
-    - name: Download artifacts
-      uses: dawidd6/action-download-artifact@v3
-      with:
-        workflow: doc-build.yml
-        run_id: ${{ github.event.workflow_run.id }}
-
-    - name: Uncompress HTML docs
+    - name: Update PATH for west
       run: |
-        tar xf html-output/html-output.tar.xz -C html-output
-        if [ -f api-coverage/api-coverage.tar.xz ]; then
-          tar xf api-coverage/api-coverage.tar.xz -C api-coverage
+        echo "$HOME/.local/bin" >> $GITHUB_PATH
+
+    - name: Determine tag
+      id: tag
+      run: |
+        # We expect to get here either due to a schedule event in which
+        # case we are doing a daily build of the docs, or because a new
+        # tag was pushed, in which case we are building docs for a release
+        if [ ${GITHUB_EVENT_NAME} == "schedule" ]; then
+           echo ::set-output name=TYPE::daily;
+           echo ::set-output name=RELEASE::latest;
+        elif [ ${GITHUB_EVENT_NAME} == "push" ]; then
+           # If push due to a tag GITHUB_REF will look like refs/tags/TAG-FOO
+           # chop of 'refs/tags' so RELEASE=TAG-FOO
+           echo ::set-output name=TYPE::release;
+           echo ::set-output name=RELEASE::${GITHUB_REF/refs\/tags\//};
+        else
+           exit 1
         fi
 
     - name: Configure AWS Credentials
-      uses: aws-actions/configure-aws-credentials@v4
+      uses: aws-actions/configure-aws-credentials@v1
       with:
-        aws-access-key-id: ${{ vars.AWS_DOCS_ACCESS_KEY_ID }}
-        aws-secret-access-key: ${{ secrets.AWS_DOCS_SECRET_ACCESS_KEY }}
+        aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
+        aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
         aws-region: us-east-1
 
+    - name: checkout
+      uses: actions/checkout@v2
+
+    - name: install-pkgs
+      run: |
+        sudo apt-get install -y ninja-build doxygen
+
+    - name: cache-pip
+      uses: actions/cache@v1
+      with:
+        path: ~/.cache/pip
+        key: ${{ runner.os }}-doc-pip
+
+    - name: install-pip
+      run: |
+        pip3 install setuptools
+        pip3 install -r scripts/requirements-base.txt
+        pip3 install -r scripts/requirements-doc.txt
+
+    - name: west setup
+      run: |
+        west init -l . || true
+
+    - name: build-docs
+      env:
+        DOC_TAG: ${{ steps.tag.outputs.TYPE }}
+      run: |
+        source zephyr-env.sh
+        make DOC_TAG=${DOC_TAG} htmldocs
+
+    - name: check-warns
+      run: |
+        if [ -s doc/_build/doc.warnings ]; then
+           docwarn=$(cat doc/_build/doc.warnings)
+           docwarn="${docwarn//'%'/'%25'}"
+           docwarn="${docwarn//$'\n'/'%0A'}"
+           docwarn="${docwarn//$'\r'/'%0D'}"
+           # We treat doc warnings as errors
+           echo "::error file=doc.warnings::$docwarn"
+           exit 1
+        fi
+
     - name: Upload to AWS S3
       env:
-        HEAD_BRANCH: ${{ github.event.workflow_run.head_branch }}
+        RELEASE: ${{ steps.tag.outputs.RELEASE }}
       run: |
-        if [ "${HEAD_BRANCH:0:1}" == "v" ]; then
-          VERSION=${HEAD_BRANCH:1}
+        echo "DOC_RELEASE=[$RELEASE]"
+        if [ "$RELEASE" == "latest" ]; then
+           export
+           echo "publish latest docs"
+           aws s3 sync  --quiet doc/_build/html s3://docs.zephyrproject.org/latest --delete
+           echo "success sync of latest docs"
         else
-          VERSION="latest"
+           # we want just the version, without the leading 'v'
+           DOC_RELEASE=${RELEASE:1}
+           echo "publish release docs: ${DOC_RELEASE}"
+           aws s3 sync  --quiet doc/_build/html s3://docs.zephyrproject.org/${DOC_RELEASE}
+           echo "success sync of rel docs"
         fi
-
-        aws s3 sync --quiet html-output/html s3://docs.zephyrproject.org/${VERSION} --delete
-        aws s3 sync --quiet html-output/html/doxygen/html s3://docs.zephyrproject.org/apidoc/${VERSION} --delete
-        if [ -d api-coverage/coverage-report ]; then
-          aws s3 sync --quiet api-coverage/coverage-report/ s3://docs.zephyrproject.org/api-coverage/${VERSION} --delete
+        if [ -d doc/_build/doxygen/html ]; then
+           API_RELEASE=${RELEASE:1}
+           echo "publish doxygen to apidoc/${API_RELEASE}"
+           aws s3 sync  --quiet doc/_build/doxygen/html s3://docs.zephyrproject.org/apidoc/${API_RELEASE} --delete
+           echo "success publish of doxygen"
         fi
-        aws s3 cp --quiet pdf-output/zephyr.pdf s3://docs.zephyrproject.org/${VERSION}/zephyr.pdf

.github/workflows/errno.yml

@@ -1,34 +0,0 @@
-name: Error numbers
-on:
-  pull_request:
-    paths:
-      - '.github/workflows/errno.yml'
-      - 'lib/libc/minimal/include/errno.h'
-      - 'scripts/ci/errno.py'
-
-jobs:
-  check-errno:
-    runs-on: ubuntu-22.04
-    container:
-      image: ghcr.io/zephyrproject-rtos/ci:v0.26.13
-
-    steps:
-      - name: Apply container owner mismatch workaround
-        run: |
-          # FIXME: The owner UID of the GITHUB_WORKSPACE directory may not
-          #        match the container user UID because of the way GitHub
-          #        Actions runner is implemented. Remove this workaround when
-          #        GitHub comes up with a fundamental fix for this problem.
-          git config --global --add safe.directory ${GITHUB_WORKSPACE}
-
-      - name: checkout
-        uses: actions/checkout@v4
-
-      - name: Environment Setup
-        run: |
-          echo "ZEPHYR_SDK_INSTALL_DIR=/opt/toolchains/zephyr-sdk-$( cat SDK_VERSION )" >> $GITHUB_ENV
-
-      - name: Run errno.py
-        run: |
-          export ZEPHYR_BASE=${PWD}
-          ./scripts/ci/errno.py

.github/workflows/footprint-tracking.yml

@@ -1,95 +0,0 @@
-name: Footprint Tracking
-
-# Run every 12 hours and on tags
-on:
-  schedule:
-    - cron: '50 1/12 * * *'
-  push:
-    paths:
-      - 'VERSION'
-      - '.github/workflows/footprint-tracking.yml'
-    branches:
-      - main
-      - v*-branch
-    tags:
-      # only publish v* tags, do not care about zephyr-v* which point to the
-      # same commit
-      - 'v*'
-
-concurrency:
-  group: ${{ github.workflow }}-${{ github.event_name }}-${{ github.head_ref || github.ref }}
-  cancel-in-progress: true
-
-jobs:
-  footprint-tracking:
-    runs-on:
-      group: zephyr-runner-v2-linux-x64-4xlarge
-    if: github.repository_owner == 'zephyrproject-rtos'
-    container:
-      image: ghcr.io/zephyrproject-rtos/ci-repo-cache:v0.26.13.20240601
-      options: '--entrypoint /bin/bash'
-    strategy:
-      fail-fast: false
-    env:
-      ZEPHYR_TOOLCHAIN_VARIANT: zephyr
-    steps:
-      - name: Apply container owner mismatch workaround
-        run: |
-          # FIXME: The owner UID of the GITHUB_WORKSPACE directory may not
-          #        match the container user UID because of the way GitHub
-          #        Actions runner is implemented. Remove this workaround when
-          #        GitHub comes up with a fundamental fix for this problem.
-          git config --global --add safe.directory ${GITHUB_WORKSPACE}
-
-      - name: Print cloud service information
-        run: |
-          echo "ZEPHYR_RUNNER_CLOUD_PROVIDER = ${ZEPHYR_RUNNER_CLOUD_PROVIDER}"
-          echo "ZEPHYR_RUNNER_CLOUD_NODE = ${ZEPHYR_RUNNER_CLOUD_NODE}"
-          echo "ZEPHYR_RUNNER_CLOUD_POD = ${ZEPHYR_RUNNER_CLOUD_POD}"
-
-      - name: Update PATH for west
-        run: |
-          echo "$HOME/.local/bin" >> $GITHUB_PATH
-
-      - name: Install packages
-        run: |
-          sudo apt-get update
-          sudo apt-get install -y python3-venv
-          sudo pip3 install -U setuptools wheel pip gitpython
-
-      - name: checkout
-        uses: actions/checkout@v4
-        with:
-          ref: ${{ github.event.pull_request.head.sha }}
-          fetch-depth: 0
-
-      - name: Environment Setup
-        run: |
-          echo "ZEPHYR_SDK_INSTALL_DIR=/opt/toolchains/zephyr-sdk-$( cat SDK_VERSION )" >> $GITHUB_ENV
-
-      - name: west setup
-        run: |
-          west init -l . || true
-          west config --global update.narrow true
-          west update 2>&1 1> west.update.log || west update 2>&1 1> west.update2.log
-
-      - name: Configure AWS Credentials
-        uses: aws-actions/configure-aws-credentials@v4
-        with:
-          aws-access-key-id: ${{ vars.AWS_TESTING_ACCESS_KEY_ID }}
-          aws-secret-access-key: ${{ secrets.AWS_TESTING_SECRET_ACCESS_KEY }}
-          aws-region: us-east-1
-
-      - name: Record Footprint
-        env:
-          BASE_REF: ${{ github.base_ref }}
-        run: |
-          export ZEPHYR_BASE=${PWD}
-          ./scripts/footprint/track.py  -p scripts/footprint/plan.txt
-
-      - name: Upload footprint data
-        run: |
-          python3 -m venv .venv
-          . .venv/bin/activate
-          pip3 install awscli
-          aws s3 sync  --quiet footprint_data/ s3://testing.zephyrproject.org/footprint_data/

.github/workflows/greet_first_time_contributor.yml

@@ -1,58 +0,0 @@
-name: Greet first time contributor
-
-on:
-  issues:
-    types: [opened]
-  pull_request_target:
-    types: [opened, closed]
-
-jobs:
-  check_for_first_interaction:
-    runs-on: ubuntu-22.04
-    if: github.repository == 'zephyrproject-rtos/zephyr'
-
-    steps:
-      - uses: actions/checkout@v4
-      - uses: zephyrproject-rtos/action-first-interaction@v1.1.1-zephyr-5
-        with:
-          repo-token: ${{ secrets.GITHUB_TOKEN }}
-
-          issue-message: >
-            Hi @${{github.event.issue.user.login}}! We appreciate you submitting your first issue
-            for our open-source project. 🌟
-
-
-            Even though I'm a bot, I can assure you that the whole community is genuinely grateful
-            for your time and effort. 🤖💙
-
-          pr-opened-message: >
-            Hello @${{ github.event.pull_request.user.login }}, and thank you very much for your
-            first pull request to the Zephyr project!
-
-            Our Continuous Integration pipeline will execute a series of checks on your Pull Request
-            commit messages and code, and you are expected to address any failures by updating the PR.
-            Please take a look at [our commit message guidelines](https://docs.zephyrproject.org/latest/contribute/guidelines.html#commit-message-guidelines)
-            to find out how to format your commit messages, and at [our contribution workflow](https://docs.zephyrproject.org/latest/contribute/guidelines.html#contribution-workflow)
-            to understand how to update your Pull Request.
-            If you haven't already, please make sure to review the project's [Contributor
-            Expectations](https://docs.zephyrproject.org/latest/contribute/contributor_expectations.html)
-            and update (by amending and force-pushing the commits) your pull request if necessary.
-
-            If you are stuck or need help please join us on [Discord](https://chat.zephyrproject.org/)
-            and ask your question there. Additionally, you can [escalate the review](https://docs.zephyrproject.org/latest/contribute/contributor_expectations.html#pr-review-escalation)
-            when applicable. 😊
-
-          pr-merged-message: >
-            Hi @${{ github.event.pull_request.user.login }}!
-
-            Congratulations on getting your very first Zephyr pull request merged 🎉🥳. This is a
-            fantastic achievement, and we're thrilled to have you as part of our community!
-
-
-            To celebrate this milestone and showcase your contribution, we'd love to award you the
-            Zephyr Technical Contributor badge. If you're interested, please claim your badge by
-            filling out this form: [Claim Your Zephyr Badge](https://forms.gle/oCw9iAPLhUsHTapc8).
-
-
-            Thank you for your valuable input, and we look forward to seeing more of your
-            contributions in the future! 🪁

.github/workflows/hello_world_multiplatform.yaml

@@ -1,79 +0,0 @@
-name: Hello World (Multiplatform)
-
-on:
-  push:
-    branches:
-      - main
-      - v*-branch
-      - collab-*
-  pull_request:
-    branches:
-      - main
-      - v*-branch
-      - collab-*
-    paths:
-      - 'scripts/build/**'
-      - 'scripts/requirements*.txt'
-      - '.github/workflows/hello_world_multiplatform.yaml'
-      - 'SDK_VERSION'
-
-concurrency:
-  group: ${{ github.workflow }}-${{ github.event_name }}-${{ github.head_ref || github.ref }}
-  cancel-in-progress: true
-
-jobs:
-  build:
-    strategy:
-      fail-fast: false
-      matrix:
-        os: [ubuntu-22.04, ubuntu-24.04, macos-13, macos-14, windows-2022]
-    runs-on: ${{ matrix.os }}
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-        with:
-          path: zephyr
-          fetch-depth: 0
-
-      - name: Rebase
-        if: github.event_name == 'pull_request'
-        env:
-          BASE_REF: ${{ github.base_ref }}
-          PR_HEAD: ${{ github.event.pull_request.head.sha }}
-        working-directory: zephyr
-        shell: bash
-        run: |
-          git config --global user.email "actions@zephyrproject.org"
-          git config --global user.name "Github Actions"
-          git rebase origin/${BASE_REF}
-          git log --graph --oneline HEAD...${PR_HEAD}
-
-      - name: Set up Python
-        uses: actions/setup-python@v5
-        with:
-          python-version: 3.11
-
-      - name: Setup Zephyr project
-        uses: zephyrproject-rtos/action-zephyr-setup@v1
-        with:
-          app-path: zephyr
-          toolchains: all
-
-      - name: Build firmware
-        working-directory: zephyr
-        shell: bash
-        run: |
-          if [ "${{ runner.os }}" = "macOS" ]; then
-            EXTRA_TWISTER_FLAGS="-P native_sim --build-only"
-          elif [ "${{ runner.os }}" = "Windows" ]; then
-            EXTRA_TWISTER_FLAGS="-P native_sim --short-build-path -O/tmp/twister-out"
-          fi
-          ./scripts/twister --force-color --inline-logs -T samples/hello_world -v $EXTRA_TWISTER_FLAGS
-
-      - name: Upload artifacts
-        if: failure()
-        uses: actions/upload-artifact@v4
-        with:
-          if-no-files-found: ignore
-          path:
-            zephyr/twister-out/*/samples/hello_world/sample.basic.helloworld/build.log

.github/workflows/issue_count.yml

@@ -1,8 +1,8 @@
 name: Issue Tracker
 
 on:
-  schedule:
-  - cron: '*/10 * * * *'
+  issues:
+    types: [opened, labeled, closed]
 
 env:
   OUTPUT_FILE_NAME: IssuesReport.md
@@ -14,20 +14,18 @@ env:
 jobs:
   track-issues:
     name: "Collect Issue Stats"
-    runs-on: ubuntu-22.04
-    if: github.repository == 'zephyrproject-rtos/zephyr'
+    runs-on: ubuntu-latest
 
     steps:
     - name: Download configuration file
       run: |
-        wget -q https://raw.githubusercontent.com/$GITHUB_REPOSITORY/main/.github/workflows/issues-report-config.json
+        wget -q https://raw.githubusercontent.com/$GITHUB_REPOSITORY/master/.github/workflows/issues-report-config.json
 
     - name: install-packages
       run: |
-        sudo apt-get update
         sudo apt-get install discount
 
-    - uses: brcrista/summarize-issues@v4
+    - uses: brcrista/summarize-issues@v3
       with:
         title: 'Issues Report for ${{ github.repository }}'
         configPath: 'issues-report-config.json'
@@ -35,20 +33,21 @@ jobs:
         token: ${{ secrets.GITHUB_TOKEN }}
 
     - name: upload-stats
-      uses: actions/upload-artifact@v4
-      continue-on-error: true
+      uses: actions/upload-artifact@master
+      continue-on-error: True
       with:
         name: ${{ env.OUTPUT_FILE_NAME }}
         path: ${{ env.OUTPUT_FILE_NAME }}
 
     - name: Configure AWS Credentials
-      uses: aws-actions/configure-aws-credentials@v4
+      uses: aws-actions/configure-aws-credentials@v1
       with:
-        aws-access-key-id: ${{ vars.AWS_TESTING_ACCESS_KEY_ID }}
-        aws-secret-access-key: ${{ secrets.AWS_TESTING_SECRET_ACCESS_KEY }}
+        aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID_TESTING }}
+        aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY_TESTING }}
         aws-region: us-east-1
 
     - name: Post Results
       run: |
         mkd2html IssuesReport.md IssuesReport.html
         aws s3 cp --quiet IssuesReport.html s3://testing.zephyrproject.org/issues/$GITHUB_REPOSITORY/index.html
+

.github/workflows/labeler.yml

@@ -0,0 +1,12 @@
+name: 'Pull Request Labeler'
+on:
+  - pull_request_target
+
+jobs:
+  labeler:
+    name: Pull Request Labeler
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/labeler@v2.1.1
+        with:
+          repo-token: '${{ secrets.GITHUB_TOKEN }}'

.github/workflows/license_check.yml

@@ -4,20 +4,18 @@ on: [pull_request]
 
 jobs:
   scancode_job:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest
     name: Scan code for licenses
     steps:
     - name: Checkout the code
-      uses: actions/checkout@v4
-      with:
-        fetch-depth: 0
+      uses: actions/checkout@v1
     - name: Scan the code
       id: scancode
-      uses: zephyrproject-rtos/action_scancode@v4
+      uses: zephyrproject-rtos/action_scancode@v3
       with:
         directory-to-scan: 'scan/'
     - name: Artifact Upload
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v1
       with:
         name: scancode
         path: ./artifacts

.github/workflows/manifest.yml

@@ -1,39 +1,29 @@
 name: Manifest
 on:
   pull_request_target:
+    paths:
+      - 'west.yml'
 
 jobs:
   contribs:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest
     name: Manifest
     steps:
       - name: Checkout the code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v2
         with:
           path: zephyrproject/zephyr
           ref: ${{ github.event.pull_request.head.sha }}
           fetch-depth: 0
           persist-credentials: false
 
-      - name: west setup
-        env:
-          BASE_REF: ${{ github.base_ref }}
-        working-directory: zephyrproject/zephyr
-        run: |
-          pip3 install west
-          git config --global user.email "you@example.com"
-          git config --global user.name "Your Name"
-          west init -l . || true
-
       - name: Manifest
-        uses: zephyrproject-rtos/action-manifest@v1.3.1
+        uses: zephyrproject-rtos/action-manifest@main
         with:
-          github-token: ${{ secrets.ZB_GITHUB_TOKEN }}
+          github-token: ${{ secrets.GITHUB_TOKEN }}
           manifest-path: 'west.yml'
           checkout-path: 'zephyrproject/zephyr'
-          use-tree-checkout: 'true'
-          check-impostor-commits: 'true'
           label-prefix: 'manifest-'
           verbosity-level: '1'
-          labels: 'manifest'
+          labels: 'manifest, west'
           dnm-labels: 'DNM'

.github/workflows/pylib_tests.yml

@@ -1,54 +0,0 @@
-# Copyright (c) 2023 Intel Corporation.
-# SPDX-License-Identifier: Apache-2.0
-
-name: Misc. Pylib Scripts TestSuite
-
-on:
-  push:
-    branches:
-    - main
-    - v*-branch
-    paths:
-    - 'scripts/pylib/build_helpers/**'
-    - '.github/workflows/pylib_tests.yml'
-  pull_request:
-    branches:
-    - main
-    - v*-branch
-    paths:
-    - 'scripts/pylib/build_helpers/**'
-    - '.github/workflows/pylib_tests.yml'
-
-jobs:
-  pylib-tests:
-    name: Misc. Pylib Unit Tests
-    runs-on: ${{ matrix.os }}
-    strategy:
-      matrix:
-        python-version: ['3.10', '3.11', '3.12']
-        os: [ubuntu-22.04]
-    steps:
-    - name: checkout
-      uses: actions/checkout@v4
-    - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v5
-      with:
-        python-version: ${{ matrix.python-version }}
-    - name: cache-pip-linux
-      if: startsWith(runner.os, 'Linux')
-      uses: actions/cache@v4
-      with:
-        path: ~/.cache/pip
-        key: ${{ runner.os }}-pip-${{ matrix.python-version }}
-        restore-keys: |
-          ${{ runner.os }}-pip-${{ matrix.python-version }}
-    - name: install-packages
-      run: |
-        pip3 install -r scripts/requirements-base.txt -r scripts/requirements-build-test.txt
-    - name: Run pytest for build_helpers
-      env:
-        ZEPHYR_BASE: ./
-        ZEPHYR_TOOLCHAIN_VARIANT: zephyr
-      run: |
-        echo "Run build_helpers tests"
-        PYTHONPATH=./scripts/tests pytest ./scripts/tests/build_helpers

.github/workflows/ready-to-merge.yml

@@ -1,28 +0,0 @@
-name: ready to merge
-
-on:
-  workflow_call:
-    inputs:
-      needs_context:
-        type: string
-        required: true
-
-jobs:
-  all_jobs_passed:
-    name: all jobs passed
-    runs-on: ubuntu-latest
-    steps:
-      - name: "Check status of all required jobs"
-        run: |-
-          NEEDS_CONTEXT='${{ inputs.needs_context }}'
-          JOB_IDS=$(echo "$NEEDS_CONTEXT" | jq -r 'keys[]')
-          for JOB_ID in $JOB_IDS; do
-            RESULT=$(echo "$NEEDS_CONTEXT" | jq -r ".[\"$JOB_ID\"].result")
-            echo "$JOB_ID job result: $RESULT"
-            if [[ $RESULT != "success" && $RESULT != "skipped" ]]; then
-              echo "***"
-              echo "Error: The $JOB_ID job did not pass."
-              exit 1
-            fi
-          done
-          echo "All jobs passed or were skipped."

.github/workflows/release.yml

@@ -4,21 +4,18 @@ on:
   push:
     tags:
       - 'v*'
-      - '!v*rc*'
 
 jobs:
   release:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v2
         with:
           fetch-depth: 0
 
       - name: Get the version
         id: get_version
-        run: |
-          echo "VERSION=${GITHUB_REF#refs/tags/}" >> $GITHUB_OUTPUT
-          echo "TRIMMED_VERSION=${GITHUB_REF#refs/tags/v}" >> $GITHUB_OUTPUT
+        run: echo ::set-output name=VERSION::${GITHUB_REF#refs/tags/}
 
       - name: REUSE Compliance Check
         uses: fsfe/reuse-action@v1
@@ -26,15 +23,19 @@ jobs:
           args: spdx -o zephyr-${{ steps.get_version.outputs.VERSION }}.spdx
 
       - name: upload-results
-        uses: actions/upload-artifact@v4
-        continue-on-error: true
+        uses: actions/upload-artifact@master
+        continue-on-error: True
         with:
           name: zephyr-${{ steps.get_version.outputs.VERSION }}.spdx
           path: zephyr-${{ steps.get_version.outputs.VERSION }}.spdx
 
-      - name: Create empty release notes body
+      - name: Get Diff since last tag
         run: |
-          echo "TODO: add release overview and notes link" > release-notes.txt
+          oldtag=$(git describe --abbrev=0 ${{ github.ref }}^)
+          echo "Changes since ${oldtag}:" > release-notes.txt
+          echo "" >> release-notes.txt
+          echo "" >> release-notes.txt
+          git shortlog ${oldtag}..${{ github.ref }} >> release-notes.txt
 
       - name: Create Release
         id: create_release
@@ -43,7 +44,7 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           tag_name: ${{ github.ref }}
-          release_name: Zephyr ${{ steps.get_version.outputs.TRIMMED_VERSION }}
+          release_name: Zephyr ${{ github.ref }}
           body_path: release-notes.txt
           draft: true
           prerelease: true

.github/workflows/scorecards.yml

@@ -1,61 +0,0 @@
-# This workflow uses actions that are not certified by GitHub. They are provided
-# by a third-party and are governed by separate terms of service, privacy
-# policy, and support documentation.
-
-name: Scorecards supply-chain security
-on:
-  # For Branch-Protection check. Only the default branch is supported. See
-  # https://github.com/ossf/scorecard/blob/main/docs/checks.md#branch-protection
-  branch_protection_rule:
-  # To guarantee Maintained check is occasionally updated. See
-  # https://github.com/ossf/scorecard/blob/main/docs/checks.md#maintained
-  schedule:
-    - cron: '43 7 * * 6'
-  push:
-    branches:
-      - main
-
-permissions: read-all
-
-jobs:
-  analysis:
-    name: Scorecard analysis
-    runs-on: ubuntu-latest
-    permissions:
-      # Needed for Code scanning upload
-      security-events: write
-      # Needed for GitHub OIDC token if publish_results is true
-      id-token: write
-
-    steps:
-      - name: "Checkout code"
-        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
-        with:
-          persist-credentials: false
-
-      - name: "Run analysis"
-        uses: ossf/scorecard-action@62b2cac7ed8198b15735ed49ab1e5cf35480ba46 # v2.4.0
-        with:
-          results_file: results.sarif
-          results_format: sarif
-          # Publish results to OpenSSF REST API for easy access by consumers.
-          # - Allows the repository to include the Scorecard badge.
-          # - See https://github.com/ossf/scorecard-action#publishing-results.
-          publish_results: true
-
-      # Upload the results as artifacts (optional). Commenting out will disable
-      # uploads of run results in SARIF format to the repository Actions tab.
-      # https://docs.github.com/en/actions/advanced-guides/storing-workflow-data-as-artifacts
-      - name: "Upload artifact"
-        uses: actions/upload-artifact@89ef406dd8d7e03cfd12d9e0a4a378f454709029 # v4.3.5
-        with:
-          name: SARIF file
-          path: results.sarif
-          retention-days: 5
-
-      # Upload the results to GitHub's code scanning dashboard (optional).
-      # Commenting out will disable upload of results to your repo's Code Scanning dashboard
-      - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@afb54ba388a7dca6ecae48f608c4ff05ff4cc77a # v3.25.15
-        with:
-          sarif_file: results.sarif

.github/workflows/scripts_tests.yml

@@ -1,71 +0,0 @@
-# Copyright 2023 Google LLC
-# SPDX-License-Identifier: Apache-2.0
-
-name: Scripts tests
-
-on:
-  push:
-    branches:
-      - main
-      - v*-branch
-    paths:
-      - 'scripts/build/**'
-      - '.github/workflows/scripts_tests.yml'
-  pull_request:
-    branches:
-      - main
-      - v*-branch
-    paths:
-      - 'scripts/build/**'
-      - '.github/workflows/scripts_tests.yml'
-
-jobs:
-  scripts-tests:
-    name: Scripts tests
-    runs-on: ${{ matrix.os }}
-    strategy:
-      matrix:
-        python-version: ['3.10', '3.11', '3.12']
-        os: [ubuntu-20.04]
-    steps:
-      - name: checkout
-        uses: actions/checkout@v4
-        with:
-          ref: ${{ github.event.pull_request.head.sha }}
-          fetch-depth: 0
-
-      - name: Rebase
-        continue-on-error: true
-        env:
-          BASE_REF: ${{ github.base_ref }}
-          PR_HEAD: ${{ github.event.pull_request.head.sha }}
-        run: |
-          git config --global user.email "actions@zephyrproject.org"
-          git config --global user.name "Github Actions"
-          git rebase origin/${BASE_REF}
-          git log --graph --oneline HEAD...${PR_HEAD}
-
-      - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v5
-        with:
-          python-version: ${{ matrix.python-version }}
-
-      - name: cache-pip-linux
-        if: startsWith(runner.os, 'Linux')
-        uses: actions/cache@v4
-        with:
-          path: ~/.cache/pip
-          key: ${{ runner.os }}-pip-${{ matrix.python-version }}
-          restore-keys: |
-            ${{ runner.os }}-pip-${{ matrix.python-version }}
-
-      - name: install-packages
-        run: |
-          pip3 install -r scripts/requirements-base.txt -r scripts/requirements-build-test.txt
-
-      - name: Run pytest
-        env:
-          ZEPHYR_BASE: ./
-        run: |
-          echo "Run script tests"
-          pytest ./scripts/build

.github/workflows/stale-workflow-queue-cleanup.yml

@@ -1,28 +0,0 @@
-name: Stale Workflow Queue Cleanup
-
-on:
-  workflow_dispatch:
-    branches: [main]
-  schedule:
-  # everyday at 15:00
-  - cron: '0 15 * * *'
-
-concurrency:
-  group: stale-workflow-queue-cleanup
-  cancel-in-progress: true
-
-jobs:
-  cleanup:
-    name: Cleanup
-    runs-on: ubuntu-22.04
-
-    steps:
-    - name: Delete stale queued workflow runs
-      uses: MajorScruffy/delete-old-workflow-runs@v0.3.0
-      with:
-        repository: ${{ github.repository }}
-        # Remove any workflow runs in "queued" state for more than 1 day
-        older-than-seconds: 86400
-        status: queued
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/stale_issue.yml

@@ -6,23 +6,18 @@ on:
 jobs:
   stale:
     name: Find Stale issues and PRs
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest
     if: github.repository == 'zephyrproject-rtos/zephyr'
     steps:
-    - uses: actions/stale@v8
+    - uses: actions/stale@v3
       with:
-        stale-pr-message: 'This pull request has been marked as stale because it has been open (more
-          than) 60 days with no activity. Remove the stale label or add a comment saying that you
-          would like to have the label removed otherwise this pull request will automatically be
-          closed in 14 days. Note, that you can always re-open a closed pull request at any time.'
-        stale-issue-message: 'This issue has been marked as stale because it has been open (more
-          than) 60 days with no activity. Remove the stale label or add a comment saying that you
-          would like to have the label removed otherwise this issue will automatically be closed in
-          14 days. Note, that you can always re-open a closed issue at any time.'
+        repo-token: ${{ secrets.GITHUB_TOKEN }}
+        stale-pr-message: 'This pull request has been marked as stale because it has been open (more than) 60 days with no activity. Remove the stale label or add a comment saying that you would like to have the label removed otherwise this pull request will automatically be closed in 14 days. Note, that you can always re-open a closed pull request at any time.'
+        stale-issue-message: 'This issue has been marked as stale because it has been open (more than) 60 days with no activity. Remove the stale label or add a comment saying that you would like to have the label removed otherwise this issue will automatically be closed in 14 days. Note, that you can always re-open a closed issue at any time.'
         days-before-stale: 60
         days-before-close: 14
         stale-issue-label: 'Stale'
         stale-pr-label: 'Stale'
         exempt-pr-labels: 'Blocked,In progress'
-        exempt-issue-labels: 'In progress,Enhancement,Feature,Feature Request,RFC,Meta,Process,Coverity'
+        exempt-issue-labels: 'In progress,Enhancement,Feature,Feature Request,RFC,Meta'
         operations-per-run: 400

.github/workflows/stats_merged_prs.yml

@@ -1,24 +0,0 @@
-name: Merged PR stats
-
-on:
-  pull_request_target:
-    branches:
-      - main
-      - v*-branch
-    types: [closed]
-jobs:
-  record_merged:
-    if: github.event.pull_request.merged == true && github.repository == 'zephyrproject-rtos/zephyr'
-    runs-on: ubuntu-22.04
-    steps:
-      - name: checkout
-        uses: actions/checkout@v4
-      - name: PR event
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          ELASTICSEARCH_KEY: ${{ secrets.ELASTICSEARCH_KEY }}
-          ELASTICSEARCH_SERVER: "https://elasticsearch.zephyrproject.io:443"
-          PR_STAT_ES_INDEX: ${{ vars.PR_STAT_ES_INDEX }}
-        run: |
-          pip3 install pygithub elasticsearch
-          python3 ./scripts/ci/stats/merged_prs.py --pull-request ${{ github.event.pull_request.number }} --repo ${{ github.repository }}

.github/workflows/twister.yaml

@@ -1,372 +0,0 @@
-name: Run tests with twister
-
-on:
-  push:
-    branches:
-      - main
-      - v*-branch
-      - collab-*
-  pull_request_target:
-    branches:
-      - main
-      - v*-branch
-      - collab-*
-  schedule:
-    # Run at 03:00 UTC on every Sunday
-    - cron: '0 3 * * 0'
-
-concurrency:
-  group: ${{ github.workflow }}-${{ github.event_name }}-${{ github.head_ref || github.ref }}
-  cancel-in-progress: true
-
-jobs:
-  twister-build-prep:
-    if: github.repository_owner == 'zephyrproject-rtos'
-    runs-on:
-      group: zephyr-runner-v2-linux-x64-4xlarge
-    container:
-      image: ghcr.io/zephyrproject-rtos/ci-repo-cache:v0.26.14.20240823
-      options: '--entrypoint /bin/bash'
-    outputs:
-      subset: ${{ steps.output-services.outputs.subset }}
-      size: ${{ steps.output-services.outputs.size }}
-      fullrun: ${{ steps.output-services.outputs.fullrun }}
-    env:
-      MATRIX_SIZE: 10
-      PUSH_MATRIX_SIZE: 20
-      DAILY_MATRIX_SIZE: 80
-      BSIM_OUT_PATH: /opt/bsim/
-      BSIM_COMPONENTS_PATH: /opt/bsim/components
-      TESTS_PER_BUILDER: 700
-      COMMIT_RANGE: ${{ github.event.pull_request.base.sha }}..${{ github.event.pull_request.head.sha }}
-      BASE_REF: ${{ github.base_ref }}
-    steps:
-      - name: Apply container owner mismatch workaround
-        run: |
-          # FIXME: The owner UID of the GITHUB_WORKSPACE directory may not
-          #        match the container user UID because of the way GitHub
-          #        Actions runner is implemented. Remove this workaround when
-          #        GitHub comes up with a fundamental fix for this problem.
-          git config --global --add safe.directory ${GITHUB_WORKSPACE}
-
-      - name: Print cloud service information
-        run: |
-          echo "ZEPHYR_RUNNER_CLOUD_PROVIDER = ${ZEPHYR_RUNNER_CLOUD_PROVIDER}"
-          echo "ZEPHYR_RUNNER_CLOUD_NODE = ${ZEPHYR_RUNNER_CLOUD_NODE}"
-          echo "ZEPHYR_RUNNER_CLOUD_POD = ${ZEPHYR_RUNNER_CLOUD_POD}"
-
-      - name: Clone cached Zephyr repository
-        if: github.event_name == 'pull_request_target'
-        continue-on-error: true
-        run: |
-          git clone --shared /repo-cache/zephyrproject/zephyr .
-          git remote set-url origin ${GITHUB_SERVER_URL}/${GITHUB_REPOSITORY}
-
-      - name: Checkout
-        if: github.event_name == 'pull_request_target'
-        uses: actions/checkout@v4
-        with:
-          ref: ${{ github.event.pull_request.head.sha }}
-          fetch-depth: 0
-          persist-credentials: false
-
-      - name: Environment Setup
-        if: github.event_name == 'pull_request_target'
-        run: |
-          git config --global user.email "bot@zephyrproject.org"
-          git config --global user.name "Zephyr Bot"
-          rm -fr ".git/rebase-apply"
-          git rebase origin/${BASE_REF}
-          git log  --pretty=oneline | head -n 10
-          west init -l . || true
-          west config manifest.group-filter -- +ci,+optional
-          west config --global update.narrow true
-          west update --path-cache /repo-cache/zephyrproject 2>&1 1> west.update.log || west update --path-cache /repo-cache/zephyrproject 2>&1 1> west.update.log || ( rm -rf ../modules ../bootloader ../tools && west update --path-cache /repo-cache/zephyrproject)
-          west forall -c 'git reset --hard HEAD'
-
-          echo "ZEPHYR_SDK_INSTALL_DIR=/opt/toolchains/zephyr-sdk-$( cat SDK_VERSION )" >> $GITHUB_ENV
-
-      - name: Generate Test Plan with Twister
-        if: github.event_name == 'pull_request_target'
-        id: test-plan
-        run: |
-          export ZEPHYR_BASE=${PWD}
-          export ZEPHYR_TOOLCHAIN_VARIANT=zephyr
-          python3 ./scripts/ci/test_plan.py -c origin/${BASE_REF}.. --pull-request -t $TESTS_PER_BUILDER
-          if [ -s .testplan ]; then
-            cat .testplan >> $GITHUB_ENV
-          else
-            echo "TWISTER_NODES=${MATRIX_SIZE}" >> $GITHUB_ENV
-          fi
-          rm -f testplan.json .testplan
-
-      - name: Determine matrix size
-        id: output-services
-        run: |
-          if [ "${{github.event_name}}" = "pull_request_target" ]; then
-            if [ -n "${TWISTER_NODES}" ]; then
-              subset="[$(seq -s',' 1 ${TWISTER_NODES})]"
-            else
-              subset="[$(seq -s',' 1 ${MATRIX_SIZE})]"
-            fi
-            size=${TWISTER_NODES}
-          elif [ "${{github.event_name}}" = "push" ]; then
-            subset="[$(seq -s',' 1 ${PUSH_MATRIX_SIZE})]"
-            size=${MATRIX_SIZE}
-          elif [ "${{github.event_name}}" = "schedule" -a "${{github.repository}}" = "zephyrproject-rtos/zephyr" ]; then
-            subset="[$(seq -s',' 1 ${DAILY_MATRIX_SIZE})]"
-            size=${DAILY_MATRIX_SIZE}
-          else
-            size=0
-          fi
-          echo "subset=${subset}" >> $GITHUB_OUTPUT
-          echo "size=${size}" >> $GITHUB_OUTPUT
-          echo "fullrun=${TWISTER_FULL}" >> $GITHUB_OUTPUT
-
-  twister-build:
-    runs-on:
-      group: zephyr-runner-v2-linux-x64-4xlarge
-    needs: twister-build-prep
-    if: needs.twister-build-prep.outputs.size != 0
-    container:
-      image: ghcr.io/zephyrproject-rtos/ci-repo-cache:v0.26.14.20240823
-      options: '--entrypoint /bin/bash'
-    strategy:
-      fail-fast: false
-      matrix:
-        subset: ${{fromJSON(needs.twister-build-prep.outputs.subset)}}
-    timeout-minutes: 1440
-    env:
-      CCACHE_DIR: /node-cache/ccache-zephyr
-      CCACHE_REMOTE_STORAGE: "redis://cache-*.keydb-cache.svc.cluster.local|shards=1,2,3"
-      CCACHE_REMOTE_ONLY: "true"
-      # `--specs` is ignored because ccache is unable to resolve the toolchain specs file path.
-      CCACHE_IGNOREOPTIONS: '--specs=*'
-      BSIM_OUT_PATH: /opt/bsim/
-      BSIM_COMPONENTS_PATH: /opt/bsim/components
-      TWISTER_COMMON: ' --force-color --inline-logs -v -N -M --retry-failed 3 --timeout-multiplier 2 '
-      DAILY_OPTIONS: ' -M --build-only --all --show-footprint'
-      PR_OPTIONS: ' --clobber-output --integration'
-      PUSH_OPTIONS: ' --clobber-output -M --show-footprint'
-      COMMIT_RANGE: ${{ github.event.pull_request.base.sha }}..${{ github.event.pull_request.head.sha }}
-      BASE_REF: ${{ github.base_ref }}
-    steps:
-      - name: Print cloud service information
-        run: |
-          echo "ZEPHYR_RUNNER_CLOUD_PROVIDER = ${ZEPHYR_RUNNER_CLOUD_PROVIDER}"
-          echo "ZEPHYR_RUNNER_CLOUD_NODE = ${ZEPHYR_RUNNER_CLOUD_NODE}"
-          echo "ZEPHYR_RUNNER_CLOUD_POD = ${ZEPHYR_RUNNER_CLOUD_POD}"
-
-      - name: Apply container owner mismatch workaround
-        run: |
-          # FIXME: The owner UID of the GITHUB_WORKSPACE directory may not
-          #        match the container user UID because of the way GitHub
-          #        Actions runner is implemented. Remove this workaround when
-          #        GitHub comes up with a fundamental fix for this problem.
-          git config --global --add safe.directory ${GITHUB_WORKSPACE}
-
-      - name: Clone cached Zephyr repository
-        continue-on-error: true
-        run: |
-          git clone --shared /repo-cache/zephyrproject/zephyr .
-          git remote set-url origin ${GITHUB_SERVER_URL}/${GITHUB_REPOSITORY}
-
-      - name: Checkout
-        uses: actions/checkout@v4
-        with:
-          ref: ${{ github.event.pull_request.head.sha }}
-          fetch-depth: 0
-          persist-credentials: false
-
-      - name: Environment Setup
-        run: |
-          if [ "${{github.event_name}}" = "pull_request_target" ]; then
-            git config --global user.email "bot@zephyrproject.org"
-            git config --global user.name "Zephyr Builder"
-            rm -fr ".git/rebase-apply"
-            git rebase origin/${BASE_REF}
-            git log  --pretty=oneline | head -n 10
-          fi
-          echo "$HOME/.local/bin" >> $GITHUB_PATH
-          echo "$HOME/.cargo/bin" >> $GITHUB_PATH
-
-          west init -l . || true
-          west config manifest.group-filter -- +ci,+optional
-          west config --global update.narrow true
-          west update --path-cache /repo-cache/zephyrproject 2>&1 1> west.update.log || west update --path-cache /repo-cache/zephyrproject 2>&1 1> west.update.log || ( rm -rf ../modules ../bootloader ../tools && west update --path-cache /repo-cache/zephyrproject)
-          west forall -c 'git reset --hard HEAD'
-
-          echo "ZEPHYR_SDK_INSTALL_DIR=/opt/toolchains/zephyr-sdk-$( cat SDK_VERSION )" >> $GITHUB_ENV
-
-      - name: Check Environment
-        run: |
-          cmake --version
-          gcc --version
-          cargo --version
-          rustup target list --installed
-          ls -la
-          echo "github.ref: ${{ github.ref }}"
-          echo "github.base_ref: ${{ github.base_ref }}"
-          echo "github.ref_name: ${{ github.ref_name }}"
-
-      - name: Set up ccache
-        run: |
-          mkdir -p ${CCACHE_DIR}
-          ccache -M 10G
-          ccache -p
-          ccache -z -s -vv
-
-      - name: Update BabbleSim to manifest revision
-        run: |
-          export BSIM_VERSION=$( west list bsim -f {revision} )
-          echo "Manifest points to bsim sha $BSIM_VERSION"
-          cd /opt/bsim_west/bsim
-          git fetch -n origin ${BSIM_VERSION}
-          git -c advice.detachedHead=false checkout ${BSIM_VERSION}
-          west update
-          make everything -s -j 8
-
-      - if: github.event_name == 'push'
-        name: Run Tests with Twister (Push)
-        run: |
-          export ZEPHYR_BASE=${PWD}
-          export ZEPHYR_TOOLCHAIN_VARIANT=zephyr
-          ./scripts/twister --subset ${{matrix.subset}}/${{ strategy.job-total }} ${TWISTER_COMMON} ${PUSH_OPTIONS}
-          if [ "${{matrix.subset}}" = "1" ]; then
-            ./scripts/zephyr_module.py --twister-out module_tests.args
-            if [ -s module_tests.args ]; then
-              ./scripts/twister +module_tests.args --outdir module_tests ${TWISTER_COMMON} ${PUSH_OPTIONS}
-            fi
-          fi
-
-      - if: github.event_name == 'pull_request_target'
-        name: Run Tests with Twister (Pull Request)
-        run: |
-          rm -f testplan.json
-          export ZEPHYR_BASE=${PWD}
-          export ZEPHYR_TOOLCHAIN_VARIANT=zephyr
-          python3 ./scripts/ci/test_plan.py -c origin/${BASE_REF}.. --pull-request
-          ./scripts/twister --subset ${{matrix.subset}}/${{ strategy.job-total }} --load-tests testplan.json ${TWISTER_COMMON} ${PR_OPTIONS}
-          if [ "${{matrix.subset}}" = "1" -a ${{needs.twister-build-prep.outputs.fullrun}} = 'True' ]; then
-            ./scripts/zephyr_module.py --twister-out module_tests.args
-            if [ -s module_tests.args ]; then
-              ./scripts/twister +module_tests.args --outdir module_tests ${TWISTER_COMMON} ${PR_OPTIONS}
-            fi
-          fi
-
-      - if: github.event_name == 'schedule'
-        name: Run Tests with Twister (Daily)
-        run: |
-          export ZEPHYR_BASE=${PWD}
-          export ZEPHYR_TOOLCHAIN_VARIANT=zephyr
-          ./scripts/twister --subset ${{matrix.subset}}/${{ strategy.job-total }} ${TWISTER_COMMON} ${DAILY_OPTIONS}
-          if [ "${{matrix.subset}}" = "1" ]; then
-            ./scripts/zephyr_module.py --twister-out module_tests.args
-            if [ -s module_tests.args ]; then
-              ./scripts/twister +module_tests.args --outdir module_tests ${TWISTER_COMMON} ${DAILY_OPTIONS}
-            fi
-          fi
-
-      - name: Print ccache stats
-        if: always()
-        run: |
-          ccache -s -vv
-
-      - name: Upload Unit Test Results
-        if: always()
-        uses: actions/upload-artifact@v4
-        with:
-          name: Unit Test Results (Subset ${{ matrix.subset }})
-          if-no-files-found: ignore
-          path: |
-            twister-out/twister.xml
-            twister-out/twister.json
-            module_tests/twister.xml
-            testplan.json
-
-      - if: matrix.subset == 1 && github.event_name == 'push'
-        name: Save the list of Python packages
-        shell: bash
-        run: |
-          FREEZE_FILE="frozen-requirements.txt"
-          timestamp="$(date)"
-          version="$(git describe --abbrev=12 --always)"
-          echo -e "# Generated at $timestamp ($version)\n" > $FREEZE_FILE
-          pip3 freeze | tee -a $FREEZE_FILE
-
-      - if: matrix.subset == 1 && github.event_name == 'push'
-        name: Upload the list of Python packages
-        uses: actions/upload-artifact@v4
-        with:
-          name: Frozen PIP package set
-          path: |
-            frozen-requirements.txt
-
-  twister-test-results:
-    name: "Publish Unit Tests Results"
-    env:
-      ELASTICSEARCH_KEY: ${{ secrets.ELASTICSEARCH_KEY }}
-      ELASTICSEARCH_SERVER: "https://elasticsearch.zephyrproject.io:443"
-    needs: twister-build
-    runs-on: ubuntu-22.04
-    # the build-and-test job might be skipped, we don't need to run this job then
-    if: success() || failure()
-
-    steps:
-      # Needed for opensearch and upload script
-      - if: github.event_name == 'push' || github.event_name == 'schedule'
-        name: Checkout
-        uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-          persist-credentials: false
-
-      - name: Download Artifacts
-        uses: actions/download-artifact@v4
-        with:
-          path: artifacts
-
-      - if: github.event_name == 'push' || github.event_name == 'schedule'
-        name: Upload to opensearch
-        run: |
-          pip3 install elasticsearch
-          # set run date on upload to get consistent and unified data across the matrix.
-          run_date=`date --iso-8601=minutes`
-          if [ "${{github.event_name}}" = "push" ]; then
-            python3 ./scripts/ci/upload_test_results_es.py -r ${run_date} \
-              --index zephyr-main-ci-push-1 artifacts/*/*/twister.json
-          elif [ "${{github.event_name}}" = "schedule" ]; then
-            python3 ./scripts/ci/upload_test_results_es.py -r ${run_date} \
-              --index zephyr-main-ci-weekly-1 artifacts/*/*/twister.json
-          fi
-
-      - name: Merge Test Results
-        run: |
-          pip3 install junitparser junit2html
-          junitparser merge artifacts/*/*/twister.xml junit.xml
-          junit2html junit.xml junit.html
-
-      - name: Upload Unit Test Results in HTML
-        if: always()
-        uses: actions/upload-artifact@v4
-        with:
-          name: HTML Unit Test Results
-          if-no-files-found: ignore
-          path: |
-            junit.html
-
-      - name: Publish Unit Test Results
-        uses: EnricoMi/publish-unit-test-result-action@v2
-        with:
-          check_name: Unit Test Results
-          files: "**/twister.xml"
-          comment_mode: off
-  twister-status-check:
-    if: always()
-    name: "Check Twister Status"
-    needs:
-      - twister-build-prep
-      - twister-build
-    uses: ./.github/workflows/ready-to-merge.yml
-    with:
-      needs_context: ${{ toJson(needs) }}

.github/workflows/twister_tests.yml

@@ -5,26 +5,17 @@ name: Twister TestSuite
 
 on:
   push:
-    branches:
-    - main
-    - v*-branch
-    - collab-*
     paths:
-    - 'scripts/pylib/**'
+    - 'scripts/pylib/twister/**'
     - 'scripts/twister'
     - 'scripts/tests/twister/**'
     - '.github/workflows/twister_tests.yml'
-    - 'scripts/schemas/twister/'
   pull_request:
-    branches:
-    - main
-    - v*-branch
     paths:
-    - 'scripts/pylib/**'
+    - 'scripts/pylib/twister/**'
     - 'scripts/twister'
     - 'scripts/tests/twister/**'
     - '.github/workflows/twister_tests.yml'
-    - 'scripts/schemas/twister/'
 
 jobs:
   twister-tests:
@@ -32,18 +23,18 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        python-version: ['3.10', '3.11', '3.12']
-        os: [ubuntu-22.04]
+        python-version: [3.6, 3.7, 3.8]
+        os: [ubuntu-latest]
     steps:
     - name: checkout
-      uses: actions/checkout@v4
+      uses: actions/checkout@v2
     - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v5
+      uses: actions/setup-python@v1
       with:
         python-version: ${{ matrix.python-version }}
     - name: cache-pip-linux
       if: startsWith(runner.os, 'Linux')
-      uses: actions/cache@v4
+      uses: actions/cache@v1
       with:
         path: ~/.cache/pip
         key: ${{ runner.os }}-pip-${{ matrix.python-version }}
@@ -51,19 +42,11 @@ jobs:
           ${{ runner.os }}-pip-${{ matrix.python-version }}
     - name: install-packages
       run: |
-        pip3 install -r scripts/requirements-base.txt -r scripts/requirements-build-test.txt -r scripts/requirements-run-test.txt
-    - name: Run pytest for twisterlib
+        pip3 install pytest colorama pyyaml ply mock
+    - name: Run pytest
       env:
         ZEPHYR_BASE: ./
         ZEPHYR_TOOLCHAIN_VARIANT: zephyr
       run: |
         echo "Run twister tests"
         PYTHONPATH=./scripts/tests pytest ./scripts/tests/twister
-    - name: Run pytest for pytest-twister-harness
-      env:
-        ZEPHYR_BASE: ./
-        ZEPHYR_TOOLCHAIN_VARIANT: zephyr
-        PYTHONPATH: ./scripts/pylib/pytest-twister-harness/src:${PYTHONPATH}
-      run: |
-        echo "Run twister tests"
-        pytest ./scripts/pylib/pytest-twister-harness/tests

.github/workflows/twister_tests_blackbox.yml

@@ -1,79 +0,0 @@
-# Copyright (c) 2023 Intel Corporation.
-# SPDX-License-Identifier: Apache-2.0
-
-name: Twister BlackBox TestSuite
-
-on:
-  pull_request:
-    branches:
-    - main
-    - collab-*
-    - v*-branch
-    paths:
-    - 'scripts/pylib/twister/**'
-    - 'scripts/twister'
-    - 'scripts/tests/twister_blackbox/**'
-    - '.github/workflows/twister_tests_blackbox.yml'
-
-jobs:
-  twister-tests:
-    name: Twister Black Box Tests
-    runs-on: ${{ matrix.os }}
-    strategy:
-      matrix:
-        python-version: ['3.10', '3.11', '3.12']
-        os: [ubuntu-22.04]
-    container:
-      image: ghcr.io/zephyrproject-rtos/ci:v0.26.13
-
-    steps:
-    - name: Apply Container Owner Mismatch Workaround
-      run: |
-        # FIXME: The owner UID of the GITHUB_WORKSPACE directory may not
-        #        match the container user UID because of the way GitHub
-        #        Actions runner is implemented. Remove this workaround when
-        #        GitHub comes up with a fundamental fix for this problem.
-        git config --global --add safe.directory ${GITHUB_WORKSPACE}
-
-    - name: Checkout
-      uses: actions/checkout@v4
-
-    - name: Environment Setup
-      run: |
-        echo "$HOME/.local/bin" >> $GITHUB_PATH
-
-        west init -l . || true
-        # we do not depend on any hals, tools or bootloader, save some time and space...
-        west config manifest.group-filter -- -hal,-tools,-bootloader
-        west config --global update.narrow true
-        west update --path-cache /github/cache/zephyrproject 2>&1 1> west.update.log || west update --path-cache /github/cache/zephyrproject 2>&1 1> west.update.log || ( rm -rf ../modules ../bootloader ../tools && west update --path-cache /github/cache/zephyrproject)
-        west forall -c 'git reset --hard HEAD'
-
-        echo "ZEPHYR_SDK_INSTALL_DIR=/opt/toolchains/zephyr-sdk-$( cat SDK_VERSION )" >> $GITHUB_ENV
-
-    - name: Set Up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v5
-      with:
-        python-version: ${{ matrix.python-version }}
-
-    - name: Go Into Venv
-      shell: bash
-      run: |
-        python3 -m pip install --user virtualenv
-        python3 -m venv env
-        source env/bin/activate
-        echo "$(which python)"
-
-    - name: Install Packages
-      run: |
-        python3 -m pip install -U -r scripts/requirements-base.txt -r scripts/requirements-build-test.txt -r scripts/requirements-run-test.txt
-
-    - name: Run Pytest For Twister Black Box Tests
-      shell: bash
-      env:
-        ZEPHYR_BASE: ./
-        ZEPHYR_TOOLCHAIN_VARIANT: zephyr
-      run: |
-        echo "Run twister tests"
-        source zephyr-env.sh
-        PYTHONPATH="./scripts/tests" pytest ./scripts/tests/twister_blackbox

.github/workflows/west_cmds.yml

@@ -5,19 +5,11 @@ name: Zephyr West Command Tests
 
 on:
   push:
-    branches:
-    - main
-    - v*-branch
-    - collab-*
     paths:
     - 'scripts/west-commands.yml'
     - 'scripts/west_commands/**'
     - '.github/workflows/west_cmds.yml'
   pull_request:
-    branches:
-    - main
-    - v*-branch
-    - collab-*
     paths:
     - 'scripts/west-commands.yml'
     - 'scripts/west_commands/**'
@@ -29,23 +21,18 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        python-version: ['3.10', '3.11', '3.12']
-        os: [ubuntu-22.04, macos-14, windows-2022]
-        exclude:
-        - os: macos-14
-          python-version: 3.6
-        - os: windows-2022
-          python-version: 3.6
+        python-version: [3.6, 3.7, 3.8]
+        os: [ubuntu-latest, macos-latest, windows-latest]
     steps:
     - name: checkout
-      uses: actions/checkout@v4
+      uses: actions/checkout@v2
     - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v5
+      uses: actions/setup-python@v1
       with:
         python-version: ${{ matrix.python-version }}
     - name: cache-pip-linux
       if: startsWith(runner.os, 'Linux')
-      uses: actions/cache@v4
+      uses: actions/cache@v1
       with:
         path: ~/.cache/pip
         key: ${{ runner.os }}-pip-${{ matrix.python-version }}
@@ -53,7 +40,7 @@ jobs:
           ${{ runner.os }}-pip-${{ matrix.python-version }}
     - name: cache-pip-mac
       if: startsWith(runner.os, 'macOS')
-      uses: actions/cache@v4
+      uses: actions/cache@v1
       with:
         path: ~/Library/Caches/pip
         # Trailing '-' was just to get a different cache name
@@ -62,7 +49,7 @@ jobs:
           ${{ runner.os }}-pip-${{ matrix.python-version }}-
     - name: cache-pip-win
       if: startsWith(runner.os, 'Windows')
-      uses: actions/cache@v4
+      uses: actions/cache@v1
       with:
         path: ~\AppData\Local\pip\Cache
         key: ${{ runner.os }}-pip-${{ matrix.python-version }}
@@ -71,7 +58,7 @@ jobs:
     - name: install pytest
       run: |
         pip3 install wheel
-        pip3 install pytest west pyelftools canopen natsort progress mypy intelhex psutil ply pyserial
+        pip3 install pytest west pyelftools canopen progress mypy intelhex psutil
     - name: run pytest-win
       if: runner.os == 'Windows'
       run: |

.gitignore

@@ -7,15 +7,9 @@
 *.swp
 *.swo
 *~
-
-# Emacs
-\#*\#
-
 build*/
-!doc/build/
-!scripts/build
+!doc/guides/build
 !tests/drivers/build_all
-!scripts/pylib/build_helpers
 cscope.*
 .dir
 
@@ -29,8 +23,6 @@ outdir
 outdir-*
 scripts/basic/fixdep
 scripts/gen_idt/gen_idt
-coverage-report
-doc-coverage.info
 doc/_build
 doc/doxygen
 doc/xml
@@ -41,10 +33,7 @@ doc/latex
 doc/themes/zephyr-docs-theme
 sanity-out*
 twister-out*
-bsim_out
 bsim_bt_out
-myresults.xml
-tests/RunResults.xml
 scripts/grub
 doc/reference/kconfig/*.rst
 doc/doc.warnings
@@ -53,27 +42,6 @@ doc/doc.warnings
 .envrc
 .vscode
 hide-defaults-note
-venv
-.venv
-.DS_Store
-.clangd
-new.info
-
-# Cargo drops lock files in projects to capture resolved dependencies.
-# We don't want to record these.
-Cargo.lock
-
-# Cargo encourages a .cargo/config.toml file to symlink to a generated
-# file.  Don't save these.
-.cargo/
-
-# Normal west builds will place the Rust target directory under the build directory.  However,
-# sometimes IDEs and such will litter these target directories as well.
-target/
-
-# CI output
-compliance.xml
-_error.types
 
 # Tag files
 GPATH
@@ -83,24 +51,3 @@ TAGS
 tags
 
 .idea
-
-# from check_compliance.py
-BinaryFiles.txt
-BoardYml.txt
-Checkpatch.txt
-ClangFormat.txt
-DevicetreeBindings.txt
-GitDiffCheck.txt
-Gitlint.txt
-Identity.txt
-ImageSize.txt
-Kconfig.txt
-KconfigBasic.txt
-KconfigBasicNoModules.txt
-KconfigHWMv2.txt
-KeepSorted.txt
-MaintainersFormat.txt
-ModulesMaintainers.txt
-Nits.txt
-Pylint.txt
-YAMLLint.txt

.gitlint

@@ -1,14 +1,10 @@
 # All these sections are optional, edit this file as you like.
-# Zephyr-specific defaults are located in scripts/gitlint/zephyr_commit_rules.py
 [general]
 ignore=title-trailing-punctuation, T3, title-max-length, T1, body-hard-tab, B3, B1
 # verbosity should be a value between 1 and 3, the commandline -v flags take precedence over this
 verbosity = 3
 # By default gitlint will ignore merge commits. Set to 'false' to disable.
-ignore-merge-commits=false
-ignore-revert-commits=false
-ignore-fixup-commits=false
-ignore-squash-commits=false
+ignore-merge-commits=true
 # Enable debug mode (prints more output). Disabled by default
 debug = false
 
@@ -17,16 +13,16 @@ debug = false
 extra-path=scripts/gitlint
 
 [title-max-length-no-revert]
-# line-length=75
+line-length=75
 
 [body-min-line-count]
-# min-line-count=1
+min-line-count=1
 
 [body-max-line-count]
-# max-line-count=200
+max-line-count=200
 
 [title-starts-with-subsystem]
-regex = ^(?!subsys:)(?!treewide:)(([^:]+):)(\s([^:]+):)*\s(.+)$
+regex = ^(?!subsys:)(([^:]+):)(\s([^:]+):)*\s(.+)$
 
 [title-must-not-contain-word]
 # Comma-separated list of words that should not occur in the title. Matching is case
@@ -43,7 +39,7 @@ words=wip
 
 [max-line-length-with-exceptions]
 # B1 = body-max-line-length
-# line-length=75
+line-length=72
 
 [body-min-length]
 min-length=3

.known-issues/README

@@ -0,0 +1,55 @@
+This directory contains configuration files to ignore errors found in
+the build and test process which are known to the developers and for
+now can be safely ignored.
+
+To use:
+
+ $ cd zephyr
+ $ make SOMETHING >& result
+ $ scripts/filter-known-issues.py result
+
+It is included in the source tree so if anyone has to submit anything
+that triggers some kind of error that is a false positive, it can
+include the "ignore me" file, properly documented.
+
+Each file can contain one or more multiline Python regular expressions
+(https://docs.python.org/2/library/re.html#regular-expression-syntax)
+that match an error message. Multiple regular expressions are
+separated by comment blocks (that start with #). Note that an empty
+line still is considered part of the multiline regular expression.
+
+For example
+
+---beginning---
+#
+# This testcase always fails, pending fix ZEP-1234
+#
+.*/tests/kernel/grumpy .* FAIL
+#
+# Documentation issue, masks:
+#
+# /home/e/inaky/z/kernel.git/doc/api/io_interfaces.rst:28: WARNING: Invalid definition: Expected identifier in nested name. [error at 19]
+#  struct dev_config::@65  dev_config::bits
+#  -------------------^
+#
+^(?P<filename>.+/doc/api/io_interfaces.rst):(?P<lineno>[0-9]+): WARNING: Invalid definition: Expected identifier in nested name. \[error at [0-9]+]
+^\s+struct dev_config::@[0-9]+  dev_config::bits.*
+^\s+-+\^
+---end---
+
+Note you want to:
+
+- use relateive paths; instead of
+  /home/me/mydir/zephyr/something/somewhere.c you will want
+  ^.*/something/somewhere.c (as they will depend on where it is being
+  built)
+
+- Replace line numbers with [0-9]+, as they will change
+
+- (?P<filename>[-._/\w]+/something/somewhere.c) saves the match on
+  that file path in a "variable" called 'filename' that later you can
+  match with (?P=filename) if you want to match multiple lines of the
+  same error message.
+
+Can get really twisted and interesting in terms of regexps; they are
+powerful, so start small :)

.known-issues/doc/duplicate.conf

@@ -0,0 +1,39 @@
+#
+^(?P<filename>([\-:\\/\w\.])+[/\\]doc[/\\]reference[/\\]file_system[/\\]index.rst):(?P<lineno>[0-9]+): WARNING: Duplicate C declaration, also defined at (.*)\.$
+^Declaration is \'.*\'\.$
+#
+^(?P<filename>([\-:\\/\w\.])+[/\\]doc[/\\]reference[/\\]peripherals[/\\]dma.rst):(?P<lineno>[0-9]+): WARNING: Duplicate C declaration, also defined at (.*)\.$
+^Declaration is \'.*\'\.$
+#
+^(?P<filename>([\-:\\/\w\.])+[/\\]doc[/\\]reference[/\\]audio[/\\]dmic.rst):(?P<lineno>[0-9]+): WARNING: Duplicate C declaration, also defined at (.*)\.$
+^Declaration is \'.*\'\.$
+#
+^(?P<filename>([\-:\\/\w\.])+[/\\]doc[/\\]reference[/\\]networking[/\\]net_if.rst):(?P<lineno>[0-9]+): WARNING: Duplicate C declaration, also defined at (.*)\.$
+^Declaration is \'.*\'\.$
+#
+^(?P<filename>([\-:\\/\w\.])+[/\\]doc[/\\]reference[/\\]networking[/\\]ieee802154.rst):(?P<lineno>[0-9]+): WARNING: Duplicate C declaration, also defined at (.*)\.$
+^Declaration is \'.*\'\.$
+#
+^(?P<filename>([\-:\\/\w\.])+[/\\]doc[/\\]reference[/\\]networking[/\\]sockets.rst):(?P<lineno>[0-9]+): WARNING: Duplicate C declaration, also defined at (.*)\.$
+^Declaration is \'.*\'\.$
+#
+^(?P<filename>([\-:\\/\w\.])+[/\\]doc[/\\]reference[/\\]bluetooth[/\\]uuid.rst):(?P<lineno>[0-9]+): WARNING: Duplicate C declaration, also defined at (.*)\.$
+^Declaration is \'.*\'\.$
+#
+^(?P<filename>([\-:\\/\w\.])+[/\\]doc[/\\]reference[/\\]bluetooth[/\\]sdp.rst):(?P<lineno>[0-9]+): WARNING: Duplicate C declaration, also defined at (.*)\.$
+^Declaration is \'.*\'\.$
+#
+^(?P<filename>([\-:\\/\w\.])+[/\\]doc[/\\]reference[/\\]bluetooth[/\\]rfcomm.rst):(?P<lineno>[0-9]+): WARNING: Duplicate C declaration, also defined at (.*)\.$
+^Declaration is \'.*\'\.$
+#
+^(?P<filename>([\-:\\/\w\.])+[/\\]doc[/\\]reference[/\\]bluetooth[/\\]hci_raw.rst):(?P<lineno>[0-9]+): WARNING: Duplicate C declaration, also defined at (.*)\.$
+^Declaration is \'.*\'\.$
+#
+^(?P<filename>([\-:\\/\w\.])+[/\\]doc[/\\]reference[/\\]bluetooth[/\\]hci_drivers.rst):(?P<lineno>[0-9]+): WARNING: Duplicate C declaration, also defined at (.*)\.$
+^Declaration is \'.*\'\.$
+#
+^(?P<filename>([\-:\\/\w\.])+[/\\]doc[/\\]reference[/\\]bluetooth[/\\]gatt.rst):(?P<lineno>[0-9]+): WARNING: Duplicate C declaration, also defined at (.*)\.$
+^Declaration is \'.*\'\.$
+#
+^(?P<filename>([\-:\\/\w\.])+[/\\]doc[/\\]reference[/\\]bluetooth[/\\]gap.rst):(?P<lineno>[0-9]+): WARNING: Duplicate C declaration, also defined at (.*)\.$
+^Declaration is \'.*\'\.$

.known-issues/doc/misc.conf

@@ -0,0 +1,14 @@
+# multiple section 'index'
+^(?P<filename>([\-:\\/\w\.])+[/\\]doc[/\\]custom-doxygen[/\\]mainpage.md):[0-9]+: warning: multiple use of section label 'index' for main page, \(first occurrence: .*$
+#
+^(?P<filename>([\-:\\/\w\.])+[/\\]doc[/\\]reference[/\\]bluetooth[/\\]gatt.rst):(?P<lineno>[0-9]+): WARNING: Error in declarator$
+^[ \t]*If.*:$
+^[ \t]*Invalid C declaration: .* \[error at [0-9]+\]$
+^[ \t]*ATOMIC_DEFINE.*$
+^[- \t]*\^$
+^[ \t]*If.*:$
+^[ \t]*Error in declarator or parameters$
+^[ \t]*Invalid C declaration: .* \[error at [0-9]+\]$
+^[ \t]*ATOMIC_DEFINE.*$
+^[- \t]*\^$
+^[ \t]*$

.known-issues/make.conf

@@ -0,0 +1,6 @@
+#
+# When filtering output of the build process, ignore lines that don't
+# provide any information that helps the invoker tell if there was an
+# error.
+#
+^make: (Entering|Leaving) directory .*

.known-issues/testcases/block.conf

@@ -0,0 +1,11 @@
+#
+# When executing test cases, ignore the following messages as they are
+# not to be considered hard errors.
+#
+# Block line when test case cannot run in the HW due to server or connection issues
+#
+^BLCK0/[-a-z0-9:]+	(.+)#test @[^/]+/[^:]+:[^:]+: evaluation blocked(.*)$
+#
+# Block line when there is an issue with the YKUSH serial connection
+#
+^BLCK0/[-a-z0-9:]+	(.+)#test @[^/]+/(?P<board>[^:]+):[^:]+: exception: 400: (?P=board): Cannot find YKUSH serial '[A-Z0-9]+'$

.known-issues/testcases/makefile.conf

@@ -0,0 +1,18 @@
+#
+# When executing test cases under TCF, ignore the following messages
+# as they are not to be considered hard errors.
+#
+# TCF is run under make for taking advantage of the jobserver; when
+# the testcase execution fail, make will complain, which we can
+# ignore ('sommersault' was the old name of the target).
+#
+^/tmp/tcf-[a-zA-Z0-9]+.mk:[0-9]+: recipe for target ('tcf-jobserver-run'|'sommersault') failed$
+#
+# More of the same
+#
+^make: \*\*\* \[(tcf-jobserver-run|sommersault)\] Error 1$
+#
+# TCF's summary line. We don't need to consider it to determine if the
+# run failed or passed.
+#
+^[A-Z]+0/\S+:\s+\S+\s+@\S+: [0-9]+ tests \([0-9]+ passed, [0-9]+ failed, [0-9]+ blocked, [0-9]+ skipped\).*$

.known-issues/testcases/skip.conf

@@ -0,0 +1,4 @@
+#
+# Skip line when test case is eliminated due to filters
+#
+^SKIP0/\S+\s+\S+: No targets can be used \(all [0-9]+ selected from [0-9]+ available eliminated by testcase filtering\)$

.mailmap

@@ -1,122 +1,32 @@
-Alexandr Kolosov <rikorsev@gmail.com>
-Alexandre d'Alton <alexandre.dalton@intel.com>
+Dirk Brandewie <dirk.j.brandewie@intel.com> <dirk.j.brandewie@intel.com>
+Mike Hirst <michael.hirst@windriver.com> <michael.hirst@windriver.com>
+Johan Kruger <johan.kruger@windriver.com> <johan.kruger@windriver.com>
+Leona Cook <leonax.cook@intel.com> <lsc@hackeress.com>
+Leona Cook <leonax.cook@intel.com> <leonax.cook@intel.com>
+Thomas Heeley <thomas.heeley@intel.com> <thomas.heeley@intel.com>
+Shuang He <shuang.he@intel.com> <shuang.he@intel.com>
+Chuck Jordan <cjordan@synopsys.com> <cjordan@synopsys.com>
+Jeremie Garcia <jeremie.garcia@intel.com> <jeremie.garcia@intel.com>
+Bit Pathe <bitpathe@gmail.com> <bitpathe@gmail.com>
+Carles Cufi <carles.cufi@nordicsemi.no> <carles.cufi@nordicsemi.no>
+Kuo-Lang Tseng <kuo-lang.tseng@intel.com> <kuo-lang.tseng@intel.com>
+Gerardo Aceves <gerardo.aceves@intel.com> <gerardo.aceves@intel.com>
+Evan Couzens <evanx.couzens@intel.com> <evanx.couzens@intel.com>
+Lei Liu <lei.a.liu@intel.com> <lei.a.liu@intel.com>
+Douglas Su <d0u9.su@outlook.com> <d0u9.su@outlook.com>
+Keren Siman-Tov <keren.siman-tov@intel.com> <keren.siman-tov@intel.com>
+Naga Raja Rao Tulasi <tulasi.r@tcs.com> <tulasi.r@tcs.com>
+Felipe Neves <ryukokki.felipe@gmail.com> <ryukokki.felipe@gmail.com>
 Amir Kaplan <amir.kaplan@intel.com> <amir.kaplan@intel.com>
 Anas Nashif <anas.nashif@intel.com> <anas.nashif@intel.com>
-Andrzej Kuroś <andrzej.kuros@nordicsemi.no>
-Anthony Smigielski <thebasti0ncode@gmail.com>
-Armand Ciejak <armand@riedonetworks.com>  <armandciejak@users.noreply.github.com>
-Aska Wu <aska.wu@linaro.org>
-Bit Pathe <bitpathe@gmail.com> <bitpathe@gmail.com>
-Bjarki Arge Andreasen <baa@trackunit.com>
-Carles Cufi <carles.cufi@nordicsemi.no> <carles.cufi@nordicsemi.no>
-chao an <anchao@xiaomi.com>
-Charles E. Youse <charles.youse@intel.com>
-Chen Xingyu <hi@xingrz.me>
-Christoph Schnetzler <christoph.schnetzler@husqvarnagroup.com>
-Christoph Schramm <schramm@makaio.com>
-Christopher Friedt <cfriedt@meta.com>
-Christopher Friedt <cfriedt@meta.com> <cfriedt@fb.com>
-Chuck Jordan <cjordan@synopsys.com> <cjordan@synopsys.com>
-Chunlin Han <chunlin.han@linaro.org> <chunlin.han@acer.com>
-David B. Kinder <david.b.kinder@intel.com>
-David Komel <a8961713@gmail.com>
-David Leach <david.leach@nxp.com>
-Dirk Brandewie <dirk.j.brandewie@intel.com> <dirk.j.brandewie@intel.com>
-Douglas Su <d0u9.su@outlook.com> <d0u9.su@outlook.com>
-Enjia Mai <enjia.mai@intel.com>
-Enjia Mai <enjia.mai@intel.com> <enjiax.mai@intel.com>
-Evan Couzens <evanx.couzens@intel.com> <evanx.couzens@intel.com>
-Evgeniy Paltsev <PaltsevEvgeniy@gmail.com>
-Evgeniy Paltsev <PaltsevEvgeniy@gmail.com> <Eugeniy.Paltsev@synopsys.com>
-Felipe Neves <ryukokki.felipe@gmail.com> <ryukokki.felipe@gmail.com>
-Findlay Feng <i@fengch.me>
-Flavio Arieta Netto <flavio@exati.com.br>
-Francois Ramu <francois.ramu@st.com>
-Gerardo Aceves <gerardo.aceves@intel.com> <gerardo.aceves@intel.com>
-Gregory Shue <gregory.shue@legrand.com>
-Gregory Shue <gregory.shue@legrand.com> <gregory.shue@legrand.us>
-HaiLong Yang <cameledyang@pm.me>
-James Johnson <james.johnson672@t-mobile.com>
-Jarno Lämsä <jarno.lamsa@nordicsemi.no>
-Jędrzej Ciupis <jedrzej.ciupis@nordicsemi.no>
-Jeremie Garcia <jeremie.garcia@intel.com> <jeremie.garcia@intel.com>
-Jim Benjamin Luther <jilu@oticon.com>
-Johan Kruger <johan.kruger@windriver.com> <johan.kruger@windriver.com>
-Johann Fischer <j.fischer@phytec.de>
-Jørgen Kvalvaag <jorgen.kvalvaag@nordicsemi.no>
-Juan Manuel Cruz Alcaraz <juan.m.cruz.alcaraz@intel.com>
-Juan Solano <juanx.solano.menacho@intel.com>
-Julien D'Ascenzio <julien.dascenzio@paratronic.fr>
-Jun Li <jun.r.li@intel.com>
-Justin Watson <jwatson5@gmail.com>
-Kamil Sroka <kamil.sroka@nordicsemi.no>
-Katarzyna Giądła <katarzyna.giadla@nordicsemi.no>
-Keren Siman-Tov <keren.siman-tov@intel.com> <keren.siman-tov@intel.com>
-Krzysztof Chruściński <krzysztof.chruscinski@nordicsemi.no>
-Kuo-Lang Tseng <kuo-lang.tseng@intel.com> <kuo-lang.tseng@intel.com>
-Lei Liu <lei.a.liu@intel.com> <lei.a.liu@intel.com>
-Leona Cook <leonax.cook@intel.com> <leonax.cook@intel.com>
-Leona Cook <leonax.cook@intel.com> <lsc@hackeress.com>
-Lixin Guo <lixinx.guo@intel.com>
-Łukasz Mazur <lukasz.mazur@hidglobal.com>
-Manuel Argüelles <manuel.arguelles@nxp.com>
-Manuel Argüelles <manuel.arguelles@nxp.com> <manuel.arguelles@coredumplabs.com>
-Manuel Argüelles <manuel.arguelles@nxp.com> <marguelles.dev@gmail.com>
-Marc Herbert <marc.herbert@intel.com> <46978960+marc-hb@users.noreply.github.com>
-Marin Jurjević <marin.jurjevic@hotmail.com>
-Mariusz Ryndzionek <mariusz.ryndzionek@firmwave.com>
-Mariusz Skamra <mariusz.skamra@codecoup.pl>
-Mariusz Skamra <mariusz.skamra@codecoup.pl> <mariusz.skamra@tieto.com>
-Martí Bolívar <marti.bolivar@nordicsemi.no>
-Martí Bolívar <marti.bolivar@nordicsemi.no> <marti.bolivar@linaro.org>
-Martí Bolívar <marti.bolivar@nordicsemi.no> <marti.f.bolivar@gmail.com>
-Martí Bolívar <marti.bolivar@nordicsemi.no> <marti@foundries.io>
-Martí Bolívar <marti.bolivar@nordicsemi.no> <marti@opensourcefoundries.com>
-Martin Jäger <martin@libre.solar>  <17674105+martinjaeger@users.noreply.github.com>
-Mateusz Hołenko <mholenko@antmicro.com>
-Michael Rosen <michael.r.rosen@intel.com>
-Michal Narajowski <michal.narajowski@codecoup.pl>
-Mike Hirst <michael.hirst@windriver.com> <michael.hirst@windriver.com>
-Ming Shao <ming.shao@intel.com>
-Mohan Kumar Kumar <mohankm@fb.com>
-Naga Raja Rao Tulasi <tulasi.r@tcs.com> <tulasi.r@tcs.com>
-Navin Sankar Velliangiri <navin@linumiz.com>
-NingX Zhao <ningx.zhao@intel.com>
-Nishikant Nayak <nishikantax.nayak@intel.com>
-Ole Sæther <ole.saether@nordicsemi.no>
-Pavel Král <pavel.kral@omsquare.com>
-Pavel Vasilyev <pavel.vasilyev@nordicsemi.no>
-Paweł Czarnecki <pczarnecki@antmicro.com>
-Paweł Czarnecki <pczarnecki@antmicro.com>
-Paweł Czarnecki <pczarnecki@antmicro.com> <pczarnecki@internships.antmicro.com>
-Paweł Kwiek <pawel.kwiek@nordicsemi.no>
-Peng Chen <peng1.chen@intel.com>
-Peter Bigot <peter.bigot@nordicsemi.no>
-Peter Bigot <peter.bigot@nordicsemi.no> <pab@pabigot.com>
-Peter Johanson <peter@peterjohanson.com>
-Piyush Itankar <piyush.t.itankar@intel.com>
-Radosław Koppel <radoslaw.koppel@nordicsemi.no>
-Radosław Koppel <radoslaw.koppel@nordicsemi.no> <r.koppel@k-el.com>
-Raja D. Singh <rdsingh@iotwizards.com>
-Ricardo Salveti <ricardo@opensourcefoundries.com>
-Ricardo Salveti <ricardo@opensourcefoundries.com> <ricardo.salveti@linaro.org>
 Ruud Derwig <Ruud.Derwig@synopsys.com> <Ruud.Derwig@synopsys.com>
-Saku Rautio <saku.rautio@nordicsemi.no>
-Scott Worley <scott.worley@microchip.com>
-Sean Nyekjaer <sean@geanix.com> <sean.nyekjaer@prevas.dk>
-Sean Nyekjaer <sean@geanix.com> <sean@nyekjaer.dk>
-Sharron Liu <sharron.liu@intel.com>
-Shilpashree L C <shilpashree.lc@intel.com>
-Shuang He <shuang.he@intel.com> <shuang.he@intel.com>
-Sigvart Hovland <sigvart.hovland@nordicsemi.no>
-Stéphane D'Alu <sdalu@sdalu.com>
-Stine Åkredalen <stine.akredalen@nordicsemi.no>
-Thomas Heeley <thomas.heeley@intel.com> <thomas.heeley@intel.com>
-Tim Sørensen <tims@demant.com>
-Tim Sørensen <tims@demant.com> <tims@oticon.com>
-Vinayak Kariappa Chettimada <vinayak.kariappa.chettimada@nordicsemi.no> <vinayak.kariappa.chettimada@nordicsemi.no> <vich@nordicsemi.no> <vinayak.kariappa@gmail.com>
+Flavio Arieta Netto <flavio@exati.com.br>
+Nishikant Nayak <nishikantax.nayak@intel.com>
+Justin Watson <jwatson5@gmail.com>
+Johann Fischer <j.fischer@phytec.de>
+Jun Li <jun.r.li@intel.com>
 Xiaorui Hu <xiaorui.hu@linaro.org>
 Yannis Damigos <giannis.damigos@gmail.com> <ydamigos@iccs.gr>
-Yonattan Louise <yonattan.a.louise.mendoza@intel.com>
-Yonattan Louise <yonattan.a.louise.mendoza@intel.com> <yonattan.a.louise.mendoza@linux.intel.com>
-YouhuaX Zhu <youhuax.zhu@intel.com>
+Vinayak Kariappa Chettimada <vinayak.kariappa.chettimada@nordicsemi.no> <vinayak.kariappa.chettimada@nordicsemi.no> <vich@nordicsemi.no> <vinayak.kariappa@gmail.com>
+Sean Nyekjaer <sean@geanix.com> <sean.nyekjaer@prevas.dk>
+Sean Nyekjaer <sean@geanix.com> <sean@nyekjaer.dk>

.uncrustify.cfg

@@ -0,0 +1,80 @@
+indent_with_tabs    = 2     # 1=indent to level only, 2=indent with tabs
+input_tab_size      = 8     # original tab size
+output_tab_size     = 8     # new tab size
+indent_columns      = output_tab_size
+indent_label        = 1     # pos: absolute col, neg: relative column
+indent_switch_case  = 0     # number
+
+#
+# inter-symbol newlines
+#
+
+nl_enum_brace       = remove    # "enum {" vs "enum \n {"
+nl_union_brace      = remove    # "union {" vs "union \n {"
+nl_struct_brace     = remove    # "struct {" vs "struct \n {"
+nl_do_brace         = remove    # "do {" vs "do \n {"
+nl_if_brace         = remove    # "if () {" vs "if () \n {"
+nl_for_brace        = remove    # "for () {" vs "for () \n {"
+nl_else_brace       = remove    # "else {" vs "else \n {"
+nl_while_brace      = remove    # "while () {" vs "while () \n {"
+nl_switch_brace     = remove    # "switch () {" vs "switch () \n {"
+nl_brace_while      = remove    # "} while" vs "} \n while" - cuddle while
+nl_brace_else       = remove    # "} \n else" vs "} else"
+nl_func_var_def_blk = 1
+nl_fcall_brace      = remove    # "list_for_each() {" vs "list_for_each()\n{"
+nl_fdef_brace       = add       # "int foo() {" vs "int foo()\n{"
+
+#
+# Source code modifications
+#
+
+mod_paren_on_return = ignore    # "return 1;" vs "return (1);"
+mod_full_brace_if   = add       # "if() { } else { }" vs "if() else"
+
+#
+# inter-character spacing options
+#
+
+sp_sizeof_paren     = remove    # "sizeof (int)" vs "sizeof(int)"
+sp_before_sparen    = force     # "if (" vs "if("
+sp_after_sparen     = force     # "if () {" vs "if (){"
+sp_inside_braces    = add       # "{ 1 }" vs "{1}"
+sp_inside_braces_struct = add   # "{ 1 }" vs "{1}"
+sp_inside_braces_enum   = add   # "{ 1 }" vs "{1}"
+sp_assign           = add
+sp_arith            = add
+sp_bool             = add
+sp_compare          = add
+sp_assign           = add
+sp_after_comma      = add
+sp_func_def_paren   = remove    # "int foo (){" vs "int foo(){"
+sp_func_call_paren  = remove    # "foo (" vs "foo("
+sp_func_proto_paren = remove    # "int foo ();" vs "int foo();"
+sp_inside_fparen    = remove    # "func( arg )" vs "func(arg)"
+sp_else_brace       = add       # ignore/add/remove/force
+sp_before_ptr_star  = add       # ignore/add/remove/force
+sp_after_ptr_star   = remove    # ignore/add/remove/force
+sp_between_ptr_star = remove    # ignore/add/remove/force
+sp_inside_paren     = remove    # remove spaces inside parens
+sp_paren_paren      = remove    # remove spaces between nested parens
+sp_inside_sparen    = remove    # remove spaces inside parens for if, while and the like
+sp_brace_else       = add       # ignore/add/remove/force
+sp_before_nl_cont   = ignore
+sp_cmt_cpp_start    = add
+sp_brace_typedef    = add       # }typedefd_name -> } typedefd_name
+
+cmt_sp_after_star_cont          = 1
+#
+# Aligning stuff
+#
+
+align_with_tabs     = FALSE     # use tabs to align
+align_on_tabstop    = TRUE      # align on tabstops
+align_enum_equ_span = 4         # '=' in enum definition
+align_struct_init_span  = 0     # align stuff in a structure init '= { }'
+align_right_cmt_span    = 3
+align_nl_cont	    = TRUE
+
+
+
+sp_pp_concat                              = ignore      # ignore/add/remove/force

.yamllint

@@ -1,16 +0,0 @@
-# SPDX-License-Identifier: Apache-2.0
-
-extends: default
-
-rules:
-  line-length:
-    max: 100
-  comments:
-    min-spaces-from-content: 1
-  indentation:
-    spaces: 2
-    indent-sequences: consistent
-  document-start:
-    present: false
-  truthy:
-    check-keys: false

CODEOWNERS

@@ -11,38 +11,65 @@
 # add others as needed.
 
 # Do not use wildcard on all source yet
-#
-# +++++++++++ NOTE ++++++++++++++++
-#
-# Please use the MAINTAINERS file to add yourself in an area or to add a new
-# component or code. This file is going to be deprecated and currently only had
-# entries that are not covered by the MAINTAINERS file.
+# *                                        @galak @nashif
 
-/soc/arm/aspeed/                          @aspeeddylan
-/soc/atmel/                               @nandojve
+/.known-issues/                           @nashif
+/.github/				  @nashif
+/.github/workflows/                       @galak @nashif
+/.buildkite/				  @galak
+/MAINTAINERS.yml                          @ioannisg @MaureenHelm
+/arch/arc/                                @abrodkin @ruuddw
+/arch/arm/                                @MaureenHelm @galak @ioannisg
+/arch/arm/core/aarch32/cortex_m/cmse/     @ioannisg
+/arch/arm/core/aarch64/                   @carlocaione
+/arch/arm/include/aarch32/cortex_m/cmse.h @ioannisg
+/arch/arm/include/aarch64/                @carlocaione
+/arch/arm/core/aarch32/cortex_a_r/        @MaureenHelm @galak @ioannisg @bbolen @stephanosio
+/arch/common/                             @ioannisg @andyross
+/soc/arc/snps_*/                          @abrodkin @ruuddw
+/soc/nios2/                               @nashif
+/soc/arm/                                 @MaureenHelm @galak @ioannisg
+/soc/arm/arm/mps2/                        @fvincenzo
+/soc/arm/atmel_sam/common/*_sam4l_*.c     @nandojve
+/soc/arm/atmel_sam/sam3x/                 @ioannisg
+/soc/arm/atmel_sam/sam4e/                 @nandojve
+/soc/arm/atmel_sam/sam4l/                 @nandojve
+/soc/arm/atmel_sam/sam4s/                 @fallrisk
+/soc/arm/atmel_sam/same70/                @nandojve
+/soc/arm/atmel_sam/samv71/                @nandojve
+/soc/arm/cypress/                         @nandojve
 /soc/arm/bcm*/                            @sbranden
-/soc/arm/ene/                             @ene-steven
-/soc/arm/infineon_cat1/                   @ifyall @npal-cy
 /soc/arm/infineon_xmc/                    @parthitce
+/soc/arm/nxp*/                            @MaureenHelm
+/soc/arm/nordic_nrf/                      @ioannisg
+/soc/arm/nuvoton/                         @ssekar15
+/soc/arm/nuvoton_npcx/                    @MulinChao
+/soc/arm/qemu_cortex_a53/                 @carlocaione
+/soc/arm/quicklogic_eos_s3/               @kowalewskijan @kgugala
 /soc/arm/silabs_exx32/efm32pg1b/          @rdmeneze
 /soc/arm/silabs_exx32/efr32mg21/          @l-alfred
+/soc/arm/st_stm32/                        @erwango
+/soc/arm/st_stm32/*/power.c               @FRASTM
 /soc/arm/st_stm32/stm32mp1/               @arnopo
-/soc/arm/st_stm32/stm32h7/*stm32h735*     @benediktibk
-/soc/arm/st_stm32/stm32l4/*stm32l451*     @benediktibk
 /soc/arm/ti_simplelink/cc13x2_cc26x2/     @bwitherspoon
 /soc/arm/ti_simplelink/cc32xx/            @vanti
 /soc/arm/ti_simplelink/msp432p4xx/        @Mani-Sadhasivam
-/soc/arm/xilinx_zynq7000/                 @ibirnbaum
 /soc/arm/xilinx_zynqmp/                   @stephanosio
-/soc/arm/renesas_rcar/                    @aaillet
-/soc/riscv/openisa*/                      @dleach02
-/soc/riscv/riscv-privileged/andes_v5/      @cwshu @kevinwang821020 @jimmyzhe
-/soc/riscv/riscv-privileged/neorv32/       @henrikbrixandersen
-/soc/riscv/riscv-privileged/gd32vf103/     @soburi
-/soc/starfive/jh71xx/ 			  @pfarwsi
-/soc/riscv/riscv-privileged/niosv/         @sweeaun
-/boards/adafruit/feather_nrf52840/        @jacobw
-/boards/ene/                              @ene-steven
+/soc/xtensa/intel_s1000/                  @sathishkuttan @dcpleung
+/arch/x86/                                @jhedberg @nashif @jenmwms @aasthagr
+/arch/nios2/                              @nashif
+/arch/posix/                              @aescolar @daor-oti
+/arch/riscv/                              @kgugala @pgielda
+/soc/posix/                               @aescolar @daor-oti
+/soc/riscv/                               @kgugala @pgielda
+/soc/riscv/openisa*/                      @MaureenHelm
+/soc/x86/                                 @dcpleung @nashif @jenmwms @aasthagr
+/arch/xtensa/                             @dcpleung @andyross @nashif
+/soc/xtensa/                              @dcpleung @andyross @nashif
+/arch/sparc/                              @martin-aberg
+/soc/sparc/                               @martin-aberg
+/boards/arc/                              @abrodkin @ruuddw
+/boards/arm/                              @MaureenHelm @galak
 /boards/arm/96b_argonkey/                 @avisconti
 /boards/arm/96b_avenger96/                @Mani-Sadhasivam
 /boards/arm/96b_carbon/                   @idlethread
@@ -51,439 +78,551 @@
 /boards/arm/96b_neonkey/                  @Mani-Sadhasivam
 /boards/arm/96b_stm32_sensor_mez/         @Mani-Sadhasivam
 /boards/arm/96b_wistrio/                  @Mani-Sadhasivam
-/boards/arm/acn52832/                     @sven-hm
-/boards/arm/arduino_mkrzero/              @soburi
-/boards/arm/bbc_microbit_v2/              @LingaoM
-/boards/arm/blackpill_f401ce/             @coderkalyan
-/boards/arm/blackpill_f411ce/             @coderkalyan
-/boards/arm/bt*10/                        @greg-leach
+/boards/arm/arduino_due/                  @ioannisg
 /boards/arm/cc1352r1_launchxl/            @bwitherspoon
 /boards/arm/cc26x2r1_launchxl/            @bwitherspoon
 /boards/arm/cc3220sf_launchxl/            @vanti
-/boards/arm/cy8ckit_062_ble/              @ifyall @npal-cy
-/boards/arm/cy8ckit_062s4/                @DaWei8823
-/boards/arm/cy8ckit_062_wifi_bt/          @ifyall @npal-cy
-/boards/arm/cy8cproto_062_4343w/          @ifyall @npal-cy
+/boards/arm/cy8*                          @nandojve
+/boards/arm/disco_l475_iot1/              @erwango
 /boards/arm/efm32pg_stk3401a/             @rdmeneze
 /boards/arm/faze/                         @mbittan @simonguinot
-/boards/arm/frdm*/                        @mmahadevan108 @dleach02
-/boards/arm/gd32*/                        @nandojve
+/boards/arm/frdm*/                        @MaureenHelm
+/boards/arm/frdm*/doc/                    @MaureenHelm @MeganHansen
 /boards/arm/google_*/                     @jackrosenthal
-/boards/arm/hexiwear*/                    @mmahadevan108 @dleach02
-/boards/arm/ip_k66f/                      @parthitce @lmajewski
-/boards/arm/legend/                       @mbittan @simonguinot
-/boards/arm/lpcxpresso*/                  @mmahadevan108 @dleach02
+/boards/arm/hexiwear*/                    @MaureenHelm
+/boards/arm/hexiwear*/doc/                @MaureenHelm @MeganHansen
+/boards/arm/ip_k66f/                      @parthitce
+/boards/arm/lpcxpresso*/                  @MaureenHelm
+/boards/arm/lpcxpresso*/doc/              @MaureenHelm @MeganHansen
 /boards/arm/mimx8mm_evk/                  @Mani-Sadhasivam
-/boards/arm/mimx8mm_phyboard_polis        @pefech
-/boards/arm/mimxrt*/                      @mmahadevan108 @dleach02
+/boards/arm/mimxrt*/                      @MaureenHelm
+/boards/arm/mimxrt*/doc/                  @MaureenHelm @MeganHansen
 /boards/arm/mps2_an385/                   @fvincenzo
 /boards/arm/msp_exp432p401r_launchxl/     @Mani-Sadhasivam
-/boards/arm/npcx7m6fb_evb/                @MulinChao @ChiHuaL
-/boards/arm/nrf*/                         @carlescufi @lemrey
+/boards/arm/npcx7m6fb_evb/                @MulinChao
+/boards/arm/nrf*/                         @carlescufi @lemrey @ioannisg
+/boards/arm/nucleo*/                      @erwango @ABOSTM @FRASTM
 /boards/arm/nucleo_f401re/                @idlethread
 /boards/arm/nuvoton_pfm_m487/             @ssekar15
-/boards/arm/qemu_cortex_a9/               @ibirnbaum
+/boards/arm/qemu_cortex_a53/              @carlocaione
 /boards/arm/qemu_cortex_r*/               @stephanosio
-/boards/arm/qemu_cortex_m*/               @ioannisg @stephanosio
-/boards/arm/quick_feather/                @fkokosinski @kgugala
-/boards/arm/rak4631_nrf52840/             @gpaquet85
+/boards/arm/qemu_cortex_m*/               @ioannisg
+/boards/arm/quick_feather/                @kowalewskijan @kgugala
 /boards/arm/rak5010_nrf52840/             @gpaquet85
-/boards/arm/rpi_pico/                     @yonsch
-/boards/arm/ronoth_lodev/                 @NorthernDean
 /boards/arm/xmc45_relax_kit/              @parthitce
-/boards/atmel/                            @nandojve
-/boards/arm/scobc_module1/                @yashi
+/boards/arm/sam4e_xpro/                   @nandojve
+/boards/arm/sam4l_ek/                     @nandojve
+/boards/arm/sam4s_xplained/               @fallrisk
+/boards/arm/sam_e70_xplained/             @nandojve
+/boards/arm/sam_v71_xult/                 @nandojve
 /boards/arm/v2m_beetle/                   @fvincenzo
 /boards/arm/olimexino_stm32/              @ydamigos
-/boards/arm/s32*/                         @manuargue
 /boards/arm/sensortile_box/               @avisconti
 /boards/arm/steval_fcu001v1/              @Navin-Sankar
 /boards/arm/stm32l1_disco/                @karlp
-/boards/arm/stm32h735g_disco/             @benediktibk
+/boards/arm/stm32*_disco/                 @erwango @ABOSTM @FRASTM
 /boards/arm/stm32f3_disco/                @ydamigos
-/boards/arm/rcar_*/                       @aaillet
-/boards/arm/ubx_bmd345eval_nrf52840/      @Navin-Sankar @brec-u-blox
-/boards/arm/nrf5340_audio_dk_nrf5340      @koffes @alexsven @erikrobstad @rick1082 @gWacey
-/boards/arm/stm32_min_dev/                @sidcha
-/boards/ezurio/*                          @rerickson1
-/boards/riscv/rv32m1_vega/                @dleach02
-/boards/riscv/adp_xc7k_ae350/             @cwshu @kevinwang821020 @jimmyzhe
-/boards/riscv/longan_nano/                @soburi
-/boards/riscv/neorv32/                    @henrikbrixandersen
-/boards/riscv/niosv*/                     @sweeaun
-/boards/riscv/sparkfun_red_v_things_plus/ @soburi
-/boards/riscv/stamp_c3/                   @soburi
-/boards/starfive/visionfive2/	 	  @kanakshilledar @pfarwsi
+/boards/arm/stm32*_eval/                  @erwango @ABOSTM @FRASTM
+/boards/common/                           @mbolivar-nordic
+/boards/deprecated.cmake                  @tejlmand
+/boards/nios2/                            @nashif
+/boards/nios2/altera_max10/               @nashif
+/boards/arm/stm32_min_dev/                @cbsiddharth
+/boards/posix/                            @aescolar @daor-oti
+/boards/posix/nrf52_bsim/                 @aescolar @wopu-ot
+/boards/riscv/                            @kgugala @pgielda
+/boards/riscv/rv32m1_vega/                @MaureenHelm
+/boards/shields/                          @erwango
 /boards/shields/atmel_rf2xx/              @nandojve
 /boards/shields/esp_8266/                 @nandojve
 /boards/shields/inventek_eswifi/          @nandojve
+/boards/x86/                              @dcpleung @nashif @jenmwms @aasthagr
+/boards/xtensa/                           @nashif @dcpleung
+/boards/xtensa/intel_s1000_crb/           @sathishkuttan @dcpleung
 /boards/xtensa/odroid_go/                 @ydamigos
-/boards/xtensa/nxp_adsp_imx8/             @iuliana-prodan @dbaluta
-/boards/xtensa/kincony_kc868_a32/         @bbilas
-/boards/arm64/qemu_cortex_a53/            @carlocaione
-/boards/arm64/bcm958402m2_a72/            @abhishek-brcm
-/boards/arm64/mimx8mm_evk/                @MrVan @JiafeiPan
-/boards/arm64/mimx8mp_evk/                @MrVan @JiafeiPan
-/boards/arm64/mimx8mn_evk/                @JiafeiPan
-/boards/arm64/mimx93_evk/                 @JiafeiPan
-/boards/arm64/nxp_ls1046ardb/             @JiafeiPan
-/boards/arm64/xenvm/                      @lorc @firscity
-/boards/arm64/fvp_baser_aemv8r/           @povergoing
-/boards/arm64/fvp_base_revc_2xaemv8a/     @carlocaione
-/boards/arm64/intel_socfpga_agilex_socdk/ @siclim @ngboonkhai
-/boards/arm64/intel_socfpga_agilex5_socdk/ @teikheng @gdengi
-/boards/arm64/rcar_*/                     @lorc @xakep-amatop
+/boards/sparc/                            @martin-aberg
 # All cmake related files
-/doc/develop/tools/coccinelle.rst                @himanshujha199640 @JuliaLawall
-/doc/services/device_mgmt/smp_protocol.rst  @de-nordic @nordicjm
-/doc/services/device_mgmt/smp_groups/       @de-nordic @nordicjm
-/doc/services/sensing/                      @lixuzha @ghu0510 @qianruh
+/cmake/                                   @tejlmand @nashif
+/cmake/*/arcmwdt/                         @abrodkin @evgeniy-paltsev @tejlmand
+/CMakeLists.txt                           @tejlmand @nashif
+/doc/                                     @dbkinder
+/doc/guides/coccinelle.rst                @himanshujha199640 @JuliaLawall
 /doc/CMakeLists.txt                       @carlescufi
-/doc/_scripts/                            @carlescufi
+/doc/scripts/                             @carlescufi
+/doc/guides/bluetooth/                    @joerchan @jhedberg @Vudentz
+/doc/guides/dts/                          @galak @mbolivar-nordic
+/doc/reference/bluetooth/                 @joerchan @jhedberg @Vudentz
+/doc/reference/devicetree/                @galak @mbolivar-nordic
+/doc/reference/resource_management/       @pabigot
+/doc/reference/networking/can*            @alexanderwachter
+/doc/security/                            @ceolin @d3zd3z
+/drivers/debug/                           @nashif
 /drivers/*/*sam4l*                        @nandojve
 /drivers/*/*cc13xx_cc26xx*                @bwitherspoon
-/drivers/*/*gd32*                         @nandojve
-/drivers/*/*mcux*                         @mmahadevan108 @dleach02
+/drivers/*/*litex*                        @mateusz-holenko @kgugala @pgielda
+/drivers/*/*mcux*                         @MaureenHelm
+/drivers/*/*stm32*                        @erwango @ABOSTM @FRASTM
 /drivers/*/*native_posix*                 @aescolar @daor-oti
 /drivers/*/*lpc11u6x*                     @mbittan @simonguinot
-/drivers/*/*npcx*                         @MulinChao @ChiHuaL
-/drivers/*/*andes*                        @cwshu @kevinwang821020 @jimmyzhe
-/drivers/*/*ifx_cat1*                     @ifyall @npal-cy
-/drivers/*/*neorv32*                      @henrikbrixandersen
-/drivers/*/*_s32*                         @manuargue
-/drivers/adc/adc_ads1x1x.c                @XenuIsWatching
+/drivers/*/*npcx*                         @MulinChao
+/drivers/adc/                             @anangl
 /drivers/adc/adc_stm32.c                  @cybertale
-/drivers/adc/adc_rpi_pico.c               @soburi
-/drivers/adc/*ads114s0x*                  @benediktibk
-/drivers/adc/*max11102_17*                @benediktibk
-/drivers/adc/*kb1200*                     @ene-steven
-/drivers/adc/adc_ad559x.c                 @bbilas
-/drivers/audio/*nrfx*                     @anangl
-/drivers/auxdisplay/*pt6314*              @xingrz
-/drivers/auxdisplay/*                      @thedjnK
-/drivers/bbram/*                          @yperess @sjg20 @jackrosenthal
-/drivers/bluetooth/                       @alwa-nordic @jhedberg @Vudentz
-/drivers/bluetooth/hci/hci_esp32.c        @sylvioalves
+/drivers/bluetooth/                       @joerchan @jhedberg @Vudentz
+/drivers/can/                             @alexanderwachter
 /drivers/can/*mcp2515*                    @karstenkoenig
-/drivers/can/*rcar*                       @aaillet
-/drivers/clock_control/*agilex*           @siclim @gdengi
 /drivers/clock_control/*nrf*              @nordic-krch
-/drivers/clock_control/*esp32*            @extremegtx @sylvioalves
-/drivers/clock_control/*cpg_mssr*         @aaillet
+/drivers/clock_control/*esp32*            @extremegtx
+/drivers/counter/                         @nordic-krch
 /drivers/console/ipm_console.c            @finikorg
 /drivers/console/semihost_console.c       @luozhongyao
-/drivers/console/jailhouse_debug_console.c @MrVan
 /drivers/counter/counter_cmos.c           @dcpleung
-/drivers/counter/counter_ll_stm32_timer.c @kentjhall
-/drivers/counter/*esp32*                  @sylvioalves
-/drivers/counter/dw_timer.c               @pbalsundar
-/drivers/counter/counter_timer_shell.c    @pbalsundar
+/drivers/counter/maxim_ds3231.c           @pabigot
 /drivers/crypto/*nrf_ecb*                 @maciekfabia @anangl
-/drivers/display/*rm68200*                @mmahadevan108
-/drivers/display/display_ili9342c.*       @extremegtx
-/drivers/dac/*ad56xx*                     @benediktibk
-/drivers/dac/dac_ad559x.c                 @bbilas
-/drivers/dai/                             @kv2019i @marcinszkudlinski @abonislawski
-/drivers/dai/intel/                       @kv2019i @marcinszkudlinski @abonislawski
-/drivers/dai/intel/ssp/                   @kv2019i @marcinszkudlinski @abonislawski
-/drivers/dai/intel/dmic/                  @marcinszkudlinski @abonislawski
-/drivers/dai/intel/alh/                   @abonislawski
-/drivers/dma/dma_dw_axi.c                 @pbalsundar
+/drivers/console/*mux*                    @jukkar
+/drivers/display/                         @vanwinkeljan
+/drivers/display/display_framebuf.c       @dcpleung
+/drivers/dac/                             @martinjaeger
 /drivers/dma/*dw*                         @tbursztyka
-/drivers/dma/*dw_common*                  @abonislawski
 /drivers/dma/*sam0*                       @Sizurka
 /drivers/dma/dma_stm32*                   @cybertale @lowlander
 /drivers/dma/*pl330*                      @raveenp
 /drivers/dma/*iproc_pax*                  @raveenp
-/drivers/dma/*intel_adsp*                 @teburd @abonislawski
-/drivers/dma/*rpi_pico*                   @soburi
-/drivers/dma/*xmc4xxx*                    @talih0
+/drivers/ec_host_cmd_periph/              @jettr
+/drivers/edac/                            @finikorg
+/drivers/eeprom/                          @henrikbrixandersen
 /drivers/eeprom/eeprom_stm32.c            @KwonTae-young
-/drivers/entropy/*b91*                    @andy-liu-telink
-/drivers/entropy/*bt_hci*                 @JordanYates
-/drivers/entropy/*rv32m1*                 @dleach02
-/drivers/ethernet/*dwmac*                 @npitre
+/drivers/entropy/*rv32m1*                 @MaureenHelm
+/drivers/entropy/*gecko*                  @chrta
+/drivers/entropy/*litex*                  @mateusz-holenko @kgugala @pgielda
+/drivers/espi/                            @albertofloyd @franciscomunoz @scottwcpg
+/drivers/ethernet/                        @jukkar @tbursztyka @pfalcon
 /drivers/ethernet/*stm32*                 @Nukersson @lochej
 /drivers/ethernet/*w5500*                 @parthitce
-/drivers/ethernet/*xlnx_gem*              @ibirnbaum
-/drivers/ethernet/*smsc91x*               @sgrrzhf
-/drivers/ethernet/*adin2111*              @GeorgeCGV
-/drivers/ethernet/*oa_tc6*                @lmajewski
-/drivers/ethernet/*lan865x*               @lmajewski
-/drivers/ethernet/phy/                    @rlubos @tbursztyka @arvinf @jukkar
-/drivers/ethernet/phy/*adin2111*          @GeorgeCGV
-/drivers/mdio/*adin2111*                  @GeorgeCGV
-/drivers/flash/*stm32_qspi*               @lmajewski
-/drivers/flash/*b91*                      @andy-liu-telink
-/drivers/flash/*cadence*                  @ngboonkhai
-/drivers/flash/*cc13xx_cc26xx*            @pepe2k
-/drivers/flash/*nrf*                      @de-nordic
-/drivers/flash/*esp32*                    @sylvioalves
-/drivers/flash/flash_cadence_nand*        @nbalabak
-/drivers/gpio/*b91*                       @andy-liu-telink
+/drivers/flash/                           @nashif @nvlsianpu
+/drivers/flash/*nrf*                      @nvlsianpu
+/drivers/flash/*spi_nor*                  @pabigot
+/drivers/gpio/                            @mnkp @pabigot
+/drivers/gpio/*ht16k33*                   @henrikbrixandersen
 /drivers/gpio/*lmp90xxx*                  @henrikbrixandersen
-/drivers/gpio/*nct38xx*                   @MulinChao @ChiHuaL
-/drivers/gpio/*eos_s3*                    @fkokosinski @kgugala
-/drivers/gpio/*rcar*                      @aaillet
-/drivers/gpio/*esp32*                     @sylvioalves
-/drivers/gpio/*rpi_pico*                  @yonsch
-/drivers/gpio/*xlnx_ps*                   @ibirnbaum
-/drivers/gpio/*ads114s0x*                 @benediktibk
-/drivers/gpio/*bd8lb600fs*                @benediktibk
-/drivers/gpio/*pcal64xxa*                 @benediktibk
-/drivers/gpio/*kb1200*                    @ene-steven
-/drivers/gpio/gpio_altera_pio.c           @shilinte
-/drivers/gpio/gpio_ad559x.c               @bbilas
+/drivers/gpio/*stm32*                     @erwango
+/drivers/gpio/*sx1509b*                   @pabigot
+/drivers/hwinfo/                          @alexanderwachter
+/drivers/i2s/i2s_ll_stm32*                @avisconti
 /drivers/i2c/i2c_common.c                 @sjg20
 /drivers/i2c/i2c_emul.c                   @sjg20
-/drivers/i2c/i2c_ite_enhance.c            @GTLin08
 /drivers/i2c/i2c_ite_it8xxx2.c            @GTLin08
 /drivers/i2c/i2c_shell.c                  @nashif
 /drivers/i2c/Kconfig.i2c_emul             @sjg20
 /drivers/i2c/Kconfig.it8xxx2              @GTLin08
-/drivers/i2c/target/*eeprom*              @henrikbrixandersen
-/drivers/i2c/Kconfig.test                 @mbolivar-ampere
-/drivers/i2c/i2c_test.c                   @mbolivar-ampere
-/drivers/i2c/*rcar*                       @aaillet
-/drivers/i2c/*kb1200*                     @ene-steven
-/drivers/i2s/i2s_ll_stm32*                @avisconti
-/drivers/i2s/*nrfx*                       @anangl
-/drivers/i3c/i3c_cdns.c                   @XenuIsWatching
-/drivers/ieee802154/                      @rlubos @tbursztyka @jukkar @fgrandel
-/drivers/ieee802154/*b91*                 @andy-liu-telink
-/drivers/ieee802154/ieee802154_nrf5*      @ankuns
-/drivers/ieee802154/ieee802154_rf2xx*     @tbursztyka @nandojve
-/drivers/ieee802154/ieee802154_cc13xx*    @bwitherspoon @cfriedt @vaishnavachath
+/drivers/i2c/slave/*eeprom*               @henrikbrixandersen
+/drivers/i2s/*litex*                      @mateusz-holenko @kgugala @pgielda
+/drivers/ieee802154/                      @jukkar @tbursztyka
+/drivers/ieee802154/ieee802154_rf2xx*     @jukkar @tbursztyka @nandojve
+/drivers/ieee802154/ieee802154_cc13xx*    @bwitherspoon @cfriedt
 /drivers/interrupt_controller/            @dcpleung @nashif
 /drivers/interrupt_controller/intc_gic.c  @stephanosio
-/drivers/interrupt_controller/*esp32*     @sylvioalves
-/drivers/interrupt_controller/intc_nuclei_eclic.c  @soburi
 /drivers/ipm/ipm_mhu*                     @karl-zh
-/drivers/ipm/Kconfig.nrfx                 @masz-nordic
-/drivers/ipm/Kconfig.nrfx_ipc_channel     @masz-nordic
-/drivers/ipm/ipm_cavs*                    @dcpleung @andyross
-/drivers/ipm/ipm_nrfx_ipc.c               @masz-nordic
-/drivers/ipm/ipm_nrfx_ipc.h               @masz-nordic
+/drivers/ipm/Kconfig.nrfx                 @masz-nordic @ioannisg
+/drivers/ipm/Kconfig.nrfx_ipc_channel     @masz-nordic @ioannisg
+/drivers/ipm/ipm_intel_adsp.c             @finikorg
+/drivers/ipm/ipm_cavs_idc*                @dcpleung
+/drivers/ipm/ipm_nrfx_ipc.c               @masz-nordic @ioannisg
+/drivers/ipm/ipm_nrfx_ipc.h               @masz-nordic @ioannisg
 /drivers/ipm/ipm_stm32_ipcc.c             @arnopo
-/drivers/ipm/ipm_stm32_hsem.c             @cameled
-/drivers/ipm/ipm_esp32.c                  @uLipe
-/drivers/ipm/ipm_ivshmem.c                @uLipe
-/drivers/kscan/*xec*                      @franciscomunoz @sjvasanth1
-/drivers/kscan/*ft5336*                   @MaureenHelm
-/drivers/kscan/*ht16k33*                  @henrikbrixandersen
-/drivers/led_strip/                       @mbolivar-ampere
-/drivers/mfd/mfd_ad559x.c                 @bbilas
-/drivers/mfd/mfd_max20335.c               @bbilas
-/drivers/misc/ft8xx/                      @hubertmis
+/drivers/kscan/                           @albertofloyd @franciscomunoz @scottwcpg
+/drivers/led/                             @Mani-Sadhasivam
+/drivers/led_strip/                       @mbolivar-nordic
+/drivers/lora/                            @Mani-Sadhasivam
+/drivers/memc/                            @gmarull
+/drivers/modem/*gsm*                      @jukkar
 /drivers/modem/hl7800.c                   @rerickson1
-/drivers/modem/simcom-sim7080.c           @lgehreke
-/drivers/modem/simcom-sim7080.h           @lgehreke
 /drivers/modem/Kconfig.hl7800             @rerickson1
-/drivers/modem/Kconfig.simcom-sim7080     @lgehreke
-/drivers/pinctrl/*esp32*                  @sylvioalves
-/drivers/pinctrl/*it8xxx2*                @ite
-/drivers/pinctrl/*kb1200*                 @ene-steven
-/drivers/pm_cpu_ops/psci_shell.c          @nbalabak @gdengi
-/drivers/power_domain/                    @ceolin
-/drivers/ps2/*xec*                        @franciscomunoz @sjvasanth1
-/drivers/ps2/*npcx*                       @MulinChao @ChiHuaL
-/drivers/pwm/*b91*                        @andy-liu-telink
-/drivers/pwm/*pca9685*                    @nixward
-/drivers/pwm/*rpi_pico*                   @burumaj
+/drivers/pcie/                            @dcpleung @nashif @jhedberg
+/drivers/peci/                            @albertofloyd @franciscomunoz @scottwcpg
+/drivers/pinmux/*hsdk*                    @iriszzw
+/drivers/pinmux/*it8xxx2*                 @ite
+/drivers/psci/                            @carlocaione
+/drivers/ps2/                             @albertofloyd @franciscomunoz @scottwcpg
 /drivers/pwm/*rv32m1*                     @henrikbrixandersen
 /drivers/pwm/*sam0*                       @nzmichaelh
-/drivers/pwm/*test*                       @JordanYates
+/drivers/pwm/*stm32*                      @gmarull
 /drivers/pwm/*xlnx*                       @henrikbrixandersen
 /drivers/pwm/pwm_capture.c                @henrikbrixandersen
 /drivers/pwm/pwm_shell.c                  @henrikbrixandersen
-/drivers/pwm/*gecko*                      @sun681
-/drivers/pwm/*it8xxx2*                    @RuibinChang
-/drivers/pwm/*esp32*                      @LucasTambor
-/drivers/pwm/*rcar*                       @aaillet
-/drivers/pwm/*max31790*                   @benediktibk
-/drivers/pwm/*kb1200*                     @ene-steven
-/drivers/regulator/*                      @gmarull
-/drivers/regulator/regulator_max20335.c   @bbilas
-/drivers/regulator/regulator_pca9420.c    @danieldegrasse
-/drivers/regulator/regulator_rpi_pico.c   @soburi
-/drivers/regulator/regulator_shell.c      @danieldegrasse
-/drivers/reset/reset_intel_socfpga.c      @nbalabak
-/drivers/reset/Kconfig.intel_socfpga      @nbalabak
+/drivers/regulator/                       @pabigot
+/drivers/sensor/                          @MaureenHelm
 /drivers/sensor/ams_iAQcore/              @alexanderwachter
 /drivers/sensor/ens210/                   @alexanderwachter
-/drivers/sensor/grow_r502a/               @DineshDK03
 /drivers/sensor/hts*/                     @avisconti
-/drivers/sensor/ina23*/                   @bbilas
 /drivers/sensor/lis*/                     @avisconti
 /drivers/sensor/lps*/                     @avisconti
 /drivers/sensor/lsm*/                     @avisconti
 /drivers/sensor/mpr/                      @sven-hm
-/drivers/sensor/qdec_stm32/               @valeriosetti
-/drivers/sensor/rpi_pico_temp/            @soburi
 /drivers/sensor/st*/                      @avisconti
-/drivers/sensor/veaa_x_3/                 @jeppenodgaard @MaureenHelm
-/drivers/sensor/ene_tack_kb1200/          @ene-steven
-/drivers/serial/*b91*                     @andy-liu-telink
-/drivers/serial/uart_altera_jtag.c        @nashif @gohshunjing
-/drivers/serial/uart_altera.c             @gohshunjing
-/drivers/serial/*ns16550*                 @dcpleung @nashif @gdengi
-/drivers/serial/*nrfx*                    @anangl
+/drivers/serial/uart_altera_jtag_hal.c    @nashif
+/drivers/serial/*ns16550*                 @dcpleung @nashif @jenmwms @aasthagr
+/drivers/serial/*nrfx*                    @Mierunski @anangl
+/drivers/serial/uart_liteuart.c           @mateusz-holenko @kgugala @pgielda
 /drivers/serial/Kconfig.mcux_iuart        @Mani-Sadhasivam
 /drivers/serial/uart_mcux_iuart.c         @Mani-Sadhasivam
 /drivers/serial/Kconfig.rtt               @carlescufi @pkral78
 /drivers/serial/uart_rtt.c                @carlescufi @pkral78
-/drivers/serial/*rpi_pico*                @yonsch
 /drivers/serial/Kconfig.xlnx              @wjliang
 /drivers/serial/uart_xlnx_ps.c            @wjliang
 /drivers/serial/uart_xlnx_uartlite.c      @henrikbrixandersen
 /drivers/serial/*xmc4xxx*                 @parthitce
-/drivers/serial/*numicro*                 @ssekar15
-/drivers/serial/*apbuart*                 @julius-barendt
-/drivers/serial/*rcar*                    @aaillet
-/drivers/serial/Kconfig.xen               @lorc @firscity
-/drivers/serial/uart_hvc_xen.c            @lorc @firscity
-/drivers/serial/uart_hvc_xen_consoleio.c  @lorc @firscity
-/drivers/serial/Kconfig.it8xxx2           @GTLin08
-/drivers/serial/uart_ite_it8xxx2.c        @GTLin08
-/drivers/serial/*intel_lw*                @shilinte
-/drivers/serial/*kb1200*                  @ene-steven
-/drivers/disk/sdmmc_stm32.c               @anthonybrandon
-/drivers/ptp_clock/                       @tbursztyka @jukkar
-/drivers/spi/*b91*                        @andy-liu-telink
+/drivers/serial/*nuvoton*                 @ssekar15
+/drivers/serial/*apbuart*                 @martin-aberg
+/drivers/net/                             @jukkar @tbursztyka
+/drivers/ptp_clock/                       @jukkar
+/drivers/spi/                             @tbursztyka
 /drivers/spi/spi_rv32m1_lpspi*            @karstenkoenig
-/drivers/spi/*esp32*                      @sylvioalves
-/drivers/spi/*pl022*                      @soburi
-/drivers/sdhc/                            @danieldegrasse
-/drivers/sdhc/sdhc_cdns*                  @roymurlidhar @tanmaykathpalia
-/drivers/timer/*arm_arch*                 @carlocaione
-/drivers/timer/*cortex_m_systick*         @anangl
-/drivers/timer/*altera_avalon*            @nashif
-/drivers/timer/*riscv_machine*            @kgugala @pgielda
-/drivers/timer/*ite_it8xxx2*              @ite
-/drivers/timer/*xlnx_psttc*               @wjliang @stephanosio
-/drivers/timer/*cc13xx_cc26xx_rtc*        @vanti
-/drivers/timer/*cavs*                     @dcpleung
-/drivers/timer/*leon_gptimer*             @julius-barendt
-/drivers/timer/*mips_cp0*                 @frantony
-/drivers/timer/*rcar_cmt*                 @aaillet
-/drivers/timer/*esp32_sys*                @uLipe
-/drivers/timer/*sam0_rtc*                 @bendiscz
-/drivers/timer/*xtensa*                   @dcpleung
-/drivers/timer/*rv32m1_lptmr*             @mbolivar
-/drivers/timer/*nrf_rtc*                  @anangl
-/drivers/timer/*hpet*                     @dcpleung
+/drivers/timer/apic_timer.c               @dcpleung @nashif
+/drivers/timer/arm_arch_timer.c           @carlocaione
+/drivers/timer/cortex_m_systick.c         @ioannisg
+/drivers/timer/altera_avalon_timer_hal.c  @nashif
+/drivers/timer/riscv_machine_timer.c      @kgugala @pgielda
+/drivers/timer/ite_it8xxx2_timer.c        @ite
+/drivers/timer/xlnx_psttc_timer*          @wjliang @stephanosio
+/drivers/timer/cc13x2_cc26x2_rtc_timer.c  @vanti
+/drivers/timer/cavs_timer.c               @dcpleung
+/drivers/timer/stm32_lptim_timer.c        @FRASTM
+/drivers/timer/leon_gptimer.c             @martin-aberg
+/drivers/usb/                             @jfischer-no @finikorg
 /drivers/usb/device/usb_dc_stm32.c        @ydamigos @loicpoulain
-/drivers/i2c/*b91*                        @andy-liu-telink
+/drivers/video/                           @loicpoulain
 /drivers/i2c/i2c_ll_stm32*                @ydamigos
 /drivers/i2c/i2c_rv32m1_lpi2c*            @henrikbrixandersen
 /drivers/i2c/*sam0*                       @Sizurka
 /drivers/i2c/i2c_dw*                      @dcpleung
-/drivers/i2c/*tca954x*                    @kurddt
-/drivers/*/*xec*                          @franciscomunoz @albertofloyd @sjvasanth1
+/drivers/*/*xec*                          @franciscomunoz @albertofloyd @scottwcpg
 /drivers/watchdog/*gecko*                 @oanerer
 /drivers/watchdog/*sifive*                @katsuster
 /drivers/watchdog/wdt_handlers.c          @dcpleung @nashif
-/drivers/watchdog/*cc32xx*                @pavlohamov
-/drivers/watchdog/wdt_ite_it8xxx2.c       @RuibinChang
-/drivers/watchdog/Kconfig.it8xxx2         @RuibinChang
-/drivers/watchdog/wdt_counter.c           @nordic-krch
-/drivers/watchdog/*rpi_pico*              @thedjnK
-/drivers/watchdog/*dw*                    @softwarecki @pbalsundar
-/drivers/watchdog/*ifx*                   @sreeramIfx
-/drivers/watchdog/*kb1200*                @ene-steven
-/drivers/wifi/esp_at/                     @mniestroj
+/drivers/wifi/                            @jukkar @tbursztyka @pfalcon
+/drivers/wifi/esp/                        @mniestroj
 /drivers/wifi/eswifi/                     @loicpoulain @nandojve
 /drivers/wifi/winc1500/                   @kludentwo
 /drivers/virtualization/		  @tbursztyka
-/dts/arm/acsip/                           @NorthernDean
-/dts/arm/aspeed/                          @aspeeddylan
-/dts/arm/atmel/                           @galak @nandojve
+/dts/arc/                                 @abrodkin @ruuddw @iriszzw
+/dts/arm/atmel/sam4e*                     @nandojve
+/dts/arm/atmel/sam4l*                     @nandojve
+/dts/arm/atmel/samr21.dtsi                @benpicco
+/dts/arm/atmel/sam*5*.dtsi                @benpicco
+/dts/arm/atmel/same70*                    @nandojve
+/dts/arm/atmel/samv71*                    @nandojve
+/dts/arm/atmel/                           @galak
 /dts/arm/broadcom/                        @sbranden
-/dts/arm/cypress/                         @ifyall @npal-cy
-/dts/arm/ene/kb1200                       @ene-steven
-/dts/arm/gd/                              @nandojve
-/dts/arm/infineon/xmc4*                   @parthitce @ifyall @npal-cy
-/dts/arm/infineon/psoc6/                  @ifyall @npal-cy
-/dts/arm64/armv8-r.dtsi                   @povergoing
-/dts/arm64/intel/*intel_socfpga*          @siclim
-/dts/arm64/nxp/                           @JiafeiPan
-/dts/arm64/renesas/                       @lorc @xakep-amatop
-/dts/arm/quicklogic/                      @fkokosinski @kgugala
-/dts/arm/seeed_studio/                    @str4t0m
-/dts/arm/st/h7/*stm32h735*                @benediktibk
-/dts/arm/st/l4/*stm32l451*                @benediktibk
+/dts/arm/infineon/                        @parthitce
+/dts/arm/qemu-virt/                       @carlocaione
+/dts/arm/quicklogic/                      @wtatarski @kowalewskijan @kgugala
+/dts/arm/st/                              @erwango
 /dts/arm/ti/cc13?2*                       @bwitherspoon
 /dts/arm/ti/cc26?2*                       @bwitherspoon
 /dts/arm/ti/cc3235*                       @vanti
-/dts/arm/nordic/                          @anangl @carlescufi
-/dts/arm/nuvoton/                         @ssekar15 @MulinChao @ChiHuaL
-/dts/arm/nxp/                             @mmahadevan108 @dleach02
-/dts/arm/nxp/nxp_s32*                     @manuargue
-/dts/arm/microchip/                       @franciscomunoz @albertofloyd @sjvasanth1
-/dts/arm/rpi_pico/                        @yonsch
+/dts/arm/nordic/                          @ioannisg @carlescufi
+/dts/arm/nuvoton/                         @ssekar15
+/dts/arm/nuvoton/npcx/                    @MulinChao
+/dts/arm/nxp/                             @MaureenHelm
+/dts/arm/microchip/                       @franciscomunoz @albertofloyd @scottwcpg
 /dts/arm/silabs/efm32_pg_1b.dtsi          @rdmeneze
 /dts/arm/silabs/efm32gg11b*               @oanerer
+/dts/arm/silabs/efm32_jg_pg*              @chrta
 /dts/arm/silabs/efr32bg13p*               @mnkp
-/dts/arm/silabs/efr32bg22*                @kgugala @fkokosinski @pczarnecki
-/dts/arm/silabs/efr32xg13p*               @mnkp
+/dts/arm/silabs/efm32jg12b*               @chrta
+/dts/arm/silabs/efm32pg12b*               @chrta
 /dts/arm/silabs/efm32pg1b*                @rdmeneze
 /dts/arm/silabs/efr32mg21*                @l-alfred
-/dts/arm/silabs/efr32fg13*                @yonsch
-/dts/riscv/ite/                           @ite
-/dts/riscv/microchip/microchip-miv.dtsi   @galak
-/dts/riscv/openisa/rv32m1*                @dleach02
-/dts/riscv/starfive/                      @rajnesh-kanwal @pfarwsi
-/dts/riscv/andes/andes_v5*                @cwshu @kevinwang821020 @jimmyzhe
-/dts/riscv/niosv/                         @sweeaun
-/dts/arm/armv*m.dtsi                      @galak @ioannisg
-/dts/arm/armv7-a.dtsi                     @ibirnbaum
+/dts/riscv/                               @kgugala @pgielda
+/dts/riscv/it8xxx2.dtsi                   @ite
+/dts/riscv/microsemi-miv.dtsi             @galak
+/dts/riscv/rv32m1*                        @MaureenHelm
+/dts/riscv/riscv32-litex-vexriscv.dtsi    @mateusz-holenko @kgugala @pgielda
 /dts/arm/armv7-r.dtsi                     @bbolen @stephanosio
+/dts/arm/armv8-a.dtsi                     @carlocaione
 /dts/arm/xilinx/                          @bbolen @stephanosio
-/dts/arm/renesas/rcar/                    @aaillet
+/dts/x86/                                 @jhedberg
 /dts/xtensa/xtensa.dtsi                   @ydamigos
 /dts/xtensa/intel/                        @dcpleung
-/dts/xtensa/espressif/                    @sylvioalves
-/dts/xtensa/nxp/                          @iuliana-prodan @dbaluta
-/dts/bindings/can/                        @alexanderwachter @henrikbrixandersen
-/dts/bindings/i2c/zephyr*i2c-emul*.yaml   @sjg20
+/dts/sparc/                               @martin-aberg
+/dts/bindings/                            @galak
+/dts/bindings/can/                        @alexanderwachter
+/dts/bindings/i2c/zephyr*i2c-emul.yaml    @sjg20
 /dts/bindings/adc/st*stm32-adc.yaml       @cybertale
-/dts/bindings/adc/*ads114s08.yaml         @benediktibk
-/dts/bindings/adc/*max111*                @benediktibk
 /dts/bindings/modem/*hl7800.yaml          @rerickson1
 /dts/bindings/serial/ns16550.yaml         @dcpleung @nashif
-/dts/bindings/counter/snps,dw-timers.yaml @pbalsundar
-/dts/bindings/wifi/*esp-at.yaml           @mniestroj
-/dts/bindings/*/*gd32*                    @nandojve
-/dts/bindings/*/*sam*                     @nandojve
-/dts/bindings/*/*npcx*                    @MulinChao @ChiHuaL
-/dts/bindings/*/*psoc6*                   @ifyall @npal-cy
-/dts/bindings/*/*infineon*cat1*           @ifyall @npal-cy
+/dts/bindings/wifi/*esp.yaml              @mniestroj
+/dts/bindings/*/*npcx*                    @MulinChao
 /dts/bindings/*/nordic*                   @anangl
-/dts/bindings/*/nxp*                      @mmahadevan108 @dleach02
-/dts/bindings/*/nxp*s32*                  @manuargue
-/dts/bindings/*/openisa*                  @dleach02
-/dts/bindings/*/raspberrypi*pico*         @yonsch
+/dts/bindings/*/nxp*                      @MaureenHelm
+/dts/bindings/*/openisa*                  @MaureenHelm
+/dts/bindings/*/st*                       @erwango
 /dts/bindings/sensor/ams*                 @alexanderwachter
 /dts/bindings/*/sifive*                   @mateusz-holenko @kgugala @pgielda
-/dts/bindings/*/andes*                    @cwshu @kevinwang821020 @jimmyzhe
-/dts/bindings/*/neorv32*                  @henrikbrixandersen
-/dts/bindings/*/*lan91c111*               @sgrrzhf
-/dts/bindings/i3c/                        @dcpleung
-/dts/bindings/pm_cpu_ops/*                @carlocaione
-/dts/bindings/ethernet/*gem.yaml          @ibirnbaum
-/dts/bindings/auxdisplay/*pt6314.yaml     @xingrz
-/dts/bindings/auxdisplay/*                 @thedjnK
+/dts/bindings/*/litex*                    @mateusz-holenko @kgugala @pgielda
+/dts/bindings/*/vexriscv*                 @mateusz-holenko @kgugala @pgielda
+/dts/bindings/psci/*                      @carlocaione
+/dts/posix/                               @aescolar @vanwinkeljan @daor-oti
 /dts/bindings/sensor/*bme680*             @BoschSensortec
-/dts/bindings/sensor/*ina23*              @bbilas
 /dts/bindings/sensor/st*                  @avisconti
-/dts/bindings/sensor/zephyr,sensing.yaml    @lixuzha @ghu0510 @qianruh
-/dts/bindings/sensor/zephyr,sensing*.yaml   @lixuzha @ghu0510 @qianruh
-/dts/bindings/smbus/                      @finikorg
-/dts/bindings/sip_svc/                    @maheshraotm
-/dts/bindings/cpu/intel,niosv.yaml        @sweeaun
-/dts/bindings/reset/intel,socfpga-reset.yaml    @nbalabak
-/dts/bindings/gpio/*pcal64*               @benediktibk
-/dts/bindings/gpio/*bd8lb600fs*           @benediktibk
-/dts/bindings/gpio/*ads114s0x*            @benediktibk
-/dts/bindings/pwm/*max31790*              @benediktibk
-/dts/bindings/dac/*ad56*                  @benediktibk
+/include/                                 @nashif @carlescufi @galak @MaureenHelm
+/include/drivers/*/*litex*                @mateusz-holenko @kgugala @pgielda
+/include/drivers/adc.h                    @anangl
+/include/drivers/can.h                    @alexanderwachter
+/include/drivers/counter.h                @nordic-krch
+/include/drivers/dac.h                    @martinjaeger
+/include/drivers/display.h                @vanwinkeljan
+/include/drivers/espi.h                   @albertofloyd @franciscomunoz @scottwcpg
+/include/drivers/bluetooth/               @joerchan @jhedberg @Vudentz
+/include/drivers/flash.h                  @nashif @carlescufi @galak @MaureenHelm @nvlsianpu
+/include/drivers/i2c_emul.h               @sjg20
+/include/drivers/led/ht16k33.h            @henrikbrixandersen
+/include/drivers/interrupt_controller/    @dcpleung @nashif
+/include/drivers/interrupt_controller/gic.h @stephanosio
+/include/drivers/modem/hl7800.h           @rerickson1
+/include/drivers/pcie/                    @dcpleung
+/include/drivers/hwinfo.h                 @alexanderwachter
+/include/drivers/led.h                    @Mani-Sadhasivam
+/include/drivers/led_strip.h              @mbolivar-nordic
+/include/drivers/sensor.h                 @MaureenHelm
+/include/drivers/spi.h                    @tbursztyka
+/include/drivers/lora.h                   @Mani-Sadhasivam
+/include/drivers/peci.h                   @albertofloyd @franciscomunoz @scottwcpg
+/include/drivers/psci.h                   @carlocaione
+/include/app_memory/                      @dcpleung
+/include/arch/arc/                        @abrodkin @ruuddw
+/include/arch/arc/arch.h                  @abrodkin @ruuddw
+/include/arch/arc/v2/irq.h                @abrodkin @ruuddw
+/include/arch/arm/aarch32/                @MaureenHelm @galak @ioannisg
+/include/arch/arm/aarch32/cortex_a_r/     @stephanosio
+/include/arch/arm/aarch64/                @carlocaione
+/include/arch/arm/arm-smccc.h             @carlocaione
+/include/arch/arm/aarch32/irq.h           @carlocaione
+/include/arch/nios2/                      @nashif
+/include/arch/nios2/arch.h                @nashif
+/include/arch/posix/                      @aescolar @daor-oti
+/include/arch/riscv/                      @kgugala @pgielda
+/include/arch/x86/                        @jhedberg @dcpleung
+/include/arch/common/                     @andyross @nashif
+/include/arch/xtensa/                     @andyross @dcpleung
+/include/arch/sparc/                      @martin-aberg
+/include/sys/atomic.h                     @andyross
+/include/bluetooth/                       @joerchan @jhedberg @Vudentz
+/include/cache.h                          @carlocaione @andyross
+/include/canbus/                          @alexanderwachter
+/include/tracing/                         @nashif
+/include/debug/                           @nashif
+/include/debug/coredump.h                 @dcpleung
+/include/debug/gdbstub.h                  @ceolin
+/include/device.h                         @tbursztyka @nashif
+/include/devicetree.h                     @galak
+/include/display/                         @vanwinkeljan
+/include/dt-bindings/clock/kinetis_mcg.h  @henrikbrixandersen
+/include/dt-bindings/clock/kinetis_scg.h  @henrikbrixandersen
+/include/dt-bindings/dma/stm32_dma.h      @cybertale
+/include/dt-bindings/pcie/                @dcpleung
+/include/dt-bindings/usb/usb.h            @galak @finikorg
+/include/emul.h                           @sjg20
+/include/fs/                              @nashif @nvlsianpu @de-nordic @pabigot
+/include/init.h                           @nashif @andyross
+/include/irq.h                            @dcpleung @nashif @andyross
+/include/irq_offload.h                    @dcpleung @nashif @andyross
+/include/kernel.h                         @dcpleung @nashif @andyross
+/include/kernel_version.h                 @dcpleung @nashif @andyross
+/include/linker/app_smem*.ld              @dcpleung @nashif
+/include/linker/                          @dcpleung @nashif @andyross
+/include/logging/                         @nordic-krch
+/include/lorawan/lorawan.h                @Mani-Sadhasivam
+/include/mgmt/osdp.h                      @cbsiddharth
+/include/net/                             @jukkar @tbursztyka @pfalcon
+/include/net/buf.h                        @jukkar @jhedberg @tbursztyka @pfalcon
+/include/net/coap*.h                      @jukkar @rlubos
+/include/net/lwm2m*.h                     @jukkar @rlubos
+/include/net/mqtt.h                       @jukkar @rlubos
+/include/posix/                           @pfalcon
+/include/power/power.h                    @pabigot @nashif @ceolin
+/include/ptp_clock.h                      @jukkar
+/include/shared_irq.h                     @dcpleung @nashif @andyross
+/include/shell/                           @jakub-uC @nordic-krch
+/include/sw_isr_table.h                   @dcpleung @nashif @andyross
+/include/sys_clock.h                      @dcpleung @nashif @andyross
+/include/sys/sys_io.h                     @dcpleung @nashif @andyross
+/include/sys/kobject.h                    @dcpleung @nashif
+/include/toolchain.h                      @dcpleung @andyross @nashif
+/include/toolchain/                       @dcpleung @nashif @andyross
+/include/zephyr.h                         @dcpleung @nashif @andyross
+/kernel/                                  @dcpleung @nashif @andyross
+/lib/fnmatch/                             @carlescufi
+/lib/gui/                                 @vanwinkeljan
+/lib/open-amp/                            @arnopo
+/lib/os/                                  @dcpleung @nashif @andyross
+/lib/posix/                               @pfalcon
+/lib/cmsis_rtos_v2/                       @nashif
+/lib/cmsis_rtos_v1/                       @nashif
+/lib/libc/                                @nashif
+/modules/                                 @nashif
+/modules/Kconfig.tfm                      @ioannisg @microbuilder
+/kernel/device.c                          @andyross @nashif
+/kernel/idle.c                            @andyross @nashif
+/samples/                                 @nashif
+/samples/basic/minimal/                   @carlescufi
+/samples/basic/servo_motor/boards/*microbit* @jhe
+/samples/bluetooth/                       @jhedberg @Vudentz @joerchan
+/samples/boards/intel_s1000_crb/          @sathishkuttan @dcpleung @nashif
+/samples/display/                         @vanwinkeljan
+/samples/drivers/can/                     @alexanderwachter
+/samples/drivers/clock_control_litex/     @mateusz-holenko @kgugala @pgielda
+/samples/drivers/display/                 @vanwinkeljan
+/samples/drivers/ht16k33/                 @henrikbrixandersen
+/samples/drivers/lora/                    @Mani-Sadhasivam
+/samples/drivers/counter/maxim_ds3231/    @pabigot
+/samples/lorawan/                         @Mani-Sadhasivam
+/samples/net/                             @jukkar @tbursztyka @pfalcon
+/samples/net/cloud/tagoio_http_post/      @nandojve
+/samples/net/dns_resolve/                 @jukkar @tbursztyka @pfalcon
+/samples/net/lwm2m_client/                @rlubos
+/samples/net/mqtt_publisher/              @jukkar @tbursztyka
+/samples/net/sockets/coap_*/              @rlubos
+/samples/net/sockets/                     @jukkar @tbursztyka @pfalcon
+/samples/net/*civetweb*                   @Nukersson
+/samples/sensor/                          @MaureenHelm
+/samples/shields/                         @avisconti
+/samples/subsys/logging/                  @nordic-krch @jakub-uC
+/samples/subsys/shell/                    @jakub-uC @nordic-krch
+/samples/subsys/mgmt/mcumgr/smp_svr/      @aunsbjerg @nvlsianpu
+/samples/subsys/mgmt/updatehub/           @nandojve @otavio
+/samples/subsys/mgmt/osdp/                @cbsiddharth
+/samples/subsys/usb/                      @jfischer-no @finikorg
+/samples/subsys/power/                    @nashif @pabigot @ceolin
+/samples/tfm_integration/                 @ioannisg @microbuilder
+/samples/userspace/                       @dcpleung @nashif
+/scripts/coccicheck                       @himanshujha199640 @JuliaLawall
+/scripts/coccinelle/                      @himanshujha199640 @JuliaLawall
+/scripts/coredump/                        @dcpleung
+/scripts/kconfig/                         @ulfalizer
+/scripts/pylib/twister/expr_parser.py     @nashif
+/scripts/schemas/twister/                 @nashif
+/scripts/gen_app_partitions.py            @dcpleung @nashif
+/scripts/get_maintainer.py                @nashif
+/scripts/dts/                             @mbolivar-nordic @galak
+/scripts/release/                         @nashif
+/scripts/ci/                              @nashif
+/arch/x86/gen_gdt.py                      @dcpleung @nashif
+/arch/x86/gen_idt.py                      @dcpleung @nashif
+/scripts/gen_kobject_list.py              @dcpleung @nashif
+/scripts/gen_syscalls.py                  @dcpleung @nashif
+/scripts/list_boards.py                   @mbolivar-nordic
+/scripts/net/                             @jukkar
+/scripts/process_gperf.py                 @dcpleung @nashif
+/scripts/gen_relocate_app.py              @dcpleung
+/scripts/requirements*.txt                @mbolivar-nordic @galak @nashif
+/scripts/tests/twister/                   @aasthagr
+/scripts/tests/build/test_subfolder_list.py @rmstoi
+/scripts/tracing/                         @nashif
+/scripts/pylib/twister/                   @nashif
+/scripts/twister                          @nashif
+/scripts/series-push-hook.sh              @erwango
+/scripts/west_commands/                   @mbolivar-nordic
+/scripts/west-commands.yml                @mbolivar-nordic
+/scripts/zephyr_module.py                 @tejlmand
+/scripts/user_wordsize.py                 @cfriedt
+/scripts/valgrind.supp                    @aescolar @daor-oti
+/share/zephyr-package/                    @tejlmand
+/share/zephyrunittest-package/            @tejlmand
+/subsys/bluetooth/                        @joerchan @jhedberg @Vudentz
+/subsys/bluetooth/controller/             @carlescufi @cvinayak @thoh-ot @kruithofa
+/subsys/bluetooth/mesh/                   @jhedberg @trond-snekvik @joerchan @Vudentz
+/subsys/canbus/                           @alexanderwachter
+/subsys/cpp/                              @pabigot @vanwinkeljan
+/subsys/debug/                            @nashif
+/subsys/debug/coredump/                   @dcpleung
+/subsys/debug/gdbstub/                    @ceolin
+/subsys/debug/gdbstub.c                   @ceolin
+/subsys/dfu/                              @nvlsianpu
+/subsys/tracing/                          @nashif
+/subsys/debug/asan_hacks.c                @vanwinkeljan @aescolar @daor-oti
+/subsys/demand_paging/                    @dcpleung @nashif
+/subsys/disk/disk_access_spi_sdhc.c       @JunYangNXP
+/subsys/disk/disk_access_sdhc.h           @JunYangNXP
+/subsys/disk/disk_access_usdhc.c          @JunYangNXP
+/subsys/disk/disk_access_stm32_sdmmc.c    @anthonybrandon
+/subsys/emul/                             @sjg20
+/subsys/fb/                               @jfischer-no
+/subsys/fs/                               @nashif
+/subsys/fs/fcb/                           @nvlsianpu
+/subsys/fs/fuse_fs_access.c               @vanwinkeljan
+/subsys/fs/littlefs_fs.c                  @pabigot
+/subsys/fs/nvs/                           @Laczen
+/subsys/ipc/                              @ioannisg
+/subsys/logging/                          @nordic-krch
+/subsys/logging/log_backend_net.c         @nordic-krch @jukkar
+/subsys/lorawan/                          @Mani-Sadhasivam
+/subsys/mgmt/ec_host_cmd/                 @jettr
+/subsys/mgmt/mcumgr/                      @carlescufi @nvlsianpu
+/subsys/mgmt/hawkbit/                     @Navin-Sankar
+/subsys/mgmt/mcumgr/smp_udp.c             @aunsbjerg
+/subsys/mgmt/updatehub/                   @nandojve @otavio
+/subsys/mgmt/osdp/                        @cbsiddharth
+/subsys/net/buf.c                         @jukkar @jhedberg @tbursztyka @pfalcon
+/subsys/net/ip/                           @jukkar @tbursztyka @pfalcon
+/subsys/net/lib/                          @jukkar @tbursztyka @pfalcon
+/subsys/net/lib/dns/                      @jukkar @tbursztyka @pfalcon @cfriedt
+/subsys/net/lib/lwm2m/                    @rlubos
+/subsys/net/lib/config/                   @jukkar @tbursztyka @pfalcon
+/subsys/net/lib/mqtt/                     @jukkar @tbursztyka @rlubos
+/subsys/net/lib/coap/                     @rlubos
+/subsys/net/lib/sockets/socketpair.c      @cfriedt
+/subsys/net/lib/sockets/                  @jukkar @tbursztyka @pfalcon
+/subsys/net/lib/tls_credentials/          @rlubos
+/subsys/net/l2/                           @jukkar @tbursztyka
+/subsys/net/l2/canbus/                    @alexanderwachter @jukkar
+/subsys/net/*/openthread/                 @rlubos
+/subsys/power/                            @nashif @pabigot @ceolin
+/subsys/random/                           @dleach02
+/subsys/settings/                         @nvlsianpu
+/subsys/shell/                            @jakub-uC @nordic-krch
+/subsys/stats/                            @nvlsianpu
+/subsys/storage/                          @nvlsianpu
+/subsys/testsuite/                        @nashif
+/subsys/timing/                           @nashif @dcpleung
+/subsys/usb/                              @jfischer-no @finikorg
+/subsys/usb/class/dfu/usb_dfu.c           @nvlsianpu
+/tests/                                   @nashif
+/tests/application_development/libcxx/    @pabigot
+/tests/arch/arm/                          @ioannisg @stephanosio
+/tests/benchmarks/cmsis_dsp/              @stephanosio
+/tests/boards/native_posix/               @aescolar @daor-oti
+/tests/boards/intel_s1000_crb/            @dcpleung @sathishkuttan
+/tests/bluetooth/                         @joerchan @jhedberg @Vudentz
+/tests/bluetooth/bsim_bt/                 @joerchan @jhedberg @Vudentz @aescolar @wopu-ot
+/tests/posix/                             @pfalcon
+/tests/crypto/                            @ceolin
+/tests/crypto/mbedtls/                    @nashif @ceolin
+/tests/drivers/can/                       @alexanderwachter
+/tests/drivers/counter/                   @nordic-krch
+/tests/drivers/counter/maxim_ds3231_api/  @pabigot
+/tests/drivers/eeprom/                    @henrikbrixandersen @sjg20
+/tests/drivers/flash_simulator/           @nvlsianpu
+/tests/drivers/gpio/                      @mnkp @pabigot
+/tests/drivers/hwinfo/                    @alexanderwachter
+/tests/drivers/spi/                       @tbursztyka
+/tests/drivers/uart/uart_async_api/       @Mierunski
+/tests/kernel/                            @dcpleung @andyross @nashif
+/tests/lib/                               @nashif
+/tests/lib/cmsis_dsp/                     @stephanosio
+/tests/net/                               @jukkar @tbursztyka @pfalcon
+/tests/net/buf/                           @jukkar @jhedberg @tbursztyka @pfalcon
+/tests/net/lib/                           @jukkar @tbursztyka @pfalcon
+/tests/net/lib/http_header_fields/        @jukkar @tbursztyka
+/tests/net/lib/mqtt_packet/               @jukkar @tbursztyka
+/tests/net/lib/coap/                      @rlubos
+/tests/net/socket/socketpair/             @cfriedt
+/tests/net/socket/                        @jukkar @tbursztyka @pfalcon
+/tests/subsys/debug/coredump/             @dcpleung
+/tests/subsys/fs/                         @nashif @nvlsianpu @de-nordic @pabigot
+/tests/subsys/settings/                   @nvlsianpu
+/tests/subsys/shell/                      @jakub-uC @nordic-krch
+# Get all docs reviewed
+*.rst                                     @nashif
+/doc/reference/kernel/                    @andyross @nashif
+*posix*.rst                               @aescolar @daor-oti

CODE_OF_CONDUCT.md

@@ -2,138 +2,77 @@
 
 ## Our Pledge
 
-We as members, contributors, and leaders pledge to make participation in our
-community a harassment-free experience for everyone, regardless of age, body
-size, visible or invisible disability, ethnicity, sex characteristics, gender
-identity and expression, level of experience, education, socio-economic status,
-nationality, personal appearance, race, caste, color, religion, or sexual
-identity and orientation.
-
-We pledge to act and interact in ways that contribute to an open, welcoming,
-diverse, inclusive, and healthy community.
+In the interest of fostering an open and welcoming environment, we as
+contributors and maintainers pledge to making participation in our project and
+our community a harassment-free experience for everyone, regardless of age, body
+size, disability, ethnicity, sex characteristics, gender identity and expression,
+level of experience, education, socio-economic status, nationality, personal
+appearance, race, religion, or sexual identity and orientation.
 
 ## Our Standards
 
-Examples of behavior that contributes to a positive environment for our
-community include:
+Examples of behavior that contributes to creating a positive environment
+include:
 
-* Demonstrating empathy and kindness toward other people
-* Being respectful of differing opinions, viewpoints, and experiences
-* Giving and gracefully accepting constructive feedback
-* Accepting responsibility and apologizing to those affected by our mistakes,
-  and learning from the experience
-* Focusing on what is best not just for us as individuals, but for the overall
-  community
+* Using welcoming and inclusive language
+* Being respectful of differing viewpoints and experiences
+* Gracefully accepting constructive criticism
+* Focusing on what is best for the community
+* Showing empathy towards other community members
 
-Examples of unacceptable behavior include:
+Examples of unacceptable behavior by participants include:
 
-* The use of sexualized language or imagery, and sexual attention or advances of
-  any kind
-* Trolling, insulting or derogatory comments, and personal or political attacks
+* The use of sexualized language or imagery and unwelcome sexual attention or
+ advances
+* Trolling, insulting/derogatory comments, and personal or political attacks
 * Public or private harassment
-* Publishing others' private information, such as a physical or email address,
-  without their explicit permission
+* Publishing others' private information, such as a physical or electronic
+ address, without explicit permission
 * Other conduct which could reasonably be considered inappropriate in a
-  professional setting
+ professional setting
 
-## Enforcement Responsibilities
+## Our Responsibilities
 
-Community leaders are responsible for clarifying and enforcing our standards of
-acceptable behavior and will take appropriate and fair corrective action in
-response to any behavior that they deem inappropriate, threatening, offensive,
-or harmful.
+Project maintainers are responsible for clarifying the standards of acceptable
+behavior and are expected to take appropriate and fair corrective action in
+response to any instances of unacceptable behavior.
 
-Community leaders have the right and responsibility to remove, edit, or reject
-comments, commits, code, wiki edits, issues, and other contributions that are
-not aligned to this Code of Conduct, and will communicate reasons for moderation
-decisions when appropriate.
+Project maintainers have the right and responsibility to remove, edit, or
+reject comments, commits, code, wiki edits, issues, and other contributions
+that are not aligned to this Code of Conduct, or to ban temporarily or
+permanently any contributor for other behaviors that they deem inappropriate,
+threatening, offensive, or harmful.
 
 ## Scope
 
-This Code of Conduct applies within all community spaces, and also applies when
-an individual is officially representing the community in public spaces.
-Examples of representing our community include using an official e-mail address,
-posting via an official social media account, or acting as an appointed
-representative at an online or offline event.
+This Code of Conduct applies both within project spaces and in public spaces
+when an individual is representing the project or its community. Examples of
+representing a project or community include using an official project e-mail
+address, posting via an official social media account, or acting as an appointed
+representative at an online or offline event. Representation of a project may be
+further defined and clarified by project maintainers.
 
 ## Enforcement
 
 Instances of abusive, harassing, or otherwise unacceptable behavior may be
-reported to the community leaders responsible for enforcement at
-conduct@zephyrproject.org. Reports will be received by the Chair of the Zephyr
-Governing Board, the Zephyr Project Director (Linux Foundation), and the Zephyr
-Project Developer Advocate (Linux Foundation). You may refer to the [Governing
-Board](https://zephyrproject.org/governing-board/) and [Linux Foundation
-Staff](https://zephyrproject.org/staff/) web pages to identify who are the
-individuals currently holding these positions.
-All complaints will be reviewed and investigated promptly and fairly.
+reported by contacting the project team at conduct@zephyrproject.org.
+Reports will be received by Kate Stewart (Linux Foundation) and Amy Occhialino
+(Intel). All complaints will be reviewed and investigated, and will result in a
+response that is deemed necessary and appropriate to the circumstances. The
+project team is obligated to maintain confidentiality with regard to the
+reporter of an incident.  Further details of specific enforcement policies may
+be posted separately.
 
-All community leaders are obligated to respect the privacy and security of the
-reporter of any incident.
-
-## Enforcement Guidelines
-
-Community leaders will follow these Community Impact Guidelines in determining
-the consequences for any action they deem in violation of this Code of Conduct:
-
-### 1. Correction
-
-**Community Impact**: Use of inappropriate language or other behavior deemed
-unprofessional or unwelcome in the community.
-
-**Consequence**: A private, written warning from community leaders, providing
-clarity around the nature of the violation and an explanation of why the
-behavior was inappropriate. A public apology may be requested.
-
-### 2. Warning
-
-**Community Impact**: A violation through a single incident or series of
-actions.
-
-**Consequence**: A warning with consequences for continued behavior. No
-interaction with the people involved, including unsolicited interaction with
-those enforcing the Code of Conduct, for a specified period of time. This
-includes avoiding interactions in community spaces as well as external channels
-like social media. Violating these terms may lead to a temporary or permanent
-ban.
-
-### 3. Temporary Ban
-
-**Community Impact**: A serious violation of community standards, including
-sustained inappropriate behavior.
-
-**Consequence**: A temporary ban from any sort of interaction or public
-communication with the community for a specified period of time. No public or
-private interaction with the people involved, including unsolicited interaction
-with those enforcing the Code of Conduct, is allowed during this period.
-Violating these terms may lead to a permanent ban.
-
-### 4. Permanent Ban
-
-**Community Impact**: Demonstrating a pattern of violation of community
-standards, including sustained inappropriate behavior, harassment of an
-individual, or aggression toward or disparagement of classes of individuals.
-
-**Consequence**: A permanent ban from any sort of public interaction within the
-community.
+Project maintainers who do not follow or enforce the Code of Conduct in good
+faith may face temporary or permanent repercussions as determined by other
+members of the project's leadership.
 
 ## Attribution
 
-This Code of Conduct is adapted from the [Contributor Covenant][homepage],
-version 2.1, available at
-[https://www.contributor-covenant.org/version/2/1/code_of_conduct.html][v2.1].
-The only changes made by The Zephyr Project to the original document were to
-make explicit who the recipients of Code of Conduct incident reports are.
-
-Community Impact Guidelines were inspired by
-[Mozilla's code of conduct enforcement ladder][Mozilla CoC].
-
-For answers to common questions about this code of conduct, see the FAQ at
-[https://www.contributor-covenant.org/faq][FAQ]. Translations are available at
-[https://www.contributor-covenant.org/translations][translations].
+This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
+available at https://www.contributor-covenant.org/version/1/4/code-of-conduct.html
 
 [homepage]: https://www.contributor-covenant.org
-[v2.1]: https://www.contributor-covenant.org/version/2/1/code_of_conduct.html
-[Mozilla CoC]: https://github.com/mozilla/diversity
-[FAQ]: https://www.contributor-covenant.org/faq
-[translations]: https://www.contributor-covenant.org/translations
+
+For answers to common questions about this code of conduct, see
+https://www.contributor-covenant.org/faq

Kconfig.constants

@@ -1,19 +0,0 @@
-# Constant variables to be used across Kconfig options
-
-# Copyright (c) 2024 basalte bv
-# SPDX-License-Identifier: Apache-2.0
-
-INT8_MIN := -128
-INT16_MIN := -32768
-INT32_MIN := -2147483648
-INT64_MIN := -9223372036854775808
-
-INT8_MAX := 127
-INT16_MAX := 32767
-INT32_MAX := 2147483647
-INT64_MAX := 9223372036854775807
-
-UINT8_MAX := 255
-UINT16_MAX := 65535
-UINT32_MAX := 4294967295
-UINT64_MAX := 18446744073709551615

Kconfig.zephyr

@@ -2,12 +2,8 @@
 
 # Copyright (c) 2014-2015 Wind River Systems, Inc.
 # Copyright (c) 2016 Intel Corporation
-# Copyright (c) 2023 Nordic Semiconductor ASA
 # SPDX-License-Identifier: Apache-2.0
 
-source "Kconfig.constants"
-
-osource "${APPLICATION_SOURCE_DIR}/VERSION"
 
 # Include Kconfig.defconfig files first so that they can override defaults and
 # other symbol/choice properties by adding extra symbol/choice definitions.
@@ -18,24 +14,9 @@ osource "${APPLICATION_SOURCE_DIR}/VERSION"
 # precedence over SoC defaults, so include them in that order.
 #
 # $ARCH and $BOARD_DIR will be glob patterns when building documentation.
-# This loads custom shields defconfigs (from BOARD_ROOT)
-osource "$(KCONFIG_BINARY_DIR)/Kconfig.shield.defconfig"
-# This loads Zephyr base shield defconfigs
-source "boards/shields/*/Kconfig.defconfig"
-
-osource "$(BOARD_DIR)/Kconfig.defconfig"
-
-# This loads Zephyr specific SoC root defconfigs
-source "$(KCONFIG_BINARY_DIR)/soc/Kconfig.defconfig"
-
-# This loads the toolchain defconfigs
-osource "$(TOOLCHAIN_KCONFIG_DIR)/Kconfig.defconfig"
-# This loads the testsuite defconfig
-source "subsys/testsuite/Kconfig.defconfig"
-
-# This should be early since the autogen Kconfig.dts symbols may get
-# used by modules
-source "dts/Kconfig"
+source "$(KCONFIG_BINARY_DIR)/Kconfig.shield.defconfig"
+source "$(BOARD_DIR)/Kconfig.defconfig"
+source "$(KCONFIG_BINARY_DIR)/Kconfig.soc.defconfig"
 
 menu "Modules"
 
@@ -47,6 +28,7 @@ source "boards/Kconfig"
 source "soc/Kconfig"
 source "arch/Kconfig"
 source "kernel/Kconfig"
+source "dts/Kconfig"
 source "drivers/Kconfig"
 source "lib/Kconfig"
 source "subsys/Kconfig"
@@ -57,7 +39,7 @@ menu "Build and Link Features"
 
 menu "Linker Options"
 
-choice LINKER_ORPHAN_CONFIGURATION
+choice
 	prompt "Linker Orphan Section Handling"
 	default LINKER_ORPHAN_SECTION_WARN
 
@@ -80,6 +62,15 @@ config LINKER_ORPHAN_SECTION_ERROR
 
 endchoice
 
+config CODE_DATA_RELOCATION
+	bool "Relocate code/data sections"
+	depends on ARM
+	help
+	  When selected this will relocate .text, data and .bss sections from
+	  the specified files and places it in the required memory region. The
+	  files should be specified in the CMakeList.txt file with
+	  a cmake API zephyr_code_relocate().
+
 config HAS_FLASH_LOAD_OFFSET
 	bool
 	help
@@ -142,47 +133,8 @@ config ROM_START_OFFSET
 	  alignment requirements on most ARM targets, although some targets
 	  may require smaller or larger values.
 
-config ROM_END_OFFSET
-	hex "ROM end offset"
-	default 0
-	help
-	  If non-zero, this option reduces the maximum size that the Zephyr image is allowed to
-	  occupy, this is to allow for additional image storage which can be created and used by
-	  other systems such as bootloaders (for MCUboot, this would include the image swap
-	  fields and TLV storage at the end of the image).
-
-	  If unsure, leave at the default value 0.
-
-config LD_LINKER_SCRIPT_SUPPORTED
-	bool
-	default y
-
-choice LINKER_SCRIPT
-	prompt "Linker script"
-	default LD_LINKER_TEMPLATE if LD_LINKER_SCRIPT_SUPPORTED
-
-config LD_LINKER_TEMPLATE
-	bool "LD template"
-	depends on LD_LINKER_SCRIPT_SUPPORTED
-	help
-	  Select this option to use the LD linker script templates.
-	  The templates are pre-processed by the C pre-processor to create the
-	  final LD linker script.
-
-config CMAKE_LINKER_GENERATOR
-	bool "CMake generator"
-	depends on ARM
-	help
-	  Select this option to use the Zephyr CMake linker script generator.
-	  The linker configuration is written in CMake and the final linker
-	  script will be generated by the toolchain specific linker generator.
-	  For LD based linkers, this will be the ld generator, for ARMClang /
-	  armlink based linkers it will be the scatter generator.
-
-endchoice
-
 config HAVE_CUSTOM_LINKER_SCRIPT
-	bool "Custom linker script provided"
+	bool "Custom linker scripts provided"
 	help
 	  Set this option if you have a custom linker script which needed to
 	  be define in CUSTOM_LINKER_SCRIPT.
@@ -215,272 +167,26 @@ config LINKER_SORT_BY_ALIGNMENT
 	  in decreasing size of symbols. This helps to minimize
 	  padding between symbols.
 
-config SRAM_VECTOR_TABLE
-	bool "Place the vector table in SRAM instead of flash"
-	help
-	  The option specifies that the vector table should be placed at the
-	  start of SRAM instead of the start of flash.
-
-config HAS_SRAM_OFFSET
-	bool
-	help
-	  This option is selected by targets that require SRAM_OFFSET.
-
-config SRAM_OFFSET
-	hex "Kernel SRAM offset" if HAS_SRAM_OFFSET
-	default 0
-	help
-	  This option specifies the byte offset from the beginning of SRAM
-	  where the kernel begins. Changing this value from zero will affect
-	  the Zephyr image's link, and will decrease the total amount of
-	  SRAM available for use by application code.
-
-	  If unsure, leave at the default value 0.
-
-menu "Linker Sections"
-
-config LINKER_USE_BOOT_SECTION
-	bool "Use Boot Linker Section"
-	help
-	  If enabled, the symbols which are needed for the boot process
-	  will be put into another linker section reserved for these
-	  symbols.
-
-	  Requires that boot sections exist in the architecture, SoC,
-	  board or custom linker script.
-
-config LINKER_USE_PINNED_SECTION
-	bool "Use Pinned Linker Section"
-	help
-	  If enabled, the symbols which need to be pinned in memory
-	  will be put into another linker section reserved for pinned
-	  symbols. During boot, the corresponding memory will be marked
-	  as pinned.
-
-	  Requires that pinned sections exist in the architecture, SoC,
-	  board or custom linker script.
-
-config LINKER_GENERIC_SECTIONS_PRESENT_AT_BOOT
-	bool "Generic sections are present at boot" if DEMAND_PAGING && LINKER_USE_PINNED_SECTION
-	default y
-	help
-	  When disabled, the linker sections other than the boot and
-	  pinned sections will be marked as not present in the page
-	  tables. This allows kernel to pull in data pages on demand
-	  as required by current execution context when demand paging
-	  is enabled. There is no need to load all code and data into
-	  memory at once.
-
-	  If unsure, say Y.
-
-config LINKER_LAST_SECTION_ID
-	bool "Last section identifier"
-	default y
-	depends on ARM || ARM64 || RISCV
-	help
-	  If enabled, the last section will contain an identifier.
-	  This ensures that the '_flash_used' linker symbol will always be
-	  correctly calculated, even in cases where the location counter may
-	  have been incremented for alignment purposes but no data is placed
-	  after alignment.
-
-	  Note: in cases where the flash is fully used, for example application
-	  specific data is written at the end of the flash area, then writing a
-	  last section identifier may cause rom region overflow.
-	  In such cases this setting should be disabled.
-
-config LINKER_LAST_SECTION_ID_PATTERN
-	hex "Last section identifier pattern"
-	default "0xE015E015"
-	depends on LINKER_LAST_SECTION_ID
-	help
-	  Pattern to fill into last section as identifier.
-	  Default pattern is 0xE015 (end of last section), but any pattern can
-	  be used.
-	  The size of the pattern must not exceed 4 bytes.
-
-config LINKER_USE_NO_RELAX
-	bool
-	help
-	  Hidden symbol to allow features to force the use of no relax.
-
-config LINKER_USE_RELAX
-	bool "Linker optimization of call addressing"
-	depends on !LINKER_USE_NO_RELAX
-	default y
-	help
-	  This option performs global optimizations that become possible when the linker resolves
-	  addressing in the program, such as relaxing address modes and synthesizing new
-	  instructions in the output object file. For ld and lld, this enables `--relax`.
-	  On platforms where this is not supported, `--relax' is accepted, but ignored.
-	  Disabling it can reduce performance, as the linker is no longer able to substiture long /
-	  in-effective jump calls to shorter / more effective instructions.
-
-endmenu # "Linker Sections"
-
-config LINKER_ITERABLE_SUBALIGN
-	int
-	default 8 if 64BIT
-	default 4
-	help
-	  Hidden option for the default subalignment of iterable sections.
-
-config LINKER_DEVNULL_SUPPORT
-	bool
-	default y if CPU_CORTEX_M || (RISCV && !64BIT)
-
-config LINKER_DEVNULL_MEMORY
-	bool "Devnull region"
-	depends on LINKER_DEVNULL_SUPPORT
-	help
-	  Devnull region is created. It is stripped from final binary but remains
-	  in byproduct elf file.
-
-config LINKER_DEVNULL_MEMORY_SIZE
-	int "Devnull region size"
-	depends on LINKER_DEVNULL_MEMORY
-	default 262144
-	help
-	  Size can be adjusted so it fits all data placed in that region.
-
 endmenu
 
 menu "Compiler Options"
 
-config REQUIRES_STD_C99
-	bool
-	help
-	  Hidden option to select compiler support C99 standard or higher.
-
-config REQUIRES_STD_C11
-	bool
-	select REQUIRES_STD_C99
-	help
-	  Hidden option to select compiler support C11 standard or higher.
-
-config REQUIRES_STD_C17
-	bool
-	select REQUIRES_STD_C11
-	help
-	  Hidden option to select compiler support C17 standard or higher.
-
-config REQUIRES_STD_C23
-	bool
-	select REQUIRES_STD_C17
-	help
-	  Hidden option to select compiler support C23 standard or higher.
-
-choice STD_C
-	prompt "C Standard"
-	default STD_C23 if REQUIRES_STD_C23
-	default STD_C17 if REQUIRES_STD_C17
-	default STD_C11 if REQUIRES_STD_C11
-	default STD_C99
-	help
-	  C Standards.
-
-config STD_C90
-	bool "C90"
-	depends on !REQUIRES_STD_C99
-	help
-	  1989 C standard as completed in 1989 and ratified by ISO/IEC
-	  as ISO/IEC 9899:1990. This version is known as "ANSI C".
-
-config STD_C99
-	bool "C99"
-	depends on !REQUIRES_STD_C11
-	help
-	  1999 C standard.
-
-config STD_C11
-	bool "C11"
-	depends on !REQUIRES_STD_C17
-	help
-	  2011 C standard.
-
-config STD_C17
-	bool "C17"
-	depends on !REQUIRES_STD_C23
-	help
-	  2017 C standard, addresses defects in C11 without introducing
-	  new language features.
-
-config STD_C23
-	bool "C23"
-	help
-	  2023 C standard.
-
-endchoice
-
-config TOOLCHAIN_SUPPORTS_GNU_EXTENSIONS
-	bool
-	default y if "$(ZEPHYR_TOOLCHAIN_VARIANT)" = "zephyr"
-	help
-	  Hidden option to signal that toolchain supports GNU Extensions.
-
-config GNU_C_EXTENSIONS
-	bool "GNU C Extensions"
-	depends on TOOLCHAIN_SUPPORTS_GNU_EXTENSIONS
-	help
-	  Enable GNU C Extensions. GNU C provides several language features
-	  not found in ISO standard C.
-
 config CODING_GUIDELINE_CHECK
 	bool "Enforce coding guideline rules"
 	help
 	  Use available compiler flags to check coding guideline rules during
 	  the build.
 
-config NATIVE_LIBC
-	bool
-	select FULL_LIBC_SUPPORTED
-	help
-	  Zephyr will use the host system C library.
-
-config NATIVE_LIBCPP
-	bool
-	select FULL_LIBCPP_SUPPORTED
-	help
-	  Zephyr will use the host system C++ library
-
-config NATIVE_BUILD
-	bool
-	select NATIVE_LIBC if EXTERNAL_LIBC
-	select NATIVE_LIBCPP if EXTERNAL_LIBCPP
-	help
-	  Zephyr will be built targeting the host system for debug and
-	  development purposes.
-
 config NATIVE_APPLICATION
-	bool
-	default y if ARCH_POSIX
-	depends on !NATIVE_LIBRARY
-	select NATIVE_BUILD
+	bool "Build as a native host application"
 	help
 	  Build as a native application that can run on the host and using
 	  resources and libraries provided by the host.
 
-config NATIVE_LIBRARY
-	bool
-	select NATIVE_BUILD
-	help
-	  Build as a prelinked library for the native host target.
-	  This library can later be built into an executable for the host.
-
-config COMPILER_FREESTANDING
-	bool "Build in a freestanding compiler mode"
-	help
-	  Configure the compiler to operate in freestanding mode according to
-	  the C and C++ language specifications. Freestanding mode reduces the
-	  requirements of the compiler and language environment, which can
-	  negatively impact the ability for the compiler to detect errors and
-	  perform optimizations.
-
-choice COMPILER_OPTIMIZATIONS
+choice
 	prompt "Optimization level"
 	default NO_OPTIMIZATIONS    if COVERAGE
 	default DEBUG_OPTIMIZATIONS if DEBUG
-	default SIZE_OPTIMIZATIONS_AGGRESSIVE if "$(ZEPHYR_TOOLCHAIN_VARIANT)" = "llvm"
 	default SIZE_OPTIMIZATIONS
 	help
 	  Note that these flags shall only control the compiler
@@ -493,12 +199,6 @@ config SIZE_OPTIMIZATIONS
 	  Compiler optimizations will be set to -Os independently of other
 	  options.
 
-config SIZE_OPTIMIZATIONS_AGGRESSIVE
-	bool "Aggressively optimize for size"
-	help
-	  Compiler optimizations wil be set to -Oz independently of other
-	  options.
-
 config SPEED_OPTIMIZATIONS
 	bool "Optimize for speed"
 	help
@@ -517,74 +217,6 @@ config NO_OPTIMIZATIONS
 	  Compiler optimizations will be set to -O0 independently of other
 	  options.
 
-	  Selecting this option will likely require manual tuning of the
-	  default stack sizes in order to avoid stack overflows.
-endchoice
-
-config LTO
-	bool "Link Time Optimization [EXPERIMENTAL]"
-	depends on !(GEN_ISR_TABLES || GEN_IRQ_VECTOR_TABLE) || ISR_TABLES_LOCAL_DECLARATION
-	depends on !NATIVE_LIBRARY
-	depends on !CODE_DATA_RELOCATION
-	select EXPERIMENTAL
-	help
-	  This option enables Link Time Optimization.
-
-config COMPILER_WARNINGS_AS_ERRORS
-	bool "Treat warnings as errors"
-	help
-	  Turn on "warning as error" toolchain flags
-
-config COMPILER_SAVE_TEMPS
-	bool "Save temporary object files"
-	help
-	  Instruct the compiler to save the temporary intermediate files
-	  permanently. These can be useful for troubleshooting build issues.
-
-config COMPILER_TRACK_MACRO_EXPANSION
-	bool "Track macro expansion"
-	default y
-	help
-	  When enabled, locations of tokens across macro expansions will be
-	  tracked. Disabling this option may be useful to debug long macro
-	  expansion chains.
-
-config COMPILER_COLOR_DIAGNOSTICS
-	bool "Colored diagnostics"
-	default y
-	help
-	  Compiler diagnostic messages are colorized.
-
-choice COMPILER_SECURITY_FORTIFY
-	prompt "Detect buffer overflows in libc calls"
-	default FORTIFY_SOURCE_NONE if NO_OPTIMIZATIONS || MINIMAL_LIBC || NATIVE_BUILD
-	default FORTIFY_SOURCE_COMPILE_TIME
-	help
-	  Buffer overflow checking in libc calls. Supported by Clang and
-	  GCC when using Picolibc or Newlib. Requires compiler optimization
-	  to be enabled.
-
-config FORTIFY_SOURCE_NONE
-	bool "No detection"
-	help
-	  Disables both compile-time and run-time checking.
-
-config FORTIFY_SOURCE_COMPILE_TIME
-	bool "Compile-time detection"
-	help
-	  Enables only compile-time checking. Compile-time checking
-	  doesn't increase executable size or reduce performance, it
-	  limits checking to what can be done with information available
-	  at compile time.
-
-config FORTIFY_SOURCE_RUN_TIME
-	bool "Compile-time and run-time detection"
-	help
-	  Enables both compile-time and run-time checking. Run-time
-	  checking increases coverage at the expense of additional code,
-	  and means that applications will raise a runtime exception
-	  when buffer overflow is detected.
-
 endchoice
 
 config COMPILER_OPT
@@ -597,14 +229,6 @@ config COMPILER_OPT
 	  and can be used to change compiler optimization, warning and error
 	  messages, and so on.
 
-config MISRA_SANE
-	bool "MISRA standards compliance features"
-	help
-	  Causes the source code to build in "MISRA" mode, which
-	  disallows some otherwise-permitted features of the C
-	  standard for safety reasons.  Specifically variable length
-	  arrays are not permitted (and gcc will enforce this).
-
 endmenu
 
 choice
@@ -614,17 +238,17 @@ choice
 config ASSERT_ON_ERRORS
 	bool "Assert on all errors"
 	help
-	  Assert on errors covered with the CHECKIF() macro.
+	  Assert on errors covered with the CHECK macro.
 
 config NO_RUNTIME_CHECKS
 	bool "No runtime error checks"
 	help
-	  Do not do any runtime checks or asserts when using the CHECKIF() macro.
+	  Do not do any runtime checks or asserts when using the CHECK macro.
 
 config RUNTIME_ERROR_CHECKS
-	bool "Runtime error checks"
+	bool "Enable runtime error checks"
 	help
-	  Always perform runtime checks covered with the CHECKIF() macro. This
+	  Always perform runtime checks covered with the CHECK macro. This
 	  option is the default and the only option used during testing.
 
 endchoice
@@ -643,13 +267,9 @@ config OUTPUT_STAT
 	help
 	  Create a stat file using readelf -e <elf>
 
-config OUTPUT_SYMBOLS
-	bool "Create a symbol file"
-	help
-	  Create a symbol file using nm <elf>
-
 config OUTPUT_DISASSEMBLY
 	bool "Create a disassembly file"
+	default y
 	help
 	  Create an .lst file with the assembly listing of the firmware.
 
@@ -661,17 +281,6 @@ config OUTPUT_DISASSEMBLE_ALL
 	  The .lst file will contain complete disassembly of the firmware
 	  not just those expected to contain instructions including zeros
 
-config OUTPUT_DISASSEMBLY_WITH_SOURCE
-	bool "Include source code in output disassembly file"
-	default y
-	depends on OUTPUT_DISASSEMBLY && !OUTPUT_DISASSEMBLE_ALL
-	help
-	  The .lst file will also contain the source code. Having
-	  control over this can be useful for reproducible builds
-	  since it can be used to remove one of the elements of
-	  the .lst file that can vary across platforms because
-	  of reasons such as having ".." include paths.
-
 config OUTPUT_PRINT_MEMORY_USAGE
 	bool "Print memory usage to stdout"
 	default y
@@ -690,8 +299,7 @@ config CLEANUP_INTERMEDIATE_FILES
 	bool "Remove all intermediate files"
 	help
 	  Delete intermediate files to save space and cleanup clutter resulting
-	  from the build process. Note this breaks incremental builds, west spdx
-	  (Software Bill of Material generation), and maybe others.
+	  from the build process.
 
 config BUILD_NO_GAP_FILL
 	bool "Don't fill gaps in generated hex/bin/s19 files."
@@ -736,129 +344,12 @@ config BUILD_OUTPUT_S19
 	  Build an S19 binary zephyr/zephyr.s19 in the build directory.
 	  The name of this file can be customized with CONFIG_KERNEL_BIN_NAME.
 
-config BUILD_OUTPUT_UF2
-	bool "Build a binary in UF2 format"
-	depends on BUILD_OUTPUT_BIN
-	help
-	  Build a UF2 binary zephyr/zephyr.uf2 in the build directory.
-	  The name of this file can be customized with CONFIG_KERNEL_BIN_NAME.
-
-if BUILD_OUTPUT_UF2
-
-config BUILD_OUTPUT_UF2_FAMILY_ID
-	string "UF2 device family ID"
-	default "0x1c5f21b0" if SOC_SERIES_ESP32
-	default "0x621e937a" if SOC_NRF52833_QIAA
-	default "0xada52840" if SOC_NRF52840_QIAA
-	default "0x4fb2d5bd" if SOC_SERIES_IMXRT10XX || SOC_SERIES_IMXRT11XX
-	default "0x2abc77ec" if SOC_SERIES_LPC55XXX
-	default "0xe48bff56" if SOC_SERIES_RP2XXX
-	default "0x68ed2b88" if SOC_SERIES_SAMD21
-	default "0x55114460" if SOC_SERIES_SAMD51
-	default "0x647824b6" if SOC_SERIES_STM32F0X
-	default "0x5d1a0a2e" if SOC_SERIES_STM32F2X
-	default "0x6b846188" if SOC_SERIES_STM32F3X
-	default "0x53b80f00" if SOC_SERIES_STM32F7X
-	default "0x300f5633" if SOC_SERIES_STM32G0X
-	default "0x4c71240a" if SOC_SERIES_STM32G4X
-	default "0x6db66082" if SOC_SERIES_STM32H7X
-	default "0x202e3a91" if SOC_SERIES_STM32L0X
-	default "0x1e1f432d" if SOC_SERIES_STM32L1X
-	default "0x00ff6919" if SOC_SERIES_STM32L4X
-	default "0x04240bdf" if SOC_SERIES_STM32L5X
-	default "0x70d16653" if SOC_SERIES_STM32WBX
-	default "0x5ee21072" if SOC_STM32F103XE
-	default "0x57755a57" if SOC_SERIES_STM32F4X && (!SOC_STM32F407XE) && (!SOC_STM32F407XG)
-	default "0x6d0922fa" if SOC_STM32F407XE
-	default "0x8fb060fe" if SOC_STM32F407XG
-	help
-	  UF2 bootloaders only accept UF2 files with a matching family ID.
-	  This can be either a hex, e.g. 0x68ed2b88, or well-known family
-	  name string. If the SoC in use is known by UF2, the Family ID will
-	  be pre-filled with the known value.
-
-config BUILD_OUTPUT_UF2_USE_FLASH_BASE
-	bool
-	default n
-
-config BUILD_OUTPUT_UF2_USE_FLASH_OFFSET
-	bool
-	default n
-
-endif # BUILD_OUTPUT_UF2
-
 config BUILD_OUTPUT_STRIPPED
 	bool "Build a stripped binary"
 	help
 	  Build a stripped binary zephyr/zephyr.strip in the build directory.
 	  The name of this file can be customized with CONFIG_KERNEL_BIN_NAME.
 
-config BUILD_OUTPUT_COMPRESS_DEBUG_SECTIONS
-	bool "Compress debug sections in the ELF file"
-	help
-	  Compress debug sections in the ELF file to reduce the file size.
-
-config BUILD_OUTPUT_ADJUST_LMA
-	string
-	help
-	  This will adjust the LMA address in the final ELF and hex files with
-	  the value provided.
-	  This will not affect the internal address symbols inside the image but
-	  can be useful when adjusting the LMA address for flash tools or multi
-	  stage loaders where a pre-loader may copy image to a second location
-	  before booting a second core.
-	  The value will be evaluated as a math expression, this means that
-	  following are valid expression
-	  - 1024
-	  - 0x1000
-	  - -0x1000
-	  - 0x20000000 - 0x10000000
-	  Note: negative numbers are valid.
-	  To adjust according to a chosen flash partition one can specify a
-	  default as:
-	  DT_CHOSEN_IMAGE_<name> := <name>,<name>-partition
-	  DT_CHOSEN_Z_FLASH := zephyr,flash
-	  config BUILD_OUTPUT_ADJUST_LMA
-	    default "$(dt_chosen_reg_addr_hex,$(DT_CHOSEN_IMAGE_M4))-\
-	             $(dt_chosen_reg_addr_hex,$(DT_CHOSEN_Z_FLASH))"
-
-config BUILD_OUTPUT_ADJUST_LMA_SECTIONS
-	def_string "*"
-	depends on BUILD_OUTPUT_ADJUST_LMA!=""
-	help
-	  This determines the output sections to which the above LMA adjustment
-	  will be applied.
-	  The value can be the name of a section in the final ELF, like "text".
-	  It can also be a pattern with wildcards, such as "*bss", which could
-	  match more than one section name. Multiple such patterns can be given
-	  as a ";"-separated list. It's possible to supply a 'negative' pattern
-	  starting with "!", to exclude sections matched by a preceding pattern.
-
-	  By default, all sections will have their LMA adjusted. The following
-	  example excludes one section produced by the code relocation feature:
-	  config BUILD_OUTPUT_ADJUST_LMA_SECTIONS
-	    default "*;!.extflash_text_reloc"
-
-config BUILD_OUTPUT_INFO_HEADER
-	bool "Create a image information header"
-	help
-	  Create an image information header which will contain image
-	  information from the Zephyr binary.
-	  Example of information contained in the header file:
-	  - Number of segments in the image
-	  - LMA address of each segment
-	  - VMA address of each segment
-	  - Size of each segment
-
-config BUILD_ALIGN_LMA
-	bool "Align LMA in output image"
-	default y if BUILD_OUTPUT_ADJUST_LMA!=""
-	help
-	  Ensure that the LMA for each section in the output image respects
-	  the alignment requirements of that section. This is required for
-	  some tooling, such as objcopy, to be able to adjust the LMA of the
-	  ELF file.
-
 config APPLICATION_DEFINED_SYSCALL
 	bool "Scan application folder for any syscall definition"
 	help
@@ -871,130 +362,14 @@ config MAKEFILE_EXPORTS
 	  Generates a file with build information that can be read by
 	  third party Makefile-based build systems.
 
-config BUILD_OUTPUT_META
-	bool "Create a build meta file"
+config DEPRECATED_ZEPHYR_INT_TYPES
+	bool "Allow the use of the deprecated zephyr integer types"
 	help
-	  Create a build meta file in the build directory containing lists of:
-	  - Zephyr: path and revision (if git repo)
-	  - Zephyr modules: name, path, and revision (if git repo)
-	  - West:
-	    - manifest: path and revision
-	    - projects: path and revision
-	  - Workspace:
-	    - dirty: one or more repositories are marked dirty
-	    - extra: extra Zephyr modules are manually included in the build
-	    - off:   the SHA of one or more west projects are not what the manifest
-	             defined when `west update` was run the last time (`manifest-rev`).
-	             The off state is only present if a west workspace is found.
-	  File extension is .meta
-
-config BUILD_OUTPUT_META_STATE_PROPAGATE
-	bool "Propagate module and project state"
-	depends on BUILD_OUTPUT_META
-	help
-	  Propagate to state of each module to the Zephyr revision field.
-	  If west is used the state of each west project is also propagated to
-	  the Zephyr revision field.
-	  West manifest repo revision field will also
-	  be marked with the same state as the Zephyr revision.
-	  The final revision will become: <SHA>-<state1>-<state2>-<state3>...
-	  If no states are appended to the SHA it means the build is of a clean
-	  tree.
-	  - dirty: one or more repositories are marked dirty
-	  - extra: extra Zephyr modules are manually included in the build
-	  - off:   the SHA of one or more west projects are not what the manifest
-	           defined when `west update` was run the last time (`manifest-rev`).
-	           The off state is only present if a west workspace is found.
-
-config BUILD_OUTPUT_STRIP_PATHS
-	bool "Strip absolute paths from binaries"
-	default y
-	help
-	  If the compiler supports it, strip the ${ZEPHYR_BASE} prefix from the
-	  __FILE__ macro used in __ASSERT*, in the
-	  .noinit."/home/joe/zephyr/fu/bar.c" section names and in any
-	  application code.
-	  This saves some memory, stops leaking user locations in binaries, makes
-	  failure logs more deterministic and most importantly makes builds more
-	  deterministic.
-	  Debuggers usually have a path mapping feature to ensure the files are
-	  still found.
-
-config CHECK_INIT_PRIORITIES
-	bool "Build time initialization priorities check"
-	default y
-	# If we are building a native_simulator target, we can only check the init priorities
-	# if we are building the final output but we are not assembling several images together
-	depends on !(NATIVE_LIBRARY && (!BUILD_OUTPUT_EXE || NATIVE_SIMULATOR_EXTRA_IMAGE_PATHS != ""))
-	depends on "$(ZEPHYR_TOOLCHAIN_VARIANT)" != "armclang"
-	help
-	  Check the build for initialization priority issues by comparing the
-	  initialization priority in the build with the device dependency
-	  derived from the devicetree definition.
-
-	  Fails the build on priority errors (dependent devices, inverted
-	  priority).
-
-config EMIT_ALL_SYSCALLS
-	bool "Emit all possible syscalls in the tree"
-	help
-	  This tells the build system to emit all possible syscalls found
-	  in the tree, instead of only those syscalls associated with enabled
-	  drivers and subsystems.
+	  Allows the use of the deprecated Zephyr integer typedefs defined in
+	  Zephyr 2.3 and previous versions.  These types are:
+	  u8_t, u16_t, u32_t, u64_t, s8_t, s16_t, s32_t, and s64_t.
 
 endmenu
-
-config DEPRECATED
-	bool
-	help
-	  Symbol that must be selected by a feature or module if it is
-	  considered to be deprecated.
-	  When adding this to an option, remember to follow the instructions in
-	  https://docs.zephyrproject.org/latest/develop/api/api_lifecycle.html#deprecated
-
-config WARN_DEPRECATED
-	bool
-	default y
-	prompt "Warn on deprecated usage"
-	help
-	  Print a warning when the Kconfig tree is parsed if any deprecated
-	  features are enabled.
-
-config EXPERIMENTAL
-	bool
-	help
-	  Symbol that must be selected by a feature if it is considered to be
-	  at an experimental implementation stage.
-
-config WARN_EXPERIMENTAL
-	bool
-	prompt "Warn on experimental usage"
-	help
-	  Print a warning when the Kconfig tree is parsed if any experimental
-	  features are enabled.
-
-config TAINT
-	bool
-	help
-	  Symbol that must be selected by a feature or module if the Zephyr
-	  build is considered tainted.
-
-config ENFORCE_ZEPHYR_STDINT
-	bool
-	prompt "Enforce Zephyr convention for stdint"
-	depends on !ARCH_POSIX
-	default y
-	help
-	  This enforces the Zephyr stdint convention where int32_t = int,
-	  int64_t = long long, and intptr_t = long so that short string
-	  format length modifiers can be used universally across ILP32
-	  and LP64 architectures. Sometimes this is not possible e.g. when
-	  linking against a binary-only C++ library whose type mangling
-	  is incompatible with the Zephyr convention, or if the build
-	  environment doesn't allow such enforcement, in which case this
-	  should be turned off with the caveat that argument type validation
-	  on Zephyr code will be skipped.
-
 endmenu
 
 
@@ -1009,8 +384,8 @@ config IS_BOOTLOADER
 	  a separate Zephyr image payload.
 
 config BOOTLOADER_SRAM_SIZE
-	int "SRAM reserved for bootloader [DEPRECATED]"
-	default 0
+	int "SRAM reserved for bootloader"
+	default 16
 	depends on !XIP || IS_BOOTLOADER
 	depends on ARM || XTENSA
 	help
@@ -1020,23 +395,95 @@ config BOOTLOADER_SRAM_SIZE
 	  - Zephyr is a !XIP image, which implicitly assumes existence of a
 	  bootloader that loads the Zephyr !XIP image onto SRAM.
 
-	  This option is deprecated, users should transition to using DTS to set this, if needed.
-	  To be removed after Zephyr 3.7 release.
-
-config BOOTLOADER_SRAM_SIZE_DEPRECATED
+config MCUBOOT
 	bool
-	default y
-	select DEPRECATED
-	depends on BOOTLOADER_SRAM_SIZE != 0
-	depends on !XIP || IS_BOOTLOADER
-	depends on ARM || XTENSA
 	help
-	  Non-prompt symbol to indicate that the deprecated BOOTLOADER_SRAM_SIZE Kconfig has a
-	  non-0 value. Please transition to using devicetree.
+	  Hidden option used to indicate that the current image is MCUBoot
+
+config BOOTLOADER_MCUBOOT
+	bool "MCUboot bootloader support"
+	select USE_DT_CODE_PARTITION
+	imply INIT_ARCH_HW_AT_BOOT if ARCH_SUPPORTS_ARCH_HW_INIT
+	depends on !MCUBOOT
+	help
+	  This option signifies that the target uses MCUboot as a bootloader,
+	  or in other words that the image is to be chain-loaded by MCUboot.
+	  This sets several required build system and Device Tree options in
+	  order for the image generated to be bootable using the MCUboot open
+	  source bootloader. Currently this includes:
+
+	    * Setting ROM_START_OFFSET to a default value that allows space
+	      for the MCUboot image header
+	    * Activating SW_VECTOR_RELAY_CLIENT on Cortex-M0
+	      (or Armv8-M baseline) targets with no built-in vector relocation
+	      mechanisms
+
+	  By default, this option instructs Zephyr to initialize the core
+	  architecture HW registers during boot, when this is supported by
+	  the application. This removes the need by MCUboot to reset
+	  the core registers' state itself.
+
+if BOOTLOADER_MCUBOOT
+
+config MCUBOOT_SIGNATURE_KEY_FILE
+	string "Path to the mcuboot signing key file"
+	default ""
+	help
+	  The file contains a key pair whose public half is verified
+	  by your target's MCUboot image. The file is in PEM format.
+
+	  If set to a non-empty value, the build system tries to
+	  sign the final binaries using a 'west sign -t imgtool' command.
+	  The signed binaries are placed in the build directory
+	  at zephyr/zephyr.signed.bin and zephyr/zephyr.signed.hex.
+
+	  The file names can be customized with CONFIG_KERNEL_BIN_NAME.
+	  The existence of bin and hex files depends on CONFIG_BUILD_OUTPUT_BIN
+	  and CONFIG_BUILD_OUTPUT_HEX.
+
+	  This option should contain an absolute path to the same file
+	  as the BOOT_SIGNATURE_KEY_FILE option in your MCUboot
+	  .config. (The MCUboot config option is used for the MCUboot
+	  bootloader image; this option is for your application which
+	  is to be loaded by MCUboot. The MCUboot config option can be
+	  a relative path from the MCUboot repository root; this option's
+	  behavior is undefined for relative paths.)
+
+	  If left empty, you must sign the Zephyr binaries manually.
+
+config MCUBOOT_EXTRA_IMGTOOL_ARGS
+	string "Extra arguments to pass to imgtool"
+	default ""
+	help
+	  If CONFIG_MCUBOOT_SIGNATURE_KEY_FILE is a non-empty string,
+	  you can use this option to pass extra options to imgtool.
+	  For example, you could set this to "--version 1.2".
+
+config MCUBOOT_GENERATE_CONFIRMED_IMAGE
+	bool "Also generate a padded, confirmed image"
+	help
+	  The signed, padded, and confirmed binaries are placed in the build
+	  directory at zephyr/zephyr.signed.confirmed.bin and
+	  zephyr/zephyr.signed.confirmed.hex.
+
+	  The file names can be customized with CONFIG_KERNEL_BIN_NAME.
+	  The existence of bin and hex files depends on CONFIG_BUILD_OUTPUT_BIN
+	  and CONFIG_BUILD_OUTPUT_HEX.
+
+endif # BOOTLOADER_MCUBOOT
+
+config BOOTLOADER_ESP_IDF
+	bool "ESP-IDF bootloader support"
+	depends on SOC_ESP32
+	help
+	  This option will trigger the compilation of the ESP-IDF bootloader
+	  inside the build folder.
+	  At flash time, the bootloader will be flashed with the zephyr image
 
 config BOOTLOADER_BOSSA
 	bool "BOSSA bootloader support"
 	select USE_DT_CODE_PARTITION
+	depends on SOC_FAMILY_SAM0
 
 	help
 	  Signifies that the target uses a BOSSA compatible bootloader.  If CDC
@@ -1054,13 +501,6 @@ choice
 	prompt "BOSSA bootloader variant"
 	depends on BOOTLOADER_BOSSA
 
-config BOOTLOADER_BOSSA_LEGACY
-	bool "Legacy"
-	help
-	  Select the Legacy variant of the BOSSA bootloader.  This is defined
-	  for compatibility mode only.  The recommendation is use newer
-	  versions like Arduino or Adafruit UF2.
-
 config BOOTLOADER_BOSSA_ARDUINO
 	bool "Arduino"
 	help
@@ -1075,21 +515,31 @@ config BOOTLOADER_BOSSA_ADAFRUIT_UF2
 
 endchoice
 
+config REBOOT
+	bool "Reboot functionality"
+	select SYSTEM_CLOCK_DISABLE
+	help
+	  Enable the sys_reboot() API. Enabling this can drag in other subsystems
+	  needed to perform a "safe" reboot (e.g. SYSTEM_CLOCK_DISABLE, to stop the
+	  system clock before issuing a reset).
+
+config MISRA_SANE
+	bool "MISRA standards compliance features"
+	help
+	  Causes the source code to build in "MISRA" mode, which
+	  disallows some otherwise-permitted features of the C
+	  standard for safety reasons.  Specifically variable length
+	  arrays are not permitted (and gcc will enforce this).
+
 endmenu
 
 menu "Compatibility"
 
-config LEGACY_GENERATED_INCLUDE_PATH
-	bool "Legacy include path for generated headers"
+config COMPAT_INCLUDES
+	bool "Suppress warnings when using header shims"
 	default y
 	help
-	  Allow applications and libraries to use the Zephyr legacy include
-	  path for the generated headers which does not use the `zephyr/` prefix.
-
-	  From now on, i.e., the preferred way to include the `version.h` header is to
-	  use <zephyr/version.h>, this Kconfig is currently enabled by default so that
-	  user applications won't immediately fail to compile.
-
-	  This Kconfig will be deprecated and eventually removed in the future releases.
+	  Suppress any warnings from the pre-processor when including
+	  deprecated header files.
 
 endmenu

Makefile

@@ -0,0 +1,30 @@
+#
+# Top level makefile for documentation build
+#
+
+BUILDDIR ?= doc/_build
+DOC_TAG ?= development
+SPHINXOPTS ?= -q
+KCONFIG_TURBO_MODE ?= 0
+
+# Documentation targets
+# ---------------------------------------------------------------------------
+
+.PHONY: clean htmldocs htmldocs-fast pdfdocs doxygen
+
+htmldocs-fast:
+	${MAKE} htmldocs KCONFIG_TURBO_MODE=1
+
+htmldocs pdfdocs doxygen: configure
+	cmake --build ${BUILDDIR} -- $@  # -v # VERBOSE=1
+
+# Run CMake every time cause it's quick and re-configures TURBO_MODE if
+# needed
+.PHONY: configure
+configure:
+	cmake -GNinja  -B${BUILDDIR} -Sdoc/ -DDOC_TAG=${DOC_TAG} \
+		-DSPHINXOPTS=${SPHINXOPTS} \
+		-DKCONFIG_TURBO_MODE=${KCONFIG_TURBO_MODE}
+
+clean:
+	rm -rf ${BUILDDIR}

README.rst

@@ -2,23 +2,15 @@
 
    <a href="https://www.zephyrproject.org">
      <p align="center">
-       <picture>
-         <source media="(prefers-color-scheme: dark)" srcset="doc/_static/images/logo-readme-dark.svg">
-         <source media="(prefers-color-scheme: light)" srcset="doc/_static/images/logo-readme-light.svg">
-         <img src="doc/_static/images/logo-readme-light.svg">
-       </picture>
+       <img src="doc/images/Zephyr-Project.png">
      </p>
    </a>
 
-   <a href="https://bestpractices.coreinfrastructure.org/projects/74">
-     <img src="https://bestpractices.coreinfrastructure.org/projects/74/badge">
-   </a>
-   <a href="https://scorecard.dev/viewer/?uri=github.com/zephyrproject-rtos/zephyr">
-     <img src="https://api.securityscorecards.dev/projects/github.com/zephyrproject-rtos/zephyr/badge">
-   </a>
-   <a href="https://github.com/zephyrproject-rtos/zephyr/actions/workflows/twister.yaml?query=branch%3Amain">
-     <img src="https://github.com/zephyrproject-rtos/zephyr/actions/workflows/twister.yaml/badge.svg?event=push">
-   </a>
+   <a href="https://bestpractices.coreinfrastructure.org/projects/74"><img
+   src="https://bestpractices.coreinfrastructure.org/projects/74/badge"></a>
+   <a href="https://buildkite.com/zephyr/zephyr">
+   <img
+   src="https://badge.buildkite.com/f5bd0dc88306cee17c9b38e78d11bb74a6291e3f40e7d13f31.svg?branch=master"></a>
 
 
 The Zephyr Project is a scalable real-time operating system (RTOS) supporting
@@ -29,12 +21,13 @@ The Zephyr OS is based on a small-footprint kernel designed for use on
 resource-constrained systems: from simple embedded environmental sensors and
 LED wearables to sophisticated smart watches and IoT wireless gateways.
 
-The Zephyr kernel supports multiple architectures, including ARM (Cortex-A,
-Cortex-R, Cortex-M), Intel x86, ARC, Nios II, Tensilica Xtensa, and RISC-V,
-SPARC, MIPS, and a large number of `supported boards`_.
+The Zephyr kernel supports multiple architectures, including ARM Cortex-M,
+Intel x86, ARC, Nios II, Tensilica Xtensa, and RISC-V, and a large number of
+`supported boards`_.
 
 .. below included in doc/introduction/introduction.rst
 
+.. start_include_here
 
 Getting Started
 ***************
@@ -42,12 +35,10 @@ Getting Started
 Welcome to Zephyr! See the `Introduction to Zephyr`_ for a high-level overview,
 and the documentation's `Getting Started Guide`_ to start developing.
 
-.. start_include_here
-
 Community Support
 *****************
 
-Community support is provided via mailing lists and Discord; see the Resources
+Community support is provided via mailing lists and Slack; see the Resources
 below for details.
 
 .. _project-resources:
@@ -57,59 +48,40 @@ Resources
 
 Here's a quick summary of resources to help you find your way around:
 
-Getting Started
----------------
+* **Help**: `Asking for Help Tips`_
+* **Documentation**: http://docs.zephyrproject.org (`Getting Started Guide`_)
+* **Source Code**: https://github.com/zephyrproject-rtos/zephyr is the main
+  repository; https://elixir.bootlin.com/zephyr/latest/source contains a
+  searchable index
+* **Releases**: https://github.com/zephyrproject-rtos/zephyr/releases
+* **Samples and example code**: see `Sample and Demo Code Examples`_
+* **Mailing Lists**: users@lists.zephyrproject.org and
+  devel@lists.zephyrproject.org are the main user and developer mailing lists,
+  respectively. You can join the developer's list and search its archives at
+  `Zephyr Development mailing list`_. The other `Zephyr mailing list
+  subgroups`_ have their own archives and sign-up pages.
+* **Nightly CI Build Status**: https://lists.zephyrproject.org/g/builds
+  The builds@lists.zephyrproject.org mailing list archives the CI
+  (shippable) nightly build results.
+* **Chat**: Zephyr's Slack workspace is https://zephyrproject.slack.com.  Use
+  this `Slack Invite`_ to register.
+* **Contributing**: see the `Contribution Guide`_
+* **Wiki**: `Zephyr GitHub wiki`_
+* **Issues**: https://github.com/zephyrproject-rtos/zephyr/issues
+* **Security Issues**: Email vulnerabilities@zephyrproject.org to report
+  security issues; also see our `Security`_ documentation. Security issues are
+  tracked separately at https://zephyrprojectsec.atlassian.net.
+* **Zephyr Project Website**: https://zephyrproject.org
 
-  | 📖 `Zephyr Documentation`_
-  | 🚀 `Getting Started Guide`_
-  | 🙋🏽 `Tips when asking for help`_
-  | 💻 `Code samples`_
-
-Code and Development
---------------------
-
-  | 🌐 `Source Code Repository`_
-  | 📦 `Releases`_
-  | 🤝 `Contribution Guide`_
-
-Community and Support
----------------------
-
-  | 💬 `Discord Server`_ for real-time community discussions
-  | 📧 `User mailing list (users@lists.zephyrproject.org)`_
-  | 📧 `Developer mailing list (devel@lists.zephyrproject.org)`_
-  | 📬 `Other project mailing lists`_
-  | 📚 `Project Wiki`_
-
-Issue Tracking and Security
----------------------------
-
-  | 🐛 `GitHub Issues`_
-  | 🔒 `Security documentation`_
-  | 🛡️ `Security Advisories Repository`_
-  | ⚠️ Report security vulnerabilities at vulnerabilities@zephyrproject.org
-
-Additional Resources
---------------------
-  | 🌐 `Zephyr Project Website`_
-  | 📺 `Zephyr Tech Talks`_
-
-.. _Zephyr Project Website: https://www.zephyrproject.org
-.. _Discord Server: https://chat.zephyrproject.org
-.. _supported boards: https://docs.zephyrproject.org/latest/boards/index.html
-.. _Zephyr Documentation: https://docs.zephyrproject.org
-.. _Introduction to Zephyr: https://docs.zephyrproject.org/latest/introduction/index.html
-.. _Getting Started Guide: https://docs.zephyrproject.org/latest/develop/getting_started/index.html
-.. _Contribution Guide: https://docs.zephyrproject.org/latest/contribute/index.html
-.. _Source Code Repository: https://github.com/zephyrproject-rtos/zephyr
-.. _GitHub Issues: https://github.com/zephyrproject-rtos/zephyr/issues
-.. _Releases: https://github.com/zephyrproject-rtos/zephyr/releases
-.. _Project Wiki: https://github.com/zephyrproject-rtos/zephyr/wiki
-.. _User mailing list (users@lists.zephyrproject.org): https://lists.zephyrproject.org/g/users
-.. _Developer mailing list (devel@lists.zephyrproject.org): https://lists.zephyrproject.org/g/devel
-.. _Other project mailing lists: https://lists.zephyrproject.org/g/main/subgroups
-.. _Code samples: https://docs.zephyrproject.org/latest/samples/index.html
-.. _Security documentation: https://docs.zephyrproject.org/latest/security/index.html
-.. _Security Advisories Repository: https://github.com/zephyrproject-rtos/zephyr/security
-.. _Tips when asking for help: https://docs.zephyrproject.org/latest/develop/getting_started/index.html#asking-for-help
-.. _Zephyr Tech Talks: https://www.zephyrproject.org/tech-talks
+.. _Slack Invite: https://tinyurl.com/y5glwylp
+.. _supported boards: http://docs.zephyrproject.org/latest/boards/index.html
+.. _Zephyr Documentation: http://docs.zephyrproject.org
+.. _Introduction to Zephyr: http://docs.zephyrproject.org/latest/introduction/index.html
+.. _Getting Started Guide: http://docs.zephyrproject.org/latest/getting_started/index.html
+.. _Contribution Guide: http://docs.zephyrproject.org/latest/contribute/index.html
+.. _Zephyr GitHub wiki: https://github.com/zephyrproject-rtos/zephyr/wiki
+.. _Zephyr Development mailing list: https://lists.zephyrproject.org/g/devel
+.. _Zephyr mailing list subgroups: https://lists.zephyrproject.org/g/main/subgroups
+.. _Sample and Demo Code Examples: http://docs.zephyrproject.org/latest/samples/index.html
+.. _Security: http://docs.zephyrproject.org/latest/security/index.html
+.. _Asking for Help Tips: https://docs.zephyrproject.org/latest/guides/getting-help.html

SDK_VERSION

@@ -1 +0,0 @@
-0.16.8

VERSION

@@ -1,5 +1,5 @@
-VERSION_MAJOR = 3
-VERSION_MINOR = 7
-PATCHLEVEL = 99
+VERSION_MAJOR = 2
+VERSION_MINOR = 5
+PATCHLEVEL = 1
 VERSION_TWEAK = 0
-EXTRAVERSION =
+EXTRAVERSION = rc1

arch/CMakeLists.txt

@@ -1,8 +1,5 @@
 # SPDX-License-Identifier: Apache-2.0
 
-# FIXME: SHADOW_VARS: Remove this once we have enabled -Wshadow globally.
-add_compile_options($<TARGET_PROPERTY:compiler,warning_shadow_variables>)
-
 add_definitions(-D__ZEPHYR_SUPERVISOR__)
 
 include_directories(

arch/Kconfig

@@ -8,10 +8,8 @@
 # Include these first so that any properties (e.g. defaults) below can be
 # overridden (by defining symbols in multiple locations)
 
-source "$(ARCH_DIR)/Kconfig.$(HWM_SCHEME)"
-
-# ToDo: Generate a Kconfig.arch for loading of additional arch in HWMv2.
-osource "$(KCONFIG_BINARY_DIR)/Kconfig.arch"
+# Note: $ARCH might be a glob pattern
+source "$(ARCH_DIR)/$(ARCH)/Kconfig"
 
 # Architecture symbols
 #
@@ -21,10 +19,9 @@ osource "$(KCONFIG_BINARY_DIR)/Kconfig.arch"
 config ARC
 	bool
 	select ARCH_IS_SET
+	select HAS_DTS
 	imply XIP
 	select ARCH_HAS_THREAD_LOCAL_STORAGE
-	select ARCH_SUPPORTS_ROM_START
-	select ARCH_HAS_DIRECTED_IPIS
 	help
 	  ARC architecture
 
@@ -32,37 +29,14 @@ config ARM
 	bool
 	select ARCH_IS_SET
 	select ARCH_SUPPORTS_COREDUMP if CPU_CORTEX_M
-	select ARCH_SUPPORTS_COREDUMP_THREADS if CPU_CORTEX_M
+	select HAS_DTS
 	# FIXME: current state of the code for all ARM requires this, but
 	# is really only necessary for Cortex-M with ARM MPU!
 	select GEN_PRIV_STACKS
-	select ARCH_HAS_THREAD_LOCAL_STORAGE if CPU_AARCH32_CORTEX_R || CPU_CORTEX_M || CPU_AARCH32_CORTEX_A
-	select BARRIER_OPERATIONS_ARCH
+	select ARCH_HAS_THREAD_LOCAL_STORAGE if ARM64 || CPU_CORTEX_R || CPU_CORTEX_M
 	help
 	  ARM architecture
 
-config ARM64
-	bool
-	select ARCH_IS_SET
-	select 64BIT
-	select ARCH_SUPPORTS_COREDUMP
-	select HAS_ARM_SMCCC
-	select ARCH_HAS_THREAD_LOCAL_STORAGE
-	select USE_SWITCH
-	select USE_SWITCH_SUPPORTED
-	select IRQ_OFFLOAD_NESTED if IRQ_OFFLOAD
-	select BARRIER_OPERATIONS_ARCH
-	select ARCH_HAS_DIRECTED_IPIS
-	help
-	  ARM64 (AArch64) architecture
-
-config MIPS
-	bool
-	select ARCH_IS_SET
-	select ATOMIC_OPERATIONS_C
-	help
-	  MIPS architecture
-
 config SPARC
 	bool
 	select ARCH_IS_SET
@@ -72,7 +46,6 @@ config SPARC
 	select ATOMIC_OPERATIONS_BUILTIN if SPARC_CASA
 	select ATOMIC_OPERATIONS_C if !SPARC_CASA
 	select ARCH_HAS_THREAD_LOCAL_STORAGE
-	select ARCH_HAS_EXTRA_EXCEPTION_INFO
 	help
 	  SPARC architecture
 
@@ -80,21 +53,15 @@ config X86
 	bool
 	select ARCH_IS_SET
 	select ATOMIC_OPERATIONS_BUILTIN
+	select HAS_DTS
 	select ARCH_SUPPORTS_COREDUMP
-	select ARCH_SUPPORTS_ROM_START if !X86_64
 	select CPU_HAS_MMU
 	select ARCH_MEM_DOMAIN_DATA if USERSPACE && !X86_COMMON_PAGE_TABLE
 	select ARCH_MEM_DOMAIN_SYNCHRONOUS_API if USERSPACE
 	select ARCH_HAS_GDBSTUB if !X86_64
 	select ARCH_HAS_TIMING_FUNCTIONS
 	select ARCH_HAS_THREAD_LOCAL_STORAGE
-	select ARCH_HAS_DEMAND_PAGING if !X86_64
-	select IRQ_OFFLOAD_NESTED if IRQ_OFFLOAD
-	select NEED_LIBC_MEM_PARTITION if USERSPACE && TIMING_FUNCTIONS \
-					  && !BOARD_HAS_TIMING_FUNCTIONS \
-					  && !SOC_HAS_TIMING_FUNCTIONS
-	select ARCH_HAS_STACK_CANARIES_TLS
-	select ARCH_SUPPORTS_MEM_MAPPED_STACKS if X86_MMU && !DEMAND_PAGING
+	select ARCH_HAS_DEMAND_PAGING
 	help
 	  x86 architecture
 
@@ -102,6 +69,7 @@ config NIOS2
 	bool
 	select ARCH_IS_SET
 	select ATOMIC_OPERATIONS_C
+	select HAS_DTS
 	imply XIP
 	select ARCH_HAS_TIMING_FUNCTIONS
 	help
@@ -110,17 +78,8 @@ config NIOS2
 config RISCV
 	bool
 	select ARCH_IS_SET
-	select ARCH_SUPPORTS_COREDUMP
-	select ARCH_SUPPORTS_ROM_START if !SOC_FAMILY_ESPRESSIF_ESP32
-	select ARCH_HAS_CODE_DATA_RELOCATION
+	select HAS_DTS
 	select ARCH_HAS_THREAD_LOCAL_STORAGE
-	select ARCH_HAS_STACKWALK
-	select IRQ_OFFLOAD_NESTED if IRQ_OFFLOAD
-	select USE_SWITCH_SUPPORTED
-	select USE_SWITCH
-	select SCHED_IPI_SUPPORTED if SMP
-	select ARCH_HAS_DIRECTED_IPIS
-	select BARRIER_OPERATIONS_BUILTIN
 	imply XIP
 	help
 	  RISCV architecture
@@ -128,35 +87,22 @@ config RISCV
 config XTENSA
 	bool
 	select ARCH_IS_SET
+	select HAS_DTS
 	select USE_SWITCH
 	select USE_SWITCH_SUPPORTED
-	select IRQ_OFFLOAD_NESTED if IRQ_OFFLOAD
-	select ARCH_HAS_CODE_DATA_RELOCATION
-	select ARCH_HAS_TIMING_FUNCTIONS
-	select ARCH_MEM_DOMAIN_DATA if USERSPACE
-	select ARCH_HAS_DIRECTED_IPIS
-	select THREAD_STACK_INFO
 	help
 	  Xtensa architecture
 
 config ARCH_POSIX
 	bool
 	select ARCH_IS_SET
+	select HAS_DTS
 	select ATOMIC_OPERATIONS_BUILTIN
 	select ARCH_HAS_CUSTOM_SWAP_TO_MAIN
 	select ARCH_HAS_CUSTOM_BUSY_WAIT
 	select ARCH_HAS_THREAD_ABORT
-	select NATIVE_BUILD
+	select NATIVE_APPLICATION
 	select HAS_COVERAGE_SUPPORT
-	select BARRIER_OPERATIONS_BUILTIN
-	# POSIX arch based targets get their memory cleared on entry by the host OS
-	select SKIP_BSS_CLEAR
-	# Override the C standard used for compilation to C 2011
-	# This is due to some tests using _Static_assert which is a 2011 feature, but
-	# otherwise relying on compilers supporting it also when set to C99.
-	# This was in general ok, but with some host compilers and C library versions
-	# it led to problems. So we override it to 2011 for the native targets.
-	select REQUIRES_STD_C11
 	help
 	  POSIX (native) architecture
 
@@ -168,12 +114,14 @@ config ARCH_IS_SET
 
 menu "General Architecture Options"
 
-source "arch/common/Kconfig"
-
 module = ARCH
 module-str = arch
 source "subsys/logging/Kconfig.template.log_config"
 
+module = MPU
+module-str = mpu
+source "subsys/logging/Kconfig.template.log_config"
+
 config BIG_ENDIAN
 	bool
 	help
@@ -184,14 +132,6 @@ config BIG_ENDIAN
 	  modifying it.  The option is used to select linker script OUTPUT_FORMAT
 	  and command line option for gen_isr_tables.py.
 
-config LITTLE_ENDIAN
-	# Hidden Kconfig option representing the default little-endian architecture
-	# This is just the opposite of BIG_ENDIAN and is used for non-negative
-	# conditional compilation
-	bool
-	depends on !BIG_ENDIAN
-	default y
-
 config 64BIT
 	bool
 	help
@@ -216,19 +156,18 @@ config SRAM_BASE_ADDRESS
 	hex "SRAM Base Address"
 	default $(dt_chosen_reg_addr_hex,$(DT_CHOSEN_Z_SRAM))
 	help
-	  The SRAM base address. The default value comes from
+	  The SRAM base address. The default value comes from from
 	  /chosen/zephyr,sram in devicetree. The user should generally avoid
 	  changing it via menuconfig or in configuration files.
 
-if ARC || ARM || ARM64 || NIOS2 || X86 || RISCV
+if ARC || ARM || NIOS2 || X86
 
 # Workaround for not being able to have commas in macro arguments
 DT_CHOSEN_Z_FLASH := zephyr,flash
 
 config FLASH_SIZE
 	int "Flash Size in kB"
-	default $(dt_chosen_reg_size_int,$(DT_CHOSEN_Z_FLASH),0,K) if (XIP && (ARM ||ARM64)) || !ARM
-	default 0 if !XIP
+	default $(dt_chosen_reg_size_int,$(DT_CHOSEN_Z_FLASH),0,K) if (XIP && ARM) || !ARM
 	help
 	  This option specifies the size of the flash in kB.  It is normally set by
 	  the board's defconfig file and the user should generally avoid modifying
@@ -236,14 +175,13 @@ config FLASH_SIZE
 
 config FLASH_BASE_ADDRESS
 	hex "Flash Base Address"
-	default $(dt_chosen_reg_addr_hex,$(DT_CHOSEN_Z_FLASH)) if (XIP && (ARM || ARM64)) || !ARM
-	default 0 if !XIP
+	default $(dt_chosen_reg_addr_hex,$(DT_CHOSEN_Z_FLASH)) if (XIP && ARM) || !ARM
 	help
 	  This option specifies the base address of the flash on the board. It is
 	  normally set by the board's defconfig file and the user should generally
 	  avoid modifying it via the menu configuration.
 
-endif # ARM || ARM64 || ARC || NIOS2 || X86 || RISCV
+endif # ARM || ARC || NIOS2 || X86
 
 if ARCH_HAS_TRUSTED_EXECUTION
 
@@ -293,12 +231,11 @@ config USERSPACE
 	depends on RUNTIME_ERROR_CHECKS
 	depends on SRAM_REGION_PERMISSIONS
 	select THREAD_STACK_INFO
-	select LINKER_USE_NO_RELAX
 	help
 	  When enabled, threads may be created or dropped down to user mode,
 	  which has significantly restricted permissions and must interact
 	  with the kernel via system calls. See Zephyr documentation for more
-	  details about this feature.
+	  details	about this feature.
 
 	  If a user thread overflows its stack, this will be caught and the
 	  kernel itself will be shielded from harm. Enabling this option
@@ -308,7 +245,6 @@ config USERSPACE
 
 config PRIVILEGED_STACK_SIZE
 	int "Size of privileged stack"
-	default 2048 if EMUL
 	default 1024
 	depends on ARCH_HAS_USERSPACE
 	help
@@ -319,7 +255,7 @@ config PRIVILEGED_STACK_SIZE
 	  a multiple of the minimum stack alignment.
 
 config KOBJECT_TEXT_AREA
-	int "Size of kobject text area"
+	int "Size if kobject text area"
 	default 512 if COVERAGE_GCOV
 	default 512 if NO_OPTIMIZATIONS
 	default 512 if STACK_CANARIES && RISCV
@@ -328,28 +264,6 @@ config KOBJECT_TEXT_AREA
 	help
 	  Size of kernel object text area. Used in linker script.
 
-config KOBJECT_DATA_AREA_RESERVE_EXTRA_PERCENT
-	int "Reserve extra kobject data area (in percentage)"
-	default 100
-	depends on ARCH_HAS_USERSPACE
-	help
-	  Multiplication factor used to calculate the size of placeholder to
-	  reserve space for kobject metadata hash table. The hash table is
-	  generated via gperf is highly dependent on the absolute addresses of
-	  kobjects which might change between prebuilts. To reserve enough
-	  space for the hash table during final linking passes to keep
-	  kobjects in same place, the size of reserved space is calculated
-	  from the first prebuilt plus additional space calculated with
-	  this percentage (of the kobject data area in first prebuilt).
-
-config KOBJECT_RODATA_AREA_EXTRA_BYTES
-	int "Reserve extra bytes for kobject rodata area"
-	default 16
-	depends on ARCH_HAS_USERSPACE
-	help
-	  Reserve a few more bytes for the RODATA region for kobject metadata.
-	  This is to account for the uncertainty of tables generated by gperf.
-
 config GEN_PRIV_STACKS
 	bool
 	help
@@ -407,70 +321,15 @@ config NOCACHE_MEMORY
 	  transfers when cache coherence issues are not optimal or can not
 	  be solved using cache maintenance operations.
 
-config FRAME_POINTER
-	bool "Compile the kernel with frame pointers"
-	select OVERRIDE_FRAME_POINTER_DEFAULT
-	help
-	  Select Y here to gain precise stack traces at the expense of slightly
-	  increased size and decreased speed.
-
-config ARCH_STACKWALK_MAX_FRAMES
-	int "Max depth for stack walk function"
-	default 8
-	depends on ARCH_HAS_STACKWALK
-	help
-	  Depending on implementation, this can place a hard limit on the depths of the stack
-	  for the stack walk function to examine.
-
 menu "Interrupt Configuration"
 
-config ISR_TABLES_LOCAL_DECLARATION_SUPPORTED
-	bool
-	default y
-	# Userspace is currently not supported
-	depends on !USERSPACE
-	# List of currently supported architectures
-	depends on ARM || ARM64
-	# List of currently supported toolchains
-	depends on "$(ZEPHYR_TOOLCHAIN_VARIANT)" = "zephyr" || "$(ZEPHYR_TOOLCHAIN_VARIANT)" = "gnuarmemb"
-
-config ISR_TABLES_LOCAL_DECLARATION
-	bool "ISR tables created locally and placed by linker [EXPERIMENTAL]"
-	depends on ISR_TABLES_LOCAL_DECLARATION_SUPPORTED
-	select EXPERIMENTAL
-	help
-	  Enable new scheme of interrupt tables generation.
-	  This is totally different generator that would create tables entries locally
-	  where the IRQ_CONNECT macro is called and then use the linker script to position it
-	  in the right place in memory.
-	  The most important advantage of such approach is that the generated interrupt tables
-	  are LTO compatible.
-	  The drawback is that the support on the architecture port is required.
-
 config DYNAMIC_INTERRUPTS
-	bool "Installation of IRQs at runtime"
+	bool "Enable installation of IRQs at runtime"
 	help
 	  Enable installation of interrupts at runtime, which will move some
 	  interrupt-related data structures to RAM instead of ROM, and
 	  on some architectures increase code size.
 
-config SHARED_INTERRUPTS
-	bool "Set this to enable support for shared interrupts"
-	depends on GEN_SW_ISR_TABLE
-	select EXPERIMENTAL
-	help
-	  Set this to enable support for shared interrupts. Use this with
-	  caution as enabling this will increase the image size by a
-	  non-negligible amount.
-
-config SHARED_IRQ_MAX_NUM_CLIENTS
-	int "Maximum number of clients allowed per shared interrupt"
-	default 2
-	depends on SHARED_INTERRUPTS
-	help
-	  This option controls the maximum number of clients allowed
-	  per shared interrupt. Set this according to your needs.
-
 config GEN_ISR_TABLES
 	bool "Use generated IRQ tables"
 	help
@@ -490,35 +349,6 @@ config GEN_IRQ_VECTOR_TABLE
 	  indexed by IRQ line. In the latter case, the vector table must be
 	  supplied by the application or architecture code.
 
-config ARCH_IRQ_VECTOR_TABLE_ALIGN
-	int "Alignment size of the interrupt vector table"
-	default 4
-	depends on GEN_IRQ_VECTOR_TABLE
-	help
-	  This option controls alignment size of generated
-	  _irq_vector_table.  Some architecture needs an IRQ vector table
-	  to be aligned to architecture specific size.  The default
-	  size is 0 for no alignment.
-
-choice IRQ_VECTOR_TABLE_TYPE
-	prompt "IRQ vector table type"
-	depends on GEN_IRQ_VECTOR_TABLE
-	default IRQ_VECTOR_TABLE_JUMP_BY_CODE if (RISCV && !RISCV_HAS_CLIC)
-	default IRQ_VECTOR_TABLE_JUMP_BY_ADDRESS
-
-config IRQ_VECTOR_TABLE_JUMP_BY_ADDRESS
-	bool "Jump by address"
-	help
-	  The IRQ vector table contains the address of the interrupt handler.
-
-config IRQ_VECTOR_TABLE_JUMP_BY_CODE
-	bool "Jump by code"
-	help
-	  The IRQ vector table contains the opcode of a jump instruction to the
-	  interrupt handler address.
-
-endchoice
-
 config GEN_SW_ISR_TABLE
 	bool "Generate a software ISR table"
 	default y
@@ -531,14 +361,13 @@ config GEN_SW_ISR_TABLE
 
 config ARCH_SW_ISR_TABLE_ALIGN
 	int "Alignment size of a software ISR table"
-	default 64 if RISCV_HAS_CLIC
-	default 4
+	default 0
 	depends on GEN_SW_ISR_TABLE
 	help
 	  This option controls alignment size of generated
 	  _sw_isr_table.  Some architecture needs a software ISR table
 	  to be aligned to architecture specific size.  The default
-	  size is 4.
+	  size is 0 for no alignment.
 
 config GEN_IRQ_START_VECTOR
 	int
@@ -553,31 +382,13 @@ config GEN_IRQ_START_VECTOR
 	  left alone.
 
 config IRQ_OFFLOAD
-	bool "IRQ offload"
+	bool "Enable IRQ offload"
 	depends on TEST
 	help
 	  Enable irq_offload() API which allows functions to be synchronously
 	  run in interrupt context. Only useful for test cases that need
 	  to validate the correctness of kernel objects in IRQ context.
 
-config IRQ_OFFLOAD_NESTED
-	bool "irq_offload() supports nested IRQs"
-	depends on IRQ_OFFLOAD
-	help
-	  When set by the arch layer, indicates that irq_offload() may
-	  legally be called in interrupt context to cause a
-	  synchronous nested interrupt on the current CPU.  Not all
-	  hardware is capable.
-
-config EXCEPTION_DEBUG
-	bool "Unhandled exception debugging"
-	default y
-	depends on PRINTK || LOG
-	help
-	  Install handlers for various CPU exception/trap vectors to
-	  make debugging them easier, at a small expense in code size.
-	  This prints out the specific exception vector and any associated
-	  error codes.
 
 config EXTRA_EXCEPTION_INFO
 	bool "Collect extra exception info"
@@ -587,18 +398,6 @@ config EXTRA_EXCEPTION_INFO
 	  register state, when a fault occurs. This information can be useful
 	  to collect for post-mortem analysis and debug of issues.
 
-config SIMPLIFIED_EXCEPTION_CODES
-	bool "Convert arch specific exception codes to K_ERR_CPU_EXCEPTION"
-	default y if ZTEST
-	help
-	  The same piece of faulty code (NULL dereference, etc) can result in
-	  a multitude of potential exception codes at the CPU level, depending
-	  upon whether addresses exist, an MPU is configured, the particular
-	  implementation of the CPU or any number of other reasons. Enabling
-	  this option collapses all the architecture specific exception codes
-	  down to the generic K_ERR_CPU_EXCEPTION, which makes testing code
-	  much more portable.
-
 endmenu # Interrupt configuration
 
 config INIT_ARCH_HW_AT_BOOT
@@ -625,9 +424,6 @@ endmenu
 # Architecture Capabilities
 #
 
-config ARCH_HAS_SINGLE_THREAD_SUPPORT
-	bool
-
 config ARCH_HAS_TIMING_FUNCTIONS
 	bool
 
@@ -655,26 +451,15 @@ config ARCH_HAS_NESTED_EXCEPTION_DETECTION
 config ARCH_SUPPORTS_COREDUMP
 	bool
 
-config ARCH_SUPPORTS_COREDUMP_THREADS
-	bool
-
 config ARCH_SUPPORTS_ARCH_HW_INIT
 	bool
 
-config ARCH_SUPPORTS_ROM_START
-	bool
-
 config ARCH_HAS_EXTRA_EXCEPTION_INFO
 	bool
 
 config ARCH_HAS_GDBSTUB
 	bool
 
-config ARCH_HAS_STACKWALK
-	bool
-	help
-	  This is selected when the architecture implemented the arch_stack_walk() API.
-
 config ARCH_HAS_COHERENCE
 	bool
 	help
@@ -685,19 +470,6 @@ config ARCH_HAS_COHERENCE
 config ARCH_HAS_THREAD_LOCAL_STORAGE
 	bool
 
-config ARCH_HAS_SUSPEND_TO_RAM
-	bool
-	help
-	  When selected, the architecture supports suspend-to-RAM (S2RAM).
-
-config ARCH_HAS_STACK_CANARIES_TLS
-	bool
-
-config ARCH_SUPPORTS_MEM_MAPPED_STACKS
-	bool
-	help
-	  Select when the architecture supports memory mapped stacks.
-
 #
 # Other architecture related options
 #
@@ -705,12 +477,6 @@ config ARCH_SUPPORTS_MEM_MAPPED_STACKS
 config ARCH_HAS_THREAD_ABORT
 	bool
 
-config ARCH_HAS_CODE_DATA_RELOCATION
-	bool
-	help
-	  When selected, the architecture/SoC implements support for
-	  CODE_DATA_RELOCATION in its linker scripts.
-
 #
 # Hidden CPU family configs
 #
@@ -725,7 +491,7 @@ config CPU_HAS_TEE
 config CPU_HAS_DCLS
 	bool
 	help
-	  This option is enabled when the processor hardware has support for
+	  This option is enabled when the processor hardware is configured in
 	  Dual-redundant Core Lock-step (DCLS) topology.
 
 config CPU_HAS_FPU
@@ -734,11 +500,6 @@ config CPU_HAS_FPU
 	  This option is enabled when the CPU has hardware floating point
 	  unit.
 
-config CPU_HAS_DSP
-	bool
-	help
-	  This option is enabled when the CPU has hardware DSP unit.
-
 config CPU_HAS_FPU_DOUBLE_PRECISION
 	bool
 	select CPU_HAS_FPU
@@ -771,30 +532,6 @@ config ARCH_HAS_RESERVED_PAGE_FRAMES
 	  memory mappings. The architecture will need to implement
 	  arch_reserved_pages_update().
 
-config ARCH_HAS_DIRECTED_IPIS
-	bool
-	help
-	  This hidden configuration should be selected by the architecture if
-	  it has an implementation for arch_sched_directed_ipi() which allows
-	  for IPIs to be directed to specific CPUs.
-
-config CPU_HAS_DCACHE
-	bool
-	help
-	  This hidden configuration should be selected when the CPU has a d-cache.
-
-config CPU_CACHE_INCOHERENT
-	bool
-	help
-	  This hidden configuration should be selected when the CPU has
-	  incoherent cache. This applies to intra-CPU multiprocessing
-	  incoherence and makes only sense when MP_NUM_CPUS > 1.
-
-config CPU_HAS_ICACHE
-	bool
-	help
-	  This hidden configuration should be selected when the CPU has an i-cache.
-
 config ARCH_MAPS_ALL_RAM
 	bool
 	help
@@ -813,30 +550,124 @@ config ARCH_MAPS_ALL_RAM
 	  virtual addresses elsewhere, this is limited to only management of the
 	  virtual address space. The kernel's page frame ontology will not consider
 	  this mapping at all; non-kernel pages will be considered free (unless marked
-	  as reserved) and K_MEM_PAGE_FRAME_MAPPED will not be set.
+	  as reserved) and Z_PAGE_FRAME_MAPPED will not be set.
 
-config DCLS
-	bool "Processor is configured in DCLS mode"
-	depends on CPU_HAS_DCLS
-	default y
+menuconfig MMU
+	bool "Enable MMU features"
+	depends on CPU_HAS_MMU
 	help
-	  This option is enabled when the processor hardware is configured in
-	  Dual-redundant Core Lock-step (DCLS) topology. For the processor that
-	  supports DCLS, but is configured in split-lock mode (by default or
-	  changed at flash time), this option should be disabled.
+	  This option is enabled when the CPU's memory management unit is active
+	  and the arch_mem_map() API is available.
+
+if MMU
+config MMU_PAGE_SIZE
+	hex "Size of smallest granularity MMU page"
+	default 0x1000
+	help
+	  Size of memory pages. Varies per MMU but 4K is common. For MMUs that
+	  support multiple page sizes, put the smallest one here.
+
+config KERNEL_VM_BASE
+	hex "Virtual address space base address"
+	default $(dt_chosen_reg_addr_hex,$(DT_CHOSEN_Z_SRAM))
+	help
+	  Define the base of the kernel's address space.
+
+	  By default, this is the same as the DT_CHOSEN_Z_SRAM physical base SRAM
+	  address from DTS, in which case RAM will be identity-mapped. Some
+	  architectures may require RAM to be mapped in this way; they may have
+	  just one RAM region and doing this makes linking much simpler, as
+	  at least when the kernel boots all virtual RAM addresses are the same
+	  as their physical address (demand paging at runtime may later modify
+	  this for non-pinned page frames).
+
+	  Otherwise, if RAM isn't identity-mapped:
+	  1. It is the architecture's responsibility to transition the
+	  instruction pointer to virtual addresses at early boot before
+	  entering the kernel at z_cstart().
+	  2. The underlying architecture may impose constraints on the bounds of
+	  the kernel's address space, such as not overlapping physical RAM
+	  regions if RAM is not identity-mapped, or the virtual and physical
+	  base addresses being aligned to some common value (which allows
+	  double-linking of paging structures to make the instruction pointer
+	  transition simpler).
+
+	  Zephyr does not implement a split address space and if multiple
+	  page tables are in use, they all have the same virtual-to-physical
+	  mappings (with potentially different permissions).
+
+config KERNEL_VM_OFFSET
+	hex "Kernel offset within address space"
+	default 0
+	help
+	  Offset that the kernel image begins within its address space,
+	  if this is not the same offset from the beginning of RAM.
+
+	  Some care may need to be taken in selecting this value. In certain
+	  build-time cases, or when a physical address cannot be looked up
+	  in page tables, the equation:
+
+	      virt = phys + ((KERNEL_VM_BASE + KERNEL_VM_OFFSET) -
+	                     SRAM_BASE_ADDRESS)
+
+	  Will be used to convert between physical and virtual addresses for
+	  memory that is mapped at boot.
+
+	  This uncommon and is only necessary if the beginning of VM and
+	  physical memory have dissimilar alignment.
+
+config KERNEL_VM_SIZE
+	hex "Size of kernel address space in bytes"
+	default 0x800000
+	help
+	  Size of the kernel's address space. Constraining this helps control
+	  how much total memory can be used for page tables.
+
+	  The difference between KERNEL_VM_BASE and KERNEL_VM_SIZE indicates the
+	  size of the virtual region for runtime memory mappings. This is needed
+	  for mapping driver MMIO regions, as well as special RAM mapping use-cases
+	  such as VSDO pages, memory mapped thread stacks, and anonymous memory
+	  mappings. The kernel itself will be mapped in here as well at boot.
+
+	  Systems with very large amounts of memory (such as 512M or more)
+	  will want to use a 64-bit build of Zephyr, there are no plans to
+	  implement a notion of "high" memory in Zephyr to work around physical
+	  RAM size larger than the defined bounds of the virtual address space.
+
+config DEMAND_PAGING
+	bool "Enable demand paging [EXPERIMENTAL]"
+	depends on ARCH_HAS_DEMAND_PAGING
+	help
+	  Enable demand paging. Requires architecture support in how the kernel
+	  is linked and the implementation of an eviction algorithm and a
+	  backing store for evicted pages.
+
+if DEMAND_PAGING
+config DEMAND_PAGING_ALLOW_IRQ
+	bool "Allow interrupts during page-ins/outs"
+	help
+	  Allow interrupts to be serviced while pages are being evicted or
+	  retrieved from the backing store. This is much better for system
+	  latency, but any code running in interrupt context that page faults
+	  will cause a kernel panic. Such code must work with exclusively pinned
+	  code and data pages.
+
+	  The scheduler is still disabled during this operation.
+
+	  If this option is disabled, the page fault servicing logic
+	  runs with interrupts disabled for the entire operation. However,
+	  ISRs may also page fault.
+endif	# DEMAND_PAGING
+endif   # MMU
 
 menuconfig MPU
-	bool "MPU features"
+	bool "Enable MPU features"
 	depends on CPU_HAS_MPU
 	help
 	  This option, when enabled, indicates to the core kernel that an MPU
 	  is enabled.
 
 if MPU
-module = MPU
-module-str = mpu
-source "subsys/logging/Kconfig.template.log_config"
-
 config MPU_REQUIRES_POWER_OF_TWO_ALIGNMENT
 	bool
 	help
@@ -908,31 +739,12 @@ config SRAM_REGION_PERMISSIONS
 	  paging, do not need memory protection, and would rather not use up
 	  RAM for the alignment between regions.
 
-config CODE_DATA_RELOCATION
-	bool "Support code/data section relocation"
-	depends on ARCH_HAS_CODE_DATA_RELOCATION
-	help
-	  Enable support for relocating .text, data and .bss sections from specified
-	  files and placing them in a chosen memory region. Files to relocate and
-	  the target regions should be specified in CMakeLists.txt using
-	  zephyr_code_relocate().
-
-menu "DSP Options"
-
-config DSP_SHARING
-	bool "DSP register sharing"
-	depends on CPU_HAS_DSP
-	help
-	  This option enables preservation of the hardware DSP registers
-	  across context switches to allow multiple threads to perform concurrent
-	  DSP operations.
-endmenu
-
 menu "Floating Point Options"
 
 config FPU
-	bool "Floating point unit (FPU)"
+	bool "Enable floating point unit (FPU)"
 	depends on CPU_HAS_FPU
+	depends on ARC || ARM || RISCV || SPARC || X86
 	help
 	  This option enables the hardware Floating Point Unit (FPU), in order to
 	  support using the floating point registers and instructions.
@@ -953,59 +765,34 @@ config FPU
 config FPU_SHARING
 	bool "FPU register sharing"
 	depends on FPU && MULTITHREADING
+	default y if ARM && ARMV7_M_ARMV8_M_FP
 	help
 	  This option enables preservation of the hardware floating point registers
 	  across context switches to allow multiple threads to perform concurrent
 	  floating point operations.
 
-	  Note that some compiler configurations may activate a floating point
-	  context by generating FP instructions for any thread, and that
-	  context must be preserved when switching such threads in and out.
-	  The developers can still disable the FP sharing mode in their
-	  application projects, and switch to Unshared FP registers mode,
-	  if it is guaranteed that the image code does not generate FP
-	  instructions outside the single thread context that is allowed
-	  to do so.
+	  Note that on Cortex-M processors with the floating point extension we
+	  enable by default the FPU register sharing mode, as some GCC compilers
+	  may activate a floating point context by generating FP instructions for
+	  any thread, and that context must be preserved when switching such
+	  threads in and out. The developers can still disable the FP sharing
+	  mode in their application projects, and switch to Unshared FP registers
+	  mode, if it is guaranteed that the image code does not generate FP
+	  instructions outside the single thread context that is allowed to do so.
 
 endmenu
 
 menu "Cache Options"
 
-config DCACHE
-	bool "Data cache (d-cache) support"
-	depends on CPU_HAS_DCACHE
-	default y
-	help
-	  This option enables the support for the data cache (d-cache).
-
-config ICACHE
-	bool "Instruction cache (i-cache) support"
-	depends on CPU_HAS_ICACHE
-	default y
-	help
-	  This option enables the support for the instruction cache (i-cache).
-
-config CACHE_DOUBLEMAP
-	bool "Cache double-mapping support"
-	depends on CPU_CACHE_INCOHERENT
-	default y
-	help
-	  Double-mapping behavior where a pointer can be cheaply converted to
-	  point to the same cached/uncached memory at different locations.
-
-	  This applies to intra-CPU multiprocessing incoherence and makes only
-	  sense when MP_NUM_CPUS > 1.
-
 config CACHE_MANAGEMENT
-	bool "Cache management features"
-	depends on DCACHE || ICACHE
+	bool "Enable cache management features"
 	help
-	  This option enables the cache management functions backed by arch or
-	  driver code.
+	  This links in the cache management functions (for d-cache and i-cache
+	  where possible).
 
 config DCACHE_LINE_SIZE_DETECT
 	bool "Detect d-cache line size at runtime"
-	depends on CACHE_MANAGEMENT && DCACHE
+	depends on CACHE_MANAGEMENT
 	help
 	  This option enables querying some architecture-specific hardware for
 	  finding the d-cache line size at the expense of taking more memory and
@@ -1016,8 +803,8 @@ config DCACHE_LINE_SIZE_DETECT
 	  using the 'd-cache-line-size' property.
 
 config DCACHE_LINE_SIZE
-	int "d-cache line size"
-	depends on CACHE_MANAGEMENT && DCACHE && !DCACHE_LINE_SIZE_DETECT
+	int "d-cache line size" if !DCACHE_LINE_SIZE_DETECT
+	depends on CACHE_MANAGEMENT
 	default 0
 	help
 	  Size in bytes of a CPU d-cache line. If this is set to 0 the value is
@@ -1028,7 +815,7 @@ config DCACHE_LINE_SIZE
 
 config ICACHE_LINE_SIZE_DETECT
 	bool "Detect i-cache line size at runtime"
-	depends on CACHE_MANAGEMENT && ICACHE
+	depends on CACHE_MANAGEMENT
 	help
 	  This option enables querying some architecture-specific hardware for
 	  finding the i-cache line size at the expense of taking more memory and
@@ -1039,8 +826,8 @@ config ICACHE_LINE_SIZE_DETECT
 	  using the 'i-cache-line-size' property.
 
 config ICACHE_LINE_SIZE
-	int "i-cache line size"
-	depends on CACHE_MANAGEMENT && ICACHE && !ICACHE_LINE_SIZE_DETECT
+	int "i-cache line size" if !ICACHE_LINE_SIZE_DETECT
+	depends on CACHE_MANAGEMENT
 	default 0
 	help
 	  Size in bytes of a CPU i-cache line. If this is set to 0 the value is
@@ -1048,23 +835,6 @@ config ICACHE_LINE_SIZE
 
 	  Detect automatically at runtime by selecting ICACHE_LINE_SIZE_DETECT.
 
-choice CACHE_TYPE
-	prompt "Cache type"
-	depends on CACHE_MANAGEMENT
-	default ARCH_CACHE
-
-config ARCH_CACHE
-	bool "Integrated cache controller"
-	help
-	  Integrated on-core cache controller
-
-config EXTERNAL_CACHE
-	bool "External cache controller"
-	help
-	  External cache controller
-
-endchoice
-
 endmenu
 
 config ARCH
@@ -1072,34 +842,32 @@ config ARCH
 	help
 	  System architecture string.
 
-config TOOLCHAIN_HAS_BUILTIN_FFS
-	bool
-	default y if !(64BIT && RISCV)
+config SOC
+	string
 	help
-	  Hidden option to signal that toolchain has __builtin_ffs*().
+	  SoC name which can be found under soc/<arch>/<soc name>.
+	  This option holds the directory name used by the build system to locate
+	  the correct linker and header files for the SoC.
 
-config ARCH_HAS_CUSTOM_CPU_IDLE
-	bool
+config SOC_SERIES
+	string
 	help
-	  This options allows applications to override the default arch idle implementation with
-	  a custom one.
+	  SoC series name which can be found under soc/<arch>/<family>/<series>.
+	  This option holds the directory name used by the build system to locate
+	  the correct linker and header files.
 
-config ARCH_HAS_CUSTOM_CPU_ATOMIC_IDLE
-	bool
+config SOC_FAMILY
+	string
 	help
-	  This options allows applications to override the default arch idle implementation with
-	  a custom one.
+	  SoC family name which can be found under soc/<arch>/<family>.
+	  This option holds the directory name used by the build system to locate
+	  the correct linker and header files.
 
-config ARCH_HAS_CUSTOM_SWAP_TO_MAIN
-	bool
+config BOARD
+	string
 	help
-	  It's possible that an architecture port cannot use _Swap() to swap to
-	  the _main() thread, but instead must do something custom. It must
-	  enable this option in that case.
-
-config ARCH_HAS_CUSTOM_BUSY_WAIT
-	bool
-	help
-	  It's possible that an architecture port cannot or does not want to use
-	  the provided k_busy_wait(), but instead must do something custom. It must
-	  enable this option in that case.
+	  This option holds the name of the board and is used to locate the files
+	  related to the board in the source tree (under boards/).
+	  The Board is the first location where we search for a linker.ld file,
+	  if not found we look for the linker file in
+	  soc/<arch>/<family>/<series>

arch/Kconfig.v1

@@ -1,5 +0,0 @@
-# Copyright (c) 2023 Nordic Semiconductor ASA
-# SPDX-License-Identifier: Apache-2.0
-
-# Note: $ARCH might be a glob pattern
-source "$(ARCH_DIR)/$(ARCH)/Kconfig"

arch/Kconfig.v2

@@ -1,5 +0,0 @@
-# Copyright (c) 2023 Nordic Semiconductor ASA
-
-# SPDX-License-Identifier: Apache-2.0
-
-source "$(KCONFIG_BINARY_DIR)/arch/Kconfig"

arch/arc/CMakeLists.txt

@@ -12,36 +12,8 @@ zephyr_cc_option(-fno-delete-null-pointer-checks)
 
 zephyr_cc_option_ifdef(CONFIG_ARC_USE_UNALIGNED_MEM_ACCESS -munaligned-access)
 
-if(NOT COMPILER STREQUAL arcmwdt)
-  if(CONFIG_THREAD_LOCAL_STORAGE)
-    # Instruct compiler to use proper register as cached thread pointer for thread local storage.
-    # For ARCv2 the default register is usually not specified - so we need to specify it
-    # For ARCv3 the register is fixed to r30, so we don't need to specify it
-    zephyr_compile_options_ifdef(CONFIG_ISA_ARCV2 -mtp-regno=26)
-  else()
-    # If thread local storage isn't used - we can safely schedule thread pointer register
-    zephyr_compile_options_ifdef(CONFIG_ISA_ARCV2 -mtp-regno=none)
-  endif()
-endif()
+# Instruct compiler to use register R26 as thread pointer
+# for thread local storage.
+zephyr_cc_option_ifdef(CONFIG_THREAD_LOCAL_STORAGE -mtp-regno=26)
 
 add_subdirectory(core)
-
-if(COMPILER STREQUAL arcmwdt)
-  add_subdirectory(arcmwdt)
-
-  if(CONFIG_64BIT)
-    zephyr_compile_options(-Ml)
-    # Instruct MWDT assembler not to warn when we load only lower half (32bit) of symbol
-    # instead of full 64bit address in ASM code. It is valid as we don't support Zephyr
-    # linkage to high addresses for 64bit ARC platforms.
-    zephyr_compile_options(-Wa,-offwarn=168)
-  endif()
-endif()
-
-if(CONFIG_ISA_ARCV3 AND CONFIG_64BIT)
-  set_property(GLOBAL PROPERTY PROPERTY_OUTPUT_FORMAT elf64-littlearc64)
-elseif(CONFIG_ISA_ARCV3 AND NOT CONFIG_64BIT)
-  set_property(GLOBAL PROPERTY PROPERTY_OUTPUT_FORMAT elf32-littlearc64)
-else()
-  set_property(GLOBAL PROPERTY PROPERTY_OUTPUT_FORMAT elf32-littlearc)
-endif()

arch/arc/Kconfig

@@ -9,133 +9,70 @@ menu "ARC Options"
 config ARCH
 	default "arc"
 
+choice
+	prompt "ARC core family"
+	default CPU_ARCEM
+
 config CPU_ARCEM
-	bool
+	bool "ARC EM cores"
+	select CPU_ARCV2
 	select ATOMIC_OPERATIONS_C
 	help
 	  This option signifies the use of an ARC EM CPU
 
 config CPU_ARCHS
-	bool
-	select ATOMIC_OPERATIONS_BUILTIN
-	select BARRIER_OPERATIONS_BUILTIN
+	bool "ARC HS cores"
+	select CPU_ARCV2
+	# FIXME: ATOMIC_OPERATIONS_BUILTIN still has some problem in arcmwdt
+	# toolchain, so choosing ATOMIC_OPERATIONS_C instead.
+	select ATOMIC_OPERATIONS_C if "$(ZEPHYR_TOOLCHAIN_VARIANT)" = "arcmwdt"
+	select ATOMIC_OPERATIONS_BUILTIN if "$(ZEPHYR_TOOLCHAIN_VARIANT)" != "arcmwdt"
 	help
 	  This option signifies the use of an ARC HS CPU
 
-
-choice
-	prompt "ARC Instruction Set"
-	default ISA_ARCV2
-
-config ISA_ARCV2
-	bool "ARC ISA v2"
-	select ARCH_HAS_STACK_PROTECTION if ARC_HAS_STACK_CHECKING || (ARC_MPU && ARC_MPU_VER !=2)
-	select ARCH_HAS_USERSPACE if ARC_MPU
-	select ARCH_HAS_SINGLE_THREAD_SUPPORT if !SMP
-	select USE_SWITCH
-	select USE_SWITCH_SUPPORTED
-	help
-	  v2 ISA for the ARC-HS & ARC-EM cores
-
-config ISA_ARCV3
-	bool "ARC ISA v3"
-	select ARCH_HAS_SINGLE_THREAD_SUPPORT if !SMP
-	select USE_SWITCH
-	select USE_SWITCH_SUPPORTED
-
 endchoice
 
-if ISA_ARCV2
-
 config CPU_EM4
 	bool
-	select CPU_ARCEM
 	help
 	  If y, the SoC uses an ARC EM4 CPU
 
 config CPU_EM4_DMIPS
 	bool
-	select CPU_ARCEM
 	help
 	  If y, the SoC uses an ARC EM4 DMIPS CPU
 
 config CPU_EM4_FPUS
 	bool
-	select CPU_ARCEM
 	help
 	  If y, the SoC uses an ARC EM4 DMIPS CPU with the single-precision
 	  floating-point extension
 
 config CPU_EM4_FPUDA
 	bool
-	select CPU_ARCEM
 	help
 	  If y, the SoC uses an ARC EM4 DMIPS CPU with single-precision
 	  floating-point and double assist instructions
 
 config CPU_EM6
 	bool
-	select CPU_ARCEM
-	select CPU_HAS_DCACHE
-	select CPU_HAS_ICACHE
 	help
 	  If y, the SoC uses an ARC EM6 CPU
 
-config CPU_HS3X
-	bool
-	select CPU_ARCHS
-	select CPU_HAS_DCACHE
-	select CPU_HAS_ICACHE
-	help
-	  If y, the SoC uses an ARC HS3x CPU
-
-config CPU_HS4X
-	bool
-	select CPU_ARCHS
-	select CPU_HAS_DCACHE
-	select CPU_HAS_ICACHE
-	help
-	  If y, the SoC uses an HS4X CPU
-
-endif #ISA_ARCV2
-
-if ISA_ARCV3
-
-config CPU_HS5X
-	bool
-	select CPU_ARCHS
-	select CPU_HAS_DCACHE
-	select CPU_HAS_ICACHE
-	help
-	  If y, the SoC uses an ARC HS6x CPU
-
-config CPU_HS6X
-	bool
-	select CPU_ARCHS
-	select 64BIT
-	select CPU_HAS_DCACHE
-	select CPU_HAS_ICACHE
-	help
-	  If y, the SoC uses an ARC HS6x CPU
-
-endif #ISA_ARCV3
-
 config FP_FPU_DA
 	bool
 
-menu "ARC CPU Options"
+menu "ARCv2 Family Options"
 
-config ARC_HAS_ZOL
+config CPU_ARCV2
 	bool
-	depends on ISA_ARCV2
+	select ARCH_HAS_STACK_PROTECTION if ARC_HAS_STACK_CHECKING || ARC_MPU
+	select ARCH_HAS_USERSPACE if ARC_MPU
+	select USE_SWITCH
+	select USE_SWITCH_SUPPORTED
 	default y
 	help
-	  ARCv2 CPUs have ZOL hardware loop mechanism which the ARCv3 ISA drops.
-	  Architecturally ZOL provides
-	  - LPcc instruction
-	  - LP_COUNT core reg
-	  - LP_START, LP_END aux regs
-	  Disabling this option removes usage of ZOL regs from code
+	  This option signifies the use of a CPU of the ARCv2 family.
 
 config NUM_IRQ_PRIO_LEVELS
 	int "Number of supported interrupt priority levels"
@@ -159,8 +96,7 @@ config NUM_IRQS
 
 config RGF_NUM_BANKS
 	int "Number of General Purpose Register Banks"
-	depends on ARC_FIRQ
-	depends on NUM_IRQ_PRIO_LEVELS > 1
+	depends on CPU_ARCV2
 	range 1 2
 	default 2
 	help
@@ -170,16 +106,9 @@ config RGF_NUM_BANKS
 	  If fast interrupts are supported but there is only 1
 	  register bank, the fast interrupt handler must save
 	  and restore general purpose registers.
-	  NOTE: it's required to have more than one interrupt priority level
-	  to use second register bank - otherwise all interrupts will use
-	  same register bank. Such configuration isn't supported in software
-	  and it is not beneficial from the performance point of view.
 
 config ARC_FIRQ
 	bool "FIRQ enable"
-	depends on ISA_ARCV2
-	depends on NUM_IRQ_PRIO_LEVELS > 1
-	depends on !ARC_HAS_SECURE
 	default y
 	help
 	  Fast interrupts are supported (FIRQ). If FIRQ enabled, for interrupts
@@ -187,13 +116,9 @@ config ARC_FIRQ
 	  other regs will be saved according to the number of register bank;
 	  If FIRQ is disabled, the handle of interrupts with highest priority
 	  will be same with other interrupts.
-	  NOTE: we don't allow the configuration with FIRQ enabled and only one
-	  interrupt priority level (so all interrupts are FIRQ). Such
-	  configuration isn't supported in software and it is not beneficial
-	  from the performance point of view.
 
 config ARC_FIRQ_STACK
-	bool "Separate firq stack"
+	bool "Enable separate firq stack"
 	depends on ARC_FIRQ && RGF_NUM_BANKS > 1
 	help
 	  Use separate stack for FIRQ handing. When the fast irq is also a direct
@@ -208,7 +133,6 @@ config ARC_FIRQ_STACK_SIZE
 
 config ARC_HAS_STACK_CHECKING
 	bool "ARC has STACK_CHECKING"
-	depends on ISA_ARCV2
 	default y
 	help
 	  ARC is configured with STACK_CHECKING which is a mechanism for
@@ -245,7 +169,7 @@ config ARC_STACK_PROTECTION
 	  prioritized over the MPU-based stack guard.
 
 config ARC_USE_UNALIGNED_MEM_ACCESS
-	bool "Unaligned access in HW"
+	bool "Enable unaligned access in HW"
 	default y if CPU_ARCHS
 	depends on (CPU_ARCEM && !ARC_HAS_SECURE) || CPU_ARCHS
 	help
@@ -253,17 +177,20 @@ config ARC_USE_UNALIGNED_MEM_ACCESS
 	  to support unaligned memory access which is then disabled by default.
 	  Enable unaligned access in hardware and make software to use it.
 
-config ARC_CURRENT_THREAD_USE_NO_TLS
-	bool
-	select CURRENT_THREAD_USE_NO_TLS
-	default y if (RGF_NUM_BANKS > 1) || ("$(ZEPHYR_TOOLCHAIN_VARIANT)" = "arcmwdt")
+config FAULT_DUMP
+	int "Fault dump level"
+	default 2
+	range 0 2
 	help
-	  Disable current Thread Local Storage for ARC. For cores with more then one
-	  RGF_NUM_BANKS the parameter is disabled by-default because banks syncronization
-	  requires significant time, and it slows down performance.
-	  ARCMWDT works with tls pointer in different way then GCC. Optimized access to
-	  TLS pointer via _current variable does not provide significant advantages
-	  in case of MetaWare.
+	  Different levels for display information when a fault occurs.
+
+	  2: The default. Display specific and verbose information. Consumes
+		the most memory (long strings).
+
+	  1: Display general and short information. Consumes less memory
+		(short strings).
+
+	  0: Off.
 
 config GEN_ISR_TABLES
 	default y
@@ -283,8 +210,8 @@ config CODE_DENSITY
 	  Enable code density option to get better code density
 
 config ARC_HAS_ACCL_REGS
-	bool "Reg Pair ACCL:ACCH (FPU and/or MPY > 6 and/or DSP)"
-	default y if CPU_HS3X || CPU_HS4X || CPU_HS5X || CPU_HS6X
+	bool "Reg Pair ACCL:ACCH (FPU and/or MPY > 6)"
+	default y if FPU
 	help
 	  Depending on the configuration, CPU can contain accumulator reg-pair
 	  (also referred to as r58:r59). These can also be used by gcc as GPR so
@@ -292,7 +219,6 @@ config ARC_HAS_ACCL_REGS
 
 config ARC_HAS_SECURE
 	bool "ARC has SecureShield"
-	depends on ISA_ARCV2
 	select CPU_HAS_TEE
 	select ARCH_HAS_TRUSTED_EXECUTION
 	help
@@ -343,13 +269,11 @@ config ARC_NORMAL_FIRMWARE
 	  resources of the ARC processors, and, therefore, it shall avoid
 	  accessing them.
 
-source "arch/arc/core/dsp/Kconfig"
-
 menu "ARC MPU Options"
 depends on CPU_HAS_MPU
 
 config ARC_MPU_ENABLE
-	bool "Memory Protection Unit (MPU)"
+	bool "Enable MPU"
 	select ARC_MPU
 	help
 	  Enable MPU
@@ -363,8 +287,7 @@ config DCACHE_LINE_SIZE
 
 config ARC_EXCEPTION_STACK_SIZE
 	int "ARC exception handling stack size"
-	default 768 if !64BIT
-	default 2048 if 64BIT
+	default 768
 	help
 	  Size in bytes of exception handling stack which is at the top of
 	  interrupt stack to get smaller memory footprint because exception
@@ -373,38 +296,13 @@ config ARC_EXCEPTION_STACK_SIZE
 
 endmenu
 
-config ARC_EARLY_SOC_INIT
-	bool "Make early stage SoC-specific initialization"
+config ARC_EXCEPTION_DEBUG
+	bool "Unhandled exception debugging information"
+	default n
+	depends on PRINTK || LOG
 	help
-	  Call SoC per-core setup code on early stage initialization
-	  (before C runtime initialization). Setup code is called in form of
-	  soc_early_asm_init_percpu assembler macro.
-
-config MAIN_STACK_SIZE
-	default 4096 if 64BIT
-
-config ISR_STACK_SIZE
-	default 4096 if 64BIT
-
-config SYSTEM_WORKQUEUE_STACK_SIZE
-	default 4096 if 64BIT
-
-config IDLE_STACK_SIZE
-	default 1024 if 64BIT
-
-config IPM_CONSOLE_STACK_SIZE
-	default 2048 if 64BIT
-
-config TEST_EXTRA_STACK_SIZE
-	default 2048 if 64BIT
-
-config CMSIS_THREAD_MAX_STACK_SIZE
-	default 2048 if 64BIT
-
-config CMSIS_V2_THREAD_MAX_STACK_SIZE
-	default 2048 if 64BIT
-
-config CMSIS_V2_THREAD_DYNAMIC_STACK_SIZE
-	default 2048 if 64BIT
+	  Print human-readable information about exception vectors, cause codes,
+	  and parameters, at a cost of code/data size for the human-readable
+	  strings.
 
 endmenu

arch/arc/arcmwdt/CMakeLists.txt

@@ -1,5 +0,0 @@
-# SPDX-License-Identifier: Apache-2.0
-
-if(CONFIG_ARCMWDT_LIBC OR CONFIG_CPP)
-  zephyr_sources(arcmwdt-dtr-stubs.c)
-endif()

arch/arc/arcmwdt/arcmwdt-dtr-stubs.c

@@ -1,22 +0,0 @@
-/*
- * Copyright (c) 2021 Synopsys.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#include <zephyr/toolchain.h>
-
-__weak void *__dso_handle;
-
-int __cxa_atexit(void (*destructor)(void *), void *objptr, void *dso)
-{
-	ARG_UNUSED(destructor);
-	ARG_UNUSED(objptr);
-	ARG_UNUSED(dso);
-	return 0;
-}
-
-int atexit(void (*function)(void))
-{
-	return 0;
-}

arch/arc/core/CMakeLists.txt

@@ -2,6 +2,11 @@
 
 zephyr_library()
 
+if(CONFIG_COVERAGE)
+  zephyr_compile_options($<TARGET_PROPERTY:compiler,coverage>)
+  zephyr_link_libraries($<TARGET_PROPERTY:linker,coverage>)
+endif()
+
 zephyr_library_sources(
   thread.c
   thread_entry_wrapper.S
@@ -19,14 +24,14 @@ zephyr_library_sources(
   vector_table.c
   )
 
-zephyr_library_sources_ifdef(CONFIG_ARCH_CACHE cache.c)
+zephyr_library_sources_ifdef(CONFIG_CACHE_MANAGEMENT cache.c)
 zephyr_library_sources_ifdef(CONFIG_ARC_FIRQ fast_irq.S)
 
 zephyr_library_sources_ifdef(CONFIG_IRQ_OFFLOAD irq_offload.c)
 
 zephyr_library_sources_ifdef(CONFIG_USERSPACE userspace.S)
 zephyr_library_sources_ifdef(CONFIG_ARC_CONNECT arc_connect.c)
-zephyr_library_sources_ifdef(CONFIG_ARC_CONNECT smp.c)
+zephyr_library_sources_ifdef(CONFIG_ARC_CONNECT arc_smp.c)
 
 zephyr_library_sources_ifdef(CONFIG_THREAD_LOCAL_STORAGE tls.c)
 

arch/arc/core/arc_connect.c

@@ -10,17 +10,23 @@
  *
  */
 
-#include <zephyr/kernel.h>
-#include <zephyr/arch/cpu.h>
-#include <zephyr/spinlock.h>
-#include <kernel_internal.h>
+#include <kernel.h>
+#include <arch/cpu.h>
+#include <spinlock.h>
+
 
 static struct k_spinlock arc_connect_spinlock;
 
+#define LOCKED(lck) for (k_spinlock_key_t __i = {},			\
+					  __key = k_spin_lock(lck);	\
+			!__i.key;					\
+			k_spin_unlock(lck, __key), __i.key = 1)
+
+
 /* Generate an inter-core interrupt to the target core */
 void z_arc_connect_ici_generate(uint32_t core)
 {
-	K_SPINLOCK(&arc_connect_spinlock) {
+	LOCKED(&arc_connect_spinlock) {
 		z_arc_connect_cmd(ARC_CONNECT_CMD_INTRPT_GENERATE_IRQ, core);
 	}
 }
@@ -28,7 +34,7 @@ void z_arc_connect_ici_generate(uint32_t core)
 /* Acknowledge the inter-core interrupt raised by core */
 void z_arc_connect_ici_ack(uint32_t core)
 {
-	K_SPINLOCK(&arc_connect_spinlock) {
+	LOCKED(&arc_connect_spinlock) {
 		z_arc_connect_cmd(ARC_CONNECT_CMD_INTRPT_GENERATE_ACK, core);
 	}
 }
@@ -38,7 +44,7 @@ uint32_t z_arc_connect_ici_read_status(uint32_t core)
 {
 	uint32_t ret = 0;
 
-	K_SPINLOCK(&arc_connect_spinlock) {
+	LOCKED(&arc_connect_spinlock) {
 		z_arc_connect_cmd(ARC_CONNECT_CMD_INTRPT_READ_STATUS, core);
 		ret = z_arc_connect_cmd_readback();
 	}
@@ -51,7 +57,7 @@ uint32_t z_arc_connect_ici_check_src(void)
 {
 	uint32_t ret = 0;
 
-	K_SPINLOCK(&arc_connect_spinlock) {
+	LOCKED(&arc_connect_spinlock) {
 		z_arc_connect_cmd(ARC_CONNECT_CMD_INTRPT_CHECK_SOURCE, 0);
 		ret = z_arc_connect_cmd_readback();
 	}
@@ -64,7 +70,7 @@ void z_arc_connect_ici_clear(void)
 {
 	uint32_t cpu, c;
 
-	K_SPINLOCK(&arc_connect_spinlock) {
+	LOCKED(&arc_connect_spinlock) {
 
 		z_arc_connect_cmd(ARC_CONNECT_CMD_INTRPT_CHECK_SOURCE, 0);
 		cpu = z_arc_connect_cmd_readback(); /* 1,2,4,8... */
@@ -85,7 +91,7 @@ void z_arc_connect_ici_clear(void)
 /* Reset the cores in core_mask */
 void z_arc_connect_debug_reset(uint32_t core_mask)
 {
-	K_SPINLOCK(&arc_connect_spinlock) {
+	LOCKED(&arc_connect_spinlock) {
 		z_arc_connect_cmd_data(ARC_CONNECT_CMD_DEBUG_RESET,
 			0, core_mask);
 	}
@@ -94,7 +100,7 @@ void z_arc_connect_debug_reset(uint32_t core_mask)
 /* Halt the cores in core_mask */
 void z_arc_connect_debug_halt(uint32_t core_mask)
 {
-	K_SPINLOCK(&arc_connect_spinlock) {
+	LOCKED(&arc_connect_spinlock) {
 		z_arc_connect_cmd_data(ARC_CONNECT_CMD_DEBUG_HALT,
 			0, core_mask);
 	}
@@ -103,7 +109,7 @@ void z_arc_connect_debug_halt(uint32_t core_mask)
 /* Run the cores in core_mask */
 void z_arc_connect_debug_run(uint32_t core_mask)
 {
-	K_SPINLOCK(&arc_connect_spinlock) {
+	LOCKED(&arc_connect_spinlock) {
 		z_arc_connect_cmd_data(ARC_CONNECT_CMD_DEBUG_RUN,
 			0, core_mask);
 	}
@@ -112,7 +118,7 @@ void z_arc_connect_debug_run(uint32_t core_mask)
 /* Set core mask */
 void z_arc_connect_debug_mask_set(uint32_t core_mask, uint32_t mask)
 {
-	K_SPINLOCK(&arc_connect_spinlock) {
+	LOCKED(&arc_connect_spinlock) {
 		z_arc_connect_cmd_data(ARC_CONNECT_CMD_DEBUG_SET_MASK,
 			mask, core_mask);
 	}
@@ -123,7 +129,7 @@ uint32_t z_arc_connect_debug_mask_read(uint32_t core_mask)
 {
 	uint32_t ret = 0;
 
-	K_SPINLOCK(&arc_connect_spinlock) {
+	LOCKED(&arc_connect_spinlock) {
 		z_arc_connect_cmd_data(ARC_CONNECT_CMD_DEBUG_READ_MASK,
 			0, core_mask);
 		ret = z_arc_connect_cmd_readback();
@@ -137,7 +143,7 @@ uint32_t z_arc_connect_debug_mask_read(uint32_t core_mask)
  */
 void z_arc_connect_debug_select_set(uint32_t core_mask)
 {
-	K_SPINLOCK(&arc_connect_spinlock) {
+	LOCKED(&arc_connect_spinlock) {
 		z_arc_connect_cmd_data(ARC_CONNECT_CMD_DEBUG_SET_SELECT,
 			0, core_mask);
 	}
@@ -148,7 +154,7 @@ uint32_t z_arc_connect_debug_select_read(void)
 {
 	uint32_t ret = 0;
 
-	K_SPINLOCK(&arc_connect_spinlock) {
+	LOCKED(&arc_connect_spinlock) {
 		z_arc_connect_cmd(ARC_CONNECT_CMD_DEBUG_READ_SELECT, 0);
 		ret = z_arc_connect_cmd_readback();
 	}
@@ -161,7 +167,7 @@ uint32_t z_arc_connect_debug_en_read(void)
 {
 	uint32_t ret = 0;
 
-	K_SPINLOCK(&arc_connect_spinlock) {
+	LOCKED(&arc_connect_spinlock) {
 		z_arc_connect_cmd(ARC_CONNECT_CMD_DEBUG_READ_EN, 0);
 		ret = z_arc_connect_cmd_readback();
 	}
@@ -174,7 +180,7 @@ uint32_t z_arc_connect_debug_cmd_read(void)
 {
 	uint32_t ret = 0;
 
-	K_SPINLOCK(&arc_connect_spinlock) {
+	LOCKED(&arc_connect_spinlock) {
 		z_arc_connect_cmd(ARC_CONNECT_CMD_DEBUG_READ_CMD, 0);
 		ret = z_arc_connect_cmd_readback();
 	}
@@ -187,7 +193,7 @@ uint32_t z_arc_connect_debug_core_read(void)
 {
 	uint32_t ret = 0;
 
-	K_SPINLOCK(&arc_connect_spinlock) {
+	LOCKED(&arc_connect_spinlock) {
 		z_arc_connect_cmd(ARC_CONNECT_CMD_DEBUG_READ_CORE, 0);
 		ret = z_arc_connect_cmd_readback();
 	}
@@ -198,7 +204,7 @@ uint32_t z_arc_connect_debug_core_read(void)
 /* Clear global free running counter */
 void z_arc_connect_gfrc_clear(void)
 {
-	K_SPINLOCK(&arc_connect_spinlock) {
+	LOCKED(&arc_connect_spinlock) {
 		z_arc_connect_cmd(ARC_CONNECT_CMD_GFRC_CLEAR, 0);
 	}
 }
@@ -233,7 +239,7 @@ uint64_t z_arc_connect_gfrc_read(void)
 /* Enable global free running counter */
 void z_arc_connect_gfrc_enable(void)
 {
-	K_SPINLOCK(&arc_connect_spinlock) {
+	LOCKED(&arc_connect_spinlock) {
 		z_arc_connect_cmd(ARC_CONNECT_CMD_GFRC_ENABLE, 0);
 	}
 }
@@ -241,7 +247,7 @@ void z_arc_connect_gfrc_enable(void)
 /* Disable global free running counter */
 void z_arc_connect_gfrc_disable(void)
 {
-	K_SPINLOCK(&arc_connect_spinlock) {
+	LOCKED(&arc_connect_spinlock) {
 		z_arc_connect_cmd(ARC_CONNECT_CMD_GFRC_DISABLE, 0);
 	}
 }
@@ -249,7 +255,7 @@ void z_arc_connect_gfrc_disable(void)
 /* Disable global free running counter */
 void z_arc_connect_gfrc_core_set(uint32_t core_mask)
 {
-	K_SPINLOCK(&arc_connect_spinlock) {
+	LOCKED(&arc_connect_spinlock) {
 		z_arc_connect_cmd_data(ARC_CONNECT_CMD_GFRC_SET_CORE,
 			0, core_mask);
 	}
@@ -260,7 +266,7 @@ uint32_t z_arc_connect_gfrc_halt_read(void)
 {
 	uint32_t ret = 0;
 
-	K_SPINLOCK(&arc_connect_spinlock) {
+	LOCKED(&arc_connect_spinlock) {
 		z_arc_connect_cmd(ARC_CONNECT_CMD_GFRC_READ_HALT, 0);
 		ret = z_arc_connect_cmd_readback();
 	}
@@ -273,7 +279,7 @@ uint32_t z_arc_connect_gfrc_core_read(void)
 {
 	uint32_t ret = 0;
 
-	K_SPINLOCK(&arc_connect_spinlock) {
+	LOCKED(&arc_connect_spinlock) {
 		z_arc_connect_cmd(ARC_CONNECT_CMD_GFRC_READ_CORE, 0);
 		ret = z_arc_connect_cmd_readback();
 	}
@@ -284,7 +290,7 @@ uint32_t z_arc_connect_gfrc_core_read(void)
 /* Enable interrupt distribute unit */
 void z_arc_connect_idu_enable(void)
 {
-	K_SPINLOCK(&arc_connect_spinlock) {
+	LOCKED(&arc_connect_spinlock) {
 		z_arc_connect_cmd(ARC_CONNECT_CMD_IDU_ENABLE, 0);
 	}
 }
@@ -292,7 +298,7 @@ void z_arc_connect_idu_enable(void)
 /* Disable interrupt distribute unit */
 void z_arc_connect_idu_disable(void)
 {
-	K_SPINLOCK(&arc_connect_spinlock) {
+	LOCKED(&arc_connect_spinlock) {
 		z_arc_connect_cmd(ARC_CONNECT_CMD_IDU_DISABLE, 0);
 	}
 }
@@ -302,7 +308,7 @@ uint32_t z_arc_connect_idu_read_enable(void)
 {
 	uint32_t ret = 0;
 
-	K_SPINLOCK(&arc_connect_spinlock) {
+	LOCKED(&arc_connect_spinlock) {
 		z_arc_connect_cmd(ARC_CONNECT_CMD_IDU_READ_ENABLE, 0);
 		ret = z_arc_connect_cmd_readback();
 	}
@@ -317,7 +323,7 @@ uint32_t z_arc_connect_idu_read_enable(void)
 void z_arc_connect_idu_set_mode(uint32_t irq_num,
 	uint16_t trigger_mode, uint16_t distri_mode)
 {
-	K_SPINLOCK(&arc_connect_spinlock) {
+	LOCKED(&arc_connect_spinlock) {
 		z_arc_connect_cmd_data(ARC_CONNECT_CMD_IDU_SET_MODE,
 			irq_num, (distri_mode | (trigger_mode << 4)));
 	}
@@ -328,7 +334,7 @@ uint32_t z_arc_connect_idu_read_mode(uint32_t irq_num)
 {
 	uint32_t ret = 0;
 
-	K_SPINLOCK(&arc_connect_spinlock) {
+	LOCKED(&arc_connect_spinlock) {
 		z_arc_connect_cmd(ARC_CONNECT_CMD_IDU_READ_MODE, irq_num);
 		ret = z_arc_connect_cmd_readback();
 	}
@@ -342,7 +348,7 @@ uint32_t z_arc_connect_idu_read_mode(uint32_t irq_num)
  */
 void z_arc_connect_idu_set_dest(uint32_t irq_num, uint32_t core_mask)
 {
-	K_SPINLOCK(&arc_connect_spinlock) {
+	LOCKED(&arc_connect_spinlock) {
 		z_arc_connect_cmd_data(ARC_CONNECT_CMD_IDU_SET_DEST,
 			irq_num, core_mask);
 	}
@@ -353,7 +359,7 @@ uint32_t z_arc_connect_idu_read_dest(uint32_t irq_num)
 {
 	uint32_t ret = 0;
 
-	K_SPINLOCK(&arc_connect_spinlock) {
+	LOCKED(&arc_connect_spinlock) {
 		z_arc_connect_cmd(ARC_CONNECT_CMD_IDU_READ_DEST, irq_num);
 		ret = z_arc_connect_cmd_readback();
 	}
@@ -364,7 +370,7 @@ uint32_t z_arc_connect_idu_read_dest(uint32_t irq_num)
 /* Assert the specified common interrupt */
 void z_arc_connect_idu_gen_cirq(uint32_t irq_num)
 {
-	K_SPINLOCK(&arc_connect_spinlock) {
+	LOCKED(&arc_connect_spinlock) {
 		z_arc_connect_cmd(ARC_CONNECT_CMD_IDU_GEN_CIRQ, irq_num);
 	}
 }
@@ -372,7 +378,7 @@ void z_arc_connect_idu_gen_cirq(uint32_t irq_num)
 /* Acknowledge the specified common interrupt */
 void z_arc_connect_idu_ack_cirq(uint32_t irq_num)
 {
-	K_SPINLOCK(&arc_connect_spinlock) {
+	LOCKED(&arc_connect_spinlock) {
 		z_arc_connect_cmd(ARC_CONNECT_CMD_IDU_ACK_CIRQ, irq_num);
 	}
 }
@@ -382,7 +388,7 @@ uint32_t z_arc_connect_idu_check_status(uint32_t irq_num)
 {
 	uint32_t ret = 0;
 
-	K_SPINLOCK(&arc_connect_spinlock) {
+	LOCKED(&arc_connect_spinlock) {
 		z_arc_connect_cmd(ARC_CONNECT_CMD_IDU_CHECK_STATUS, irq_num);
 		ret = z_arc_connect_cmd_readback();
 	}
@@ -395,7 +401,7 @@ uint32_t z_arc_connect_idu_check_source(uint32_t irq_num)
 {
 	uint32_t ret = 0;
 
-	K_SPINLOCK(&arc_connect_spinlock) {
+	LOCKED(&arc_connect_spinlock) {
 		z_arc_connect_cmd(ARC_CONNECT_CMD_IDU_CHECK_SOURCE, irq_num);
 		ret = z_arc_connect_cmd_readback();
 	}
@@ -406,7 +412,7 @@ uint32_t z_arc_connect_idu_check_source(uint32_t irq_num)
 /* Mask or unmask the specified common interrupt */
 void z_arc_connect_idu_set_mask(uint32_t irq_num, uint32_t mask)
 {
-	K_SPINLOCK(&arc_connect_spinlock) {
+	LOCKED(&arc_connect_spinlock) {
 		z_arc_connect_cmd_data(ARC_CONNECT_CMD_IDU_SET_MASK,
 			irq_num, mask);
 	}
@@ -417,7 +423,7 @@ uint32_t z_arc_connect_idu_read_mask(uint32_t irq_num)
 {
 	uint32_t ret = 0;
 
-	K_SPINLOCK(&arc_connect_spinlock) {
+	LOCKED(&arc_connect_spinlock) {
 		z_arc_connect_cmd(ARC_CONNECT_CMD_IDU_READ_MASK, irq_num);
 		ret = z_arc_connect_cmd_readback();
 	}
@@ -433,7 +439,7 @@ uint32_t z_arc_connect_idu_check_first(uint32_t irq_num)
 {
 	uint32_t ret = 0;
 
-	K_SPINLOCK(&arc_connect_spinlock) {
+	LOCKED(&arc_connect_spinlock) {
 		z_arc_connect_cmd(ARC_CONNECT_CMD_IDU_CHECK_FIRST, irq_num);
 		ret = z_arc_connect_cmd_readback();
 	}

arch/arc/core/arc_smp.c

@@ -0,0 +1,162 @@
+/*
+ * Copyright (c) 2019 Synopsys.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/**
+ * @file
+ * @brief codes required for ARC multicore and Zephyr smp support
+ *
+ */
+#include <device.h>
+#include <kernel.h>
+#include <kernel_structs.h>
+#include <ksched.h>
+#include <soc.h>
+#include <init.h>
+
+
+#ifndef IRQ_ICI
+#define IRQ_ICI 19
+#endif
+
+#define ARCV2_ICI_IRQ_PRIORITY 1
+
+volatile struct {
+	arch_cpustart_t fn;
+	void *arg;
+} arc_cpu_init[CONFIG_MP_NUM_CPUS];
+
+/*
+ * arc_cpu_wake_flag is used to sync up master core and slave cores
+ * Slave core will spin for arc_cpu_wake_flag until master core sets
+ * it to the core id of slave core. Then, slave core clears it to notify
+ * master core that it's waken
+ *
+ */
+volatile uint32_t arc_cpu_wake_flag;
+
+volatile char *arc_cpu_sp;
+/*
+ * _curr_cpu is used to record the struct of _cpu_t of each cpu.
+ * for efficient usage in assembly
+ */
+volatile _cpu_t *_curr_cpu[CONFIG_MP_NUM_CPUS];
+
+/* Called from Zephyr initialization */
+void arch_start_cpu(int cpu_num, k_thread_stack_t *stack, int sz,
+		    arch_cpustart_t fn, void *arg)
+{
+	_curr_cpu[cpu_num] = &(_kernel.cpus[cpu_num]);
+	arc_cpu_init[cpu_num].fn = fn;
+	arc_cpu_init[cpu_num].arg = arg;
+
+	/* set the initial sp of target sp through arc_cpu_sp
+	 * arc_cpu_wake_flag will protect arc_cpu_sp that
+	 * only one slave cpu can read it per time
+	 */
+	arc_cpu_sp = Z_THREAD_STACK_BUFFER(stack) + sz;
+
+	arc_cpu_wake_flag = cpu_num;
+
+	/* wait slave cpu to start */
+	while (arc_cpu_wake_flag != 0) {
+		;
+	}
+}
+
+/* the C entry of slave cores */
+void z_arc_slave_start(int cpu_num)
+{
+	arch_cpustart_t fn;
+
+#ifdef CONFIG_SMP
+	z_icache_setup();
+	z_irq_setup();
+
+	z_arc_connect_ici_clear();
+	z_irq_priority_set(IRQ_ICI, ARCV2_ICI_IRQ_PRIORITY, 0);
+	irq_enable(IRQ_ICI);
+#endif
+	/* call the function set by arch_start_cpu */
+	fn = arc_cpu_init[cpu_num].fn;
+
+	fn(arc_cpu_init[cpu_num].arg);
+}
+
+#ifdef CONFIG_SMP
+
+static void sched_ipi_handler(const void *unused)
+{
+	ARG_UNUSED(unused);
+
+	z_arc_connect_ici_clear();
+	z_sched_ipi();
+}
+
+/* arch implementation of sched_ipi */
+void arch_sched_ipi(void)
+{
+	uint32_t i;
+
+	/* broadcast sched_ipi request to other cores
+	 * if the target is current core, hardware will ignore it
+	 */
+	for (i = 0; i < CONFIG_MP_NUM_CPUS; i++) {
+		z_arc_connect_ici_generate(i);
+	}
+}
+
+static int arc_smp_init(const struct device *dev)
+{
+	ARG_UNUSED(dev);
+	struct arc_connect_bcr bcr;
+
+	/* necessary master core init */
+	_curr_cpu[0] = &(_kernel.cpus[0]);
+
+	bcr.val = z_arc_v2_aux_reg_read(_ARC_V2_CONNECT_BCR);
+
+	if (bcr.ipi) {
+	/* register ici interrupt, just need master core to register once */
+		z_arc_connect_ici_clear();
+		IRQ_CONNECT(IRQ_ICI, ARCV2_ICI_IRQ_PRIORITY,
+		    sched_ipi_handler, NULL, 0);
+
+		irq_enable(IRQ_ICI);
+	} else {
+		__ASSERT(0,
+			"ARC connect has no inter-core interrupt\n");
+		return -ENODEV;
+	}
+
+	if (bcr.dbg) {
+	/* configure inter-core debug unit if available */
+		uint32_t core_mask = (1 << CONFIG_MP_NUM_CPUS) - 1;
+		z_arc_connect_debug_select_set(core_mask);
+		/* Debugger halt cores at conditions */
+		z_arc_connect_debug_mask_set(core_mask,	(ARC_CONNECT_CMD_DEBUG_MASK_SH
+			| ARC_CONNECT_CMD_DEBUG_MASK_BH | ARC_CONNECT_CMD_DEBUG_MASK_AH
+			| ARC_CONNECT_CMD_DEBUG_MASK_H));
+
+	}
+
+	if (bcr.gfrc) {
+		/* global free running count init */
+		z_arc_connect_gfrc_enable();
+
+		/* when all cores halt, gfrc halt */
+		z_arc_connect_gfrc_core_set((1 << CONFIG_MP_NUM_CPUS) - 1);
+		z_arc_connect_gfrc_clear();
+	} else {
+		__ASSERT(0,
+			"ARC connect has no global free running counter\n");
+		return -ENODEV;
+	}
+
+	return 0;
+}
+
+SYS_INIT(arc_smp_init, PRE_KERNEL_1, CONFIG_KERNEL_INIT_PRIORITY_DEFAULT);
+#endif

arch/arc/core/cache.c

@@ -13,16 +13,16 @@
  * This module contains functions for manipulation of the d-cache.
  */
 
-#include <zephyr/kernel.h>
-#include <zephyr/arch/cpu.h>
-#include <zephyr/sys/util.h>
-#include <zephyr/toolchain.h>
-#include <zephyr/cache.h>
-#include <zephyr/linker/linker-defs.h>
-#include <zephyr/arch/arc/v2/aux_regs.h>
+#include <kernel.h>
+#include <arch/cpu.h>
+#include <sys/util.h>
+#include <toolchain.h>
+#include <cache.h>
+#include <linker/linker-defs.h>
+#include <arch/arc/v2/aux_regs.h>
 #include <kernel_internal.h>
-#include <zephyr/sys/__assert.h>
-#include <zephyr/init.h>
+#include <sys/__assert.h>
+#include <init.h>
 #include <stdbool.h>
 
 #if defined(CONFIG_DCACHE_LINE_SIZE_DETECT)
@@ -40,6 +40,7 @@ size_t sys_cache_line_size;
 #define DC_CTRL_INDIRECT_ACCESS      0x20 /* indirect access mode */
 #define DC_CTRL_OP_SUCCEEDED         0x4  /* d-cache operation succeeded */
 
+
 static bool dcache_available(void)
 {
 	unsigned long val = z_arc_v2_aux_reg_read(_ARC_V2_D_CACHE_BUILD);
@@ -60,20 +61,15 @@ void arch_dcache_enable(void)
 	dcache_dc_ctrl(DC_CTRL_DC_ENABLE);
 }
 
-void arch_dcache_disable(void)
+static void arch_dcache_flush(void *start_addr_ptr, size_t size)
 {
-	/* nothing */
-}
-
-int arch_dcache_flush_range(void *start_addr_ptr, size_t size)
-{
-	size_t line_size = sys_cache_data_line_size_get();
+	size_t line_size = sys_dcache_line_size_get();
 	uintptr_t start_addr = (uintptr_t)start_addr_ptr;
 	uintptr_t end_addr;
 	unsigned int key;
 
 	if (!dcache_available() || (size == 0U) || line_size == 0U) {
-		return -ENOTSUP;
+		return;
 	}
 
 	end_addr = start_addr + size;
@@ -99,18 +95,17 @@ int arch_dcache_flush_range(void *start_addr_ptr, size_t size)
 
 	arch_irq_unlock(key); /* --exit critical section-- */
 
-	return 0;
 }
 
-int arch_dcache_invd_range(void *start_addr_ptr, size_t size)
+static void arch_dcache_invd(void *start_addr_ptr, size_t size)
 {
-	size_t line_size = sys_cache_data_line_size_get();
+	size_t line_size = sys_dcache_line_size_get();
 	uintptr_t start_addr = (uintptr_t)start_addr_ptr;
 	uintptr_t end_addr;
 	unsigned int key;
 
 	if (!dcache_available() || (size == 0U) || line_size == 0U) {
-		return -ENOTSUP;
+		return;
 	}
 	end_addr = start_addr + size;
 	start_addr = ROUND_DOWN(start_addr, line_size);
@@ -125,30 +120,25 @@ int arch_dcache_invd_range(void *start_addr_ptr, size_t size)
 		start_addr += line_size;
 	} while (start_addr < end_addr);
 	irq_unlock(key); /* -exit critical section- */
+}
+
+int arch_dcache_range(void *addr, size_t size, int op)
+{
+	if (op == K_CACHE_INVD) {
+		/*
+		 * TODO: On invalidate we can contextually flush by setting the
+		 * DC_CTRL_INVALID_FLUSH bit
+		 */
+		arch_dcache_invd(addr, size);
+	} else if (op == K_CACHE_WB) {
+		arch_dcache_flush(addr, size);
+	} else {
+		return -ENOTSUP;
+	}
 
 	return 0;
 }
 
-int arch_dcache_flush_and_invd_range(void *start_addr_ptr, size_t size)
-{
-	return -ENOTSUP;
-}
-
-int arch_dcache_flush_all(void)
-{
-	return -ENOTSUP;
-}
-
-int arch_dcache_invd_all(void)
-{
-	return -ENOTSUP;
-}
-
-int arch_dcache_flush_and_invd_all(void)
-{
-	return -ENOTSUP;
-}
-
 #if defined(CONFIG_DCACHE_LINE_SIZE_DETECT)
 static void init_dcache_line_size(void)
 {
@@ -167,58 +157,11 @@ size_t arch_dcache_line_size_get(void)
 }
 #endif
 
-void arch_icache_enable(void)
+static int init_dcache(const struct device *unused)
 {
-	/* nothing */
-}
+	ARG_UNUSED(unused);
 
-void arch_icache_disable(void)
-{
-	/* nothing */
-}
-
-int arch_icache_flush_all(void)
-{
-	return -ENOTSUP;
-}
-
-int arch_icache_invd_all(void)
-{
-	return -ENOTSUP;
-}
-
-int arch_icache_flush_and_invd_all(void)
-{
-	return -ENOTSUP;
-}
-
-int arch_icache_flush_range(void *addr, size_t size)
-{
-	ARG_UNUSED(addr);
-	ARG_UNUSED(size);
-
-	return -ENOTSUP;
-}
-
-int arch_icache_invd_range(void *addr, size_t size)
-{
-	ARG_UNUSED(addr);
-	ARG_UNUSED(size);
-
-	return -ENOTSUP;
-}
-
-int arch_icache_flush_and_invd_range(void *addr, size_t size)
-{
-	ARG_UNUSED(addr);
-	ARG_UNUSED(size);
-
-	return -ENOTSUP;
-}
-
-static int init_dcache(void)
-{
-	sys_cache_data_enable();
+	arch_dcache_enable();
 
 #if defined(CONFIG_DCACHE_LINE_SIZE_DETECT)
 	init_dcache_line_size();

arch/arc/core/cpu_idle.S

@@ -11,12 +11,11 @@
  * CPU power management routines.
  */
 
-#include <zephyr/kernel_structs.h>
+#include <kernel_structs.h>
 #include <offsets_short.h>
-#include <zephyr/toolchain.h>
-#include <zephyr/linker/sections.h>
-#include <zephyr/arch/cpu.h>
-#include <zephyr/arch/arc/asm-compat/assembler.h>
+#include <toolchain.h>
+#include <linker/sections.h>
+#include <arch/cpu.h>
 
 GTEXT(arch_cpu_idle)
 GTEXT(arch_cpu_atomic_idle)
@@ -26,7 +25,6 @@ SECTION_VAR(BSS, z_arc_cpu_sleep_mode)
 	.align 4
 	.word 0
 
-#ifndef CONFIG_ARCH_HAS_CUSTOM_CPU_IDLE
 /*
  * @brief Put the CPU in low-power mode
  *
@@ -38,20 +36,17 @@ SECTION_VAR(BSS, z_arc_cpu_sleep_mode)
 SECTION_FUNC(TEXT, arch_cpu_idle)
 
 #ifdef CONFIG_TRACING
-	PUSHR blink
+	push_s blink
 	jl    sys_trace_idle
-	POPR blink
+	pop_s blink
 #endif
 
-	/* z_arc_cpu_sleep_mode is 32 bit despite of platform bittnes */
 	ld r1, [z_arc_cpu_sleep_mode]
 	or r1, r1, (1 << 4) /* set IRQ-enabled bit */
 	sleep r1
 	j_s [blink]
 	nop
-#endif
 
-#ifndef CONFIG_ARCH_HAS_CUSTOM_CPU_ATOMIC_IDLE
 /*
  * @brief Put the CPU in low-power mode, entered with IRQs locked
  *
@@ -59,19 +54,16 @@ SECTION_FUNC(TEXT, arch_cpu_idle)
  *
  * void arch_cpu_atomic_idle(unsigned int key)
  */
-
 SECTION_FUNC(TEXT, arch_cpu_atomic_idle)
 
 #ifdef CONFIG_TRACING
-	PUSHR blink
+	push_s blink
 	jl    sys_trace_idle
-	POPR blink
+	pop_s blink
 #endif
 
-	/* z_arc_cpu_sleep_mode is 32 bit despite of platform bittnes */
 	ld r1, [z_arc_cpu_sleep_mode]
 	or r1, r1, (1 << 4) /* set IRQ-enabled bit */
 	sleep r1
 	j_s.d [blink]
 	seti r0
-#endif

arch/arc/core/dsp/Kconfig

@@ -1,70 +0,0 @@
-# Digital Signal Processing (DSP) configuration options
-
-# Copyright (c) 2022 Synopsys
-# SPDX-License-Identifier: Apache-2.0
-
-menu "ARC DSP Options"
-depends on CPU_HAS_DSP
-
-config ARC_DSP
-	bool "digital signal processing (DSP)"
-	help
-	  This option enables DSP and DSP instructions.
-
-config ARC_DSP_TURNED_OFF
-	bool "Turn off DSP if it presents"
-	depends on !ARC_DSP
-	help
-	  This option disables DSP block via resetting DSP_CRTL register.
-
-config DSP_SHARING
-	bool "DSP register sharing"
-	depends on ARC_DSP && MULTITHREADING
-	select ARC_HAS_ACCL_REGS
-	help
-	  This option enables preservation of the hardware DSP registers
-	  across context switches to allow multiple threads to perform concurrent
-	  DSP operations.
-
-config ARC_DSP_BFLY_SHARING
-	bool "ARC complex DSP operation"
-	depends on ARC_DSP && CPU_ARCEM
-	help
-	  This option is to enable Zephyr to store and restore DSP_BFLY0
-	  and FFT_CTRL registers during context switch. This option is
-	  only required when butterfly instructions are used in
-	  multi-thread.
-
-config ARC_XY_ENABLE
-	bool "ARC address generation unit registers"
-	help
-	  Processors with XY memory and AGU registers can configure this
-	  option to accelerate DSP instrctions.
-
-config ARC_AGU_SHARING
-	bool "ARC address generation unit register sharing"
-	depends on ARC_XY_ENABLE && MULTITHREADING
-	default y if DSP_SHARING
-	help
-	  This option enables preservation of the hardware AGU registers
-	  across context switches to allow multiple threads to perform concurrent
-	  operations on XY memory. Save and restore small size AGU registers is
-	  set as default, including 4 address pointers regs, 2 address offset regs
-	  and 4 modifiers regs.
-
-config ARC_AGU_MEDIUM
-	bool "ARC AGU medium size register"
-	depends on ARC_AGU_SHARING
-	help
-	  Save and restore medium AGU registers, including 8 address pointers regs,
-	  4 address offset regs and 12 modifiers regs.
-
-config ARC_AGU_LARGE
-	bool "ARC AGU large size register"
-	depends on ARC_AGU_SHARING
-	select ARC_AGU_MEDIUM
-	help
-	  Save and restore large AGU registers, including 12 address pointers regs,
-	  8 address offset regs and 24 modifiers regs.
-
-endmenu

arch/arc/core/dsp/dsp_offsets.c

@@ -1,70 +0,0 @@
-/*
- * Copyright (c) 2022 Synopsys.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/**
- * @file
- * @brief ARCv2 DSP and AGU structure member offset definition file
- *
- */
-#ifdef CONFIG_DSP_SHARING
-GEN_OFFSET_SYM(_callee_saved_stack_t, dsp_ctrl);
-GEN_OFFSET_SYM(_callee_saved_stack_t, acc0_glo);
-GEN_OFFSET_SYM(_callee_saved_stack_t, acc0_ghi);
-#ifdef CONFIG_ARC_DSP_BFLY_SHARING
-GEN_OFFSET_SYM(_callee_saved_stack_t, dsp_bfly0);
-GEN_OFFSET_SYM(_callee_saved_stack_t, dsp_fft_ctrl);
-#endif
-#endif
-#ifdef CONFIG_ARC_AGU_SHARING
-GEN_OFFSET_SYM(_callee_saved_stack_t, agu_ap0);
-GEN_OFFSET_SYM(_callee_saved_stack_t, agu_ap1);
-GEN_OFFSET_SYM(_callee_saved_stack_t, agu_ap2);
-GEN_OFFSET_SYM(_callee_saved_stack_t, agu_ap3);
-GEN_OFFSET_SYM(_callee_saved_stack_t, agu_os0);
-GEN_OFFSET_SYM(_callee_saved_stack_t, agu_os1);
-GEN_OFFSET_SYM(_callee_saved_stack_t, agu_mod0);
-GEN_OFFSET_SYM(_callee_saved_stack_t, agu_mod1);
-GEN_OFFSET_SYM(_callee_saved_stack_t, agu_mod2);
-GEN_OFFSET_SYM(_callee_saved_stack_t, agu_mod3);
-#ifdef CONFIG_ARC_AGU_MEDIUM
-GEN_OFFSET_SYM(_callee_saved_stack_t, agu_ap4);
-GEN_OFFSET_SYM(_callee_saved_stack_t, agu_ap5);
-GEN_OFFSET_SYM(_callee_saved_stack_t, agu_ap6);
-GEN_OFFSET_SYM(_callee_saved_stack_t, agu_ap7);
-GEN_OFFSET_SYM(_callee_saved_stack_t, agu_os2);
-GEN_OFFSET_SYM(_callee_saved_stack_t, agu_os3);
-GEN_OFFSET_SYM(_callee_saved_stack_t, agu_mod4);
-GEN_OFFSET_SYM(_callee_saved_stack_t, agu_mod5);
-GEN_OFFSET_SYM(_callee_saved_stack_t, agu_mod6);
-GEN_OFFSET_SYM(_callee_saved_stack_t, agu_mod7);
-GEN_OFFSET_SYM(_callee_saved_stack_t, agu_mod8);
-GEN_OFFSET_SYM(_callee_saved_stack_t, agu_mod9);
-GEN_OFFSET_SYM(_callee_saved_stack_t, agu_mod10);
-GEN_OFFSET_SYM(_callee_saved_stack_t, agu_mod11);
-#endif
-#ifdef CONFIG_ARC_AGU_LARGE
-GEN_OFFSET_SYM(_callee_saved_stack_t, agu_ap8);
-GEN_OFFSET_SYM(_callee_saved_stack_t, agu_ap9);
-GEN_OFFSET_SYM(_callee_saved_stack_t, agu_ap10);
-GEN_OFFSET_SYM(_callee_saved_stack_t, agu_ap11);
-GEN_OFFSET_SYM(_callee_saved_stack_t, agu_os4);
-GEN_OFFSET_SYM(_callee_saved_stack_t, agu_os5);
-GEN_OFFSET_SYM(_callee_saved_stack_t, agu_os6);
-GEN_OFFSET_SYM(_callee_saved_stack_t, agu_os7);
-GEN_OFFSET_SYM(_callee_saved_stack_t, agu_mod12);
-GEN_OFFSET_SYM(_callee_saved_stack_t, agu_mod13);
-GEN_OFFSET_SYM(_callee_saved_stack_t, agu_mod14);
-GEN_OFFSET_SYM(_callee_saved_stack_t, agu_mod15);
-GEN_OFFSET_SYM(_callee_saved_stack_t, agu_mod16);
-GEN_OFFSET_SYM(_callee_saved_stack_t, agu_mod17);
-GEN_OFFSET_SYM(_callee_saved_stack_t, agu_mod18);
-GEN_OFFSET_SYM(_callee_saved_stack_t, agu_mod19);
-GEN_OFFSET_SYM(_callee_saved_stack_t, agu_mod20);
-GEN_OFFSET_SYM(_callee_saved_stack_t, agu_mod21);
-GEN_OFFSET_SYM(_callee_saved_stack_t, agu_mod22);
-GEN_OFFSET_SYM(_callee_saved_stack_t, agu_mod23);
-#endif
-#endif

arch/arc/core/dsp/swap_dsp_macros.h

@@ -1,269 +0,0 @@
-/*
- * Copyright (c) 2022 Synopsys.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/**
- * @file
- * @brief save and load macro for ARCv2 DSP and AGU regs
- *
- */
-.macro _save_dsp_regs
-#ifdef CONFIG_DSP_SHARING
-	ld_s r13, [r2, ___thread_base_t_user_options_OFFSET]
-	bbit0 r13, K_DSP_IDX, dsp_skip_save
-	lr r13, [_ARC_V2_DSP_CTRL]
-	st_s r13, [sp, ___callee_saved_stack_t_dsp_ctrl_OFFSET]
-	lr r13, [_ARC_V2_ACC0_GLO]
-	st_s r13, [sp, ___callee_saved_stack_t_acc0_glo_OFFSET]
-	lr r13, [_ARC_V2_ACC0_GHI]
-	st_s r13, [sp, ___callee_saved_stack_t_acc0_ghi_OFFSET]
-#ifdef CONFIG_ARC_DSP_BFLY_SHARING
-	lr r13, [_ARC_V2_DSP_BFLY0]
-	st_s r13, [sp, ___callee_saved_stack_t_dsp_bfly0_OFFSET]
-	lr r13, [_ARC_V2_DSP_FFT_CTRL]
-	st_s r13, [sp, ___callee_saved_stack_t_dsp_fft_ctrl_OFFSET]
-#endif
-#endif
-dsp_skip_save :
-#ifdef CONFIG_ARC_AGU_SHARING
-	_save_agu_regs
-#endif
-.endm
-
-.macro _save_agu_regs
-#ifdef CONFIG_ARC_AGU_SHARING
-	ld_s r13, [r2, ___thread_base_t_user_options_OFFSET]
-	btst r13, K_AGU_IDX
-
-	jeq agu_skip_save
-
-	lr r13, [_ARC_V2_AGU_AP0]
-	st r13, [sp, ___callee_saved_stack_t_agu_ap0_OFFSET]
-	lr r13, [_ARC_V2_AGU_AP1]
-	st r13, [sp, ___callee_saved_stack_t_agu_ap1_OFFSET]
-	lr r13, [_ARC_V2_AGU_AP2]
-	st r13, [sp, ___callee_saved_stack_t_agu_ap2_OFFSET]
-	lr r13, [_ARC_V2_AGU_AP3]
-	st r13, [sp, ___callee_saved_stack_t_agu_ap3_OFFSET]
-	lr r13, [_ARC_V2_AGU_OS0]
-	st r13, [sp, ___callee_saved_stack_t_agu_os0_OFFSET]
-	lr r13, [_ARC_V2_AGU_OS1]
-	st r13, [sp, ___callee_saved_stack_t_agu_os1_OFFSET]
-	lr r13, [_ARC_V2_AGU_MOD0]
-	st r13, [sp, ___callee_saved_stack_t_agu_mod0_OFFSET]
-	lr r13, [_ARC_V2_AGU_MOD1]
-	st r13, [sp, ___callee_saved_stack_t_agu_mod1_OFFSET]
-	lr r13, [_ARC_V2_AGU_MOD2]
-	st r13, [sp, ___callee_saved_stack_t_agu_mod2_OFFSET]
-	lr r13, [_ARC_V2_AGU_MOD3]
-	st r13, [sp, ___callee_saved_stack_t_agu_mod3_OFFSET]
-#ifdef CONFIG_ARC_AGU_MEDIUM
-	lr r13, [_ARC_V2_AGU_AP4]
-	st r13, [sp, ___callee_saved_stack_t_agu_ap4_OFFSET]
-	lr r13, [_ARC_V2_AGU_AP5]
-	st r13, [sp, ___callee_saved_stack_t_agu_ap5_OFFSET]
-	lr r13, [_ARC_V2_AGU_AP6]
-	st r13, [sp, ___callee_saved_stack_t_agu_ap6_OFFSET]
-	lr r13, [_ARC_V2_AGU_AP7]
-	st r13, [sp, ___callee_saved_stack_t_agu_ap7_OFFSET]
-	lr r13, [_ARC_V2_AGU_OS2]
-	st r13, [sp, ___callee_saved_stack_t_agu_os2_OFFSET]
-	lr r13, [_ARC_V2_AGU_OS3]
-	st r13, [sp, ___callee_saved_stack_t_agu_os3_OFFSET]
-	lr r13, [_ARC_V2_AGU_MOD4]
-	st r13, [sp, ___callee_saved_stack_t_agu_mod4_OFFSET]
-	lr r13, [_ARC_V2_AGU_MOD5]
-	st r13, [sp, ___callee_saved_stack_t_agu_mod5_OFFSET]
-	lr r13, [_ARC_V2_AGU_MOD6]
-	st r13, [sp, ___callee_saved_stack_t_agu_mod6_OFFSET]
-	lr r13, [_ARC_V2_AGU_MOD7]
-	st r13, [sp, ___callee_saved_stack_t_agu_mod7_OFFSET]
-	lr r13, [_ARC_V2_AGU_MOD8]
-	st r13, [sp, ___callee_saved_stack_t_agu_mod8_OFFSET]
-	lr r13, [_ARC_V2_AGU_MOD9]
-	st r13, [sp, ___callee_saved_stack_t_agu_mod9_OFFSET]
-	lr r13, [_ARC_V2_AGU_MOD10]
-	st r13, [sp, ___callee_saved_stack_t_agu_mod10_OFFSET]
-	lr r13, [_ARC_V2_AGU_MOD11]
-	st r13, [sp, ___callee_saved_stack_t_agu_mod11_OFFSET]
-#endif
-#ifdef CONFIG_ARC_AGU_LARGE
-	lr r13, [_ARC_V2_AGU_AP8]
-	st r13, [sp, ___callee_saved_stack_t_agu_ap8_OFFSET]
-	lr r13, [_ARC_V2_AGU_AP9]
-	st r13, [sp, ___callee_saved_stack_t_agu_ap9_OFFSET]
-	lr r13, [_ARC_V2_AGU_AP10]
-	st r13, [sp, ___callee_saved_stack_t_agu_ap10_OFFSET]
-	lr r13, [_ARC_V2_AGU_AP11]
-	st r13, [sp, ___callee_saved_stack_t_agu_ap11_OFFSET]
-	lr r13, [_ARC_V2_AGU_OS4]
-	st r13, [sp, ___callee_saved_stack_t_agu_os4_OFFSET]
-	lr r13, [_ARC_V2_AGU_OS5]
-	st r13, [sp, ___callee_saved_stack_t_agu_os5_OFFSET]
-	lr r13, [_ARC_V2_AGU_OS6]
-	st r13, [sp, ___callee_saved_stack_t_agu_os6_OFFSET]
-	lr r13, [_ARC_V2_AGU_OS7]
-	st r13, [sp, ___callee_saved_stack_t_agu_os7_OFFSET]
-	lr r13, [_ARC_V2_AGU_MOD12]
-	st r13, [sp, ___callee_saved_stack_t_agu_mod12_OFFSET]
-	lr r13, [_ARC_V2_AGU_MOD13]
-	st r13, [sp, ___callee_saved_stack_t_agu_mod13_OFFSET]
-	lr r13, [_ARC_V2_AGU_MOD14]
-	st r13, [sp, ___callee_saved_stack_t_agu_mod14_OFFSET]
-	lr r13, [_ARC_V2_AGU_MOD15]
-	st r13, [sp, ___callee_saved_stack_t_agu_mod15_OFFSET]
-	lr r13, [_ARC_V2_AGU_MOD16]
-	st r13, [sp, ___callee_saved_stack_t_agu_mod16_OFFSET]
-	lr r13, [_ARC_V2_AGU_MOD17]
-	st r13, [sp, ___callee_saved_stack_t_agu_mod17_OFFSET]
-	lr r13, [_ARC_V2_AGU_MOD18]
-	st r13, [sp, ___callee_saved_stack_t_agu_mod18_OFFSET]
-	lr r13, [_ARC_V2_AGU_MOD19]
-	st r13, [sp, ___callee_saved_stack_t_agu_mod19_OFFSET]
-	lr r13, [_ARC_V2_AGU_MOD20]
-	st r13, [sp, ___callee_saved_stack_t_agu_mod20_OFFSET]
-	lr r13, [_ARC_V2_AGU_MOD21]
-	_st32_huge_offset r13, sp, ___callee_saved_stack_t_agu_mod21_OFFSET, r1
-	lr r13, [_ARC_V2_AGU_MOD22]
-	_st32_huge_offset r13, sp, ___callee_saved_stack_t_agu_mod22_OFFSET, r1
-	lr r13, [_ARC_V2_AGU_MOD23]
-	_st32_huge_offset r13, sp, ___callee_saved_stack_t_agu_mod23_OFFSET, r1
-#endif
-#endif
-agu_skip_save :
-.endm
-
-.macro _load_dsp_regs
-#ifdef CONFIG_DSP_SHARING
-	ld_s r13, [r2, ___thread_base_t_user_options_OFFSET]
-	bbit0 r13, K_DSP_IDX, dsp_skip_load
-	ld_s r13, [sp, ___callee_saved_stack_t_dsp_ctrl_OFFSET]
-	sr r13, [_ARC_V2_DSP_CTRL]
-	ld_s r13, [sp, ___callee_saved_stack_t_acc0_glo_OFFSET]
-	sr r13, [_ARC_V2_ACC0_GLO]
-	ld_s r13, [sp, ___callee_saved_stack_t_acc0_ghi_OFFSET]
-	sr r13, [_ARC_V2_ACC0_GHI]
-#ifdef CONFIG_ARC_DSP_BFLY_SHARING
-	ld_s r13, [sp, ___callee_saved_stack_t_dsp_bfly0_OFFSET]
-	sr r13, [_ARC_V2_DSP_BFLY0]
-	ld_s r13, [sp, ___callee_saved_stack_t_dsp_fft_ctrl_OFFSET]
-	sr r13, [_ARC_V2_DSP_FFT_CTRL]
-#endif
-#endif
-dsp_skip_load :
-#ifdef CONFIG_ARC_AGU_SHARING
-	_load_agu_regs
-#endif
-.endm
-
-.macro _load_agu_regs
-#ifdef CONFIG_ARC_AGU_SHARING
-	ld_s r13, [r2, ___thread_base_t_user_options_OFFSET]
-	btst r13, K_AGU_IDX
-
-	jeq agu_skip_load
-
-	ld r13, [sp, ___callee_saved_stack_t_agu_ap0_OFFSET]
-	sr r13, [_ARC_V2_AGU_AP0]
-	ld r13, [sp, ___callee_saved_stack_t_agu_ap1_OFFSET]
-	sr r13, [_ARC_V2_AGU_AP1]
-	ld r13, [sp, ___callee_saved_stack_t_agu_ap2_OFFSET]
-	sr r13, [_ARC_V2_AGU_AP2]
-	ld r13, [sp, ___callee_saved_stack_t_agu_ap3_OFFSET]
-	sr r13, [_ARC_V2_AGU_AP3]
-	ld r13, [sp, ___callee_saved_stack_t_agu_os0_OFFSET]
-	sr r13, [_ARC_V2_AGU_OS0]
-	ld r13, [sp, ___callee_saved_stack_t_agu_os1_OFFSET]
-	sr r13, [_ARC_V2_AGU_OS1]
-	ld r13, [sp, ___callee_saved_stack_t_agu_mod0_OFFSET]
-	sr r13, [_ARC_V2_AGU_MOD0]
-	ld r13, [sp, ___callee_saved_stack_t_agu_mod1_OFFSET]
-	sr r13, [_ARC_V2_AGU_MOD1]
-	ld r13, [sp, ___callee_saved_stack_t_agu_mod2_OFFSET]
-	sr r13, [_ARC_V2_AGU_MOD2]
-	ld r13, [sp, ___callee_saved_stack_t_agu_mod3_OFFSET]
-	sr r13, [_ARC_V2_AGU_MOD3]
-#ifdef CONFIG_ARC_AGU_MEDIUM
-	ld r13, [sp, ___callee_saved_stack_t_agu_ap4_OFFSET]
-	sr r13, [_ARC_V2_AGU_AP4]
-	ld r13, [sp, ___callee_saved_stack_t_agu_ap5_OFFSET]
-	sr r13, [_ARC_V2_AGU_AP5]
-	ld r13, [sp, ___callee_saved_stack_t_agu_ap6_OFFSET]
-	sr r13, [_ARC_V2_AGU_AP6]
-	ld r13, [sp, ___callee_saved_stack_t_agu_ap7_OFFSET]
-	sr r13, [_ARC_V2_AGU_AP7]
-	ld r13, [sp, ___callee_saved_stack_t_agu_os2_OFFSET]
-	sr r13, [_ARC_V2_AGU_OS2]
-	ld r13, [sp, ___callee_saved_stack_t_agu_os3_OFFSET]
-	sr r13, [_ARC_V2_AGU_OS3]
-	ld r13, [sp, ___callee_saved_stack_t_agu_mod4_OFFSET]
-	sr r13, [_ARC_V2_AGU_MOD4]
-	ld r13, [sp, ___callee_saved_stack_t_agu_mod5_OFFSET]
-	sr r13, [_ARC_V2_AGU_MOD5]
-	ld r13, [sp, ___callee_saved_stack_t_agu_mod6_OFFSET]
-	sr r13, [_ARC_V2_AGU_MOD6]
-	ld r13, [sp, ___callee_saved_stack_t_agu_mod7_OFFSET]
-	sr r13, [_ARC_V2_AGU_MOD7]
-	ld r13, [sp, ___callee_saved_stack_t_agu_mod8_OFFSET]
-	sr r13, [_ARC_V2_AGU_MOD8]
-	ld r13, [sp, ___callee_saved_stack_t_agu_mod9_OFFSET]
-	sr r13, [_ARC_V2_AGU_MOD9]
-	ld r13, [sp, ___callee_saved_stack_t_agu_mod10_OFFSET]
-	sr r13, [_ARC_V2_AGU_MOD10]
-	ld r13, [sp, ___callee_saved_stack_t_agu_mod11_OFFSET]
-	sr r13, [_ARC_V2_AGU_MOD11]
-#endif
-#ifdef CONFIG_ARC_AGU_LARGE
-	ld r13, [sp, ___callee_saved_stack_t_agu_ap8_OFFSET]
-	sr r13, [_ARC_V2_AGU_AP8]
-	ld r13, [sp, ___callee_saved_stack_t_agu_ap9_OFFSET]
-	sr r13, [_ARC_V2_AGU_AP9]
-	ld r13, [sp, ___callee_saved_stack_t_agu_ap10_OFFSET]
-	sr r13, [_ARC_V2_AGU_AP10]
-	ld r13, [sp, ___callee_saved_stack_t_agu_ap11_OFFSET]
-	sr r13, [_ARC_V2_AGU_AP11]
-	ld r13, [sp, ___callee_saved_stack_t_agu_os4_OFFSET]
-	sr r13, [_ARC_V2_AGU_OS4]
-	ld r13, [sp, ___callee_saved_stack_t_agu_os5_OFFSET]
-	sr r13, [_ARC_V2_AGU_OS5]
-	ld r13, [sp, ___callee_saved_stack_t_agu_os6_OFFSET]
-	sr r13, [_ARC_V2_AGU_OS6]
-	ld r13, [sp, ___callee_saved_stack_t_agu_os7_OFFSET]
-	sr r13, [_ARC_V2_AGU_OS7]
-	ld r13, [sp, ___callee_saved_stack_t_agu_mod12_OFFSET]
-	sr r13, [_ARC_V2_AGU_MOD12]
-	ld r13, [sp, ___callee_saved_stack_t_agu_mod13_OFFSET]
-	sr r13, [_ARC_V2_AGU_MOD13]
-	ld r13, [sp, ___callee_saved_stack_t_agu_mod14_OFFSET]
-	sr r13, [_ARC_V2_AGU_MOD14]
-	ld r13, [sp, ___callee_saved_stack_t_agu_mod15_OFFSET]
-	sr r13, [_ARC_V2_AGU_MOD15]
-	ld r13, [sp, ___callee_saved_stack_t_agu_mod16_OFFSET]
-	sr r13, [_ARC_V2_AGU_MOD16]
-	ld r13, [sp, ___callee_saved_stack_t_agu_mod17_OFFSET]
-	sr r13, [_ARC_V2_AGU_MOD17]
-	ld r13, [sp, ___callee_saved_stack_t_agu_mod18_OFFSET]
-	sr r13, [_ARC_V2_AGU_MOD18]
-	ld r13, [sp, ___callee_saved_stack_t_agu_mod19_OFFSET]
-	sr r13, [_ARC_V2_AGU_MOD19]
-	ld r13, [sp, ___callee_saved_stack_t_agu_mod20_OFFSET]
-	sr r13, [_ARC_V2_AGU_MOD20]
-	ld r13, [sp, ___callee_saved_stack_t_agu_mod21_OFFSET]
-	sr r13, [_ARC_V2_AGU_MOD21]
-	ld r13, [sp, ___callee_saved_stack_t_agu_mod22_OFFSET]
-	sr r13, [_ARC_V2_AGU_MOD22]
-	ld r13, [sp, ___callee_saved_stack_t_agu_mod23_OFFSET]
-	sr r13, [_ARC_V2_AGU_MOD23]
-#endif
-#endif
-agu_skip_load :
-.endm
-
-.macro _dsp_extension_probe
-#ifdef CONFIG_ARC_DSP_TURNED_OFF
-	mov	 r0, 0 /* DSP_CTRL_DISABLED_ALL */
-	sr	 r0, [_ARC_V2_DSP_CTRL]
-#endif
-.endm

arch/arc/core/fast_irq.S

@@ -13,17 +13,18 @@
  * See isr_wrapper.S for details.
  */
 
-#include <zephyr/kernel_structs.h>
+#include <kernel_structs.h>
 #include <offsets_short.h>
-#include <zephyr/toolchain.h>
-#include <zephyr/linker/sections.h>
-#include <zephyr/arch/cpu.h>
+#include <toolchain.h>
+#include <linker/sections.h>
+#include <arch/cpu.h>
 #include <swap_macros.h>
 
 GTEXT(_firq_enter)
 GTEXT(_firq_exit)
 
 /**
+ *
  * @brief Work to be done before handing control to a FIRQ ISR
  *
  * The processor switches to a second register bank so registers from the
@@ -40,6 +41,8 @@ GTEXT(_firq_exit)
  * interrupt. An exception, however, can be taken.
  *
  * Assumption by _isr_demux: r3 is untouched by _firq_enter.
+ *
+ * @return N/A
  */
 
 SECTION_FUNC(TEXT, _firq_enter)
@@ -128,7 +131,10 @@ firq_nest:
 
 
 /**
+ *
  * @brief Work to be done exiting a FIRQ
+ *
+ * @return N/A
  */
 
 SECTION_FUNC(TEXT, _firq_exit)
@@ -145,13 +151,14 @@ SECTION_FUNC(TEXT, _firq_exit)
 
 	jne _firq_no_switch
 
-	/* sp is struct k_thread **old of z_arc_switch_in_isr which is a wrapper of
-	 * z_get_next_switch_handle. r0 contains the 1st thread in ready queue. If it isn't NULL,
-	 * then do switch to this thread.
+	/* sp is struct k_thread **old of z_arc_switch_in_isr
+	 * which is a wrapper of z_get_next_switch_handle.
+	 * r0 contains the 1st thread in ready queue. if
+	 * it equals _current(r2) ,then do swap, or no swap.
 	 */
 	_get_next_switch_handle
 
-	CMPR r0, 0
+	cmp r0, r2
 	bne _firq_switch
 
 	/* fall to no switch */
@@ -238,10 +245,10 @@ _firq_create_irq_stack_frame:
 	ld r2, [r1, -8]
 #endif
 	/* r2 is old thread */
-	st _CAUSE_FIRQ, [r2, _thread_offset_to_relinquish_cause]
-
 	_irq_store_old_thread_callee_regs
 
+	st _CAUSE_FIRQ, [r2, _thread_offset_to_relinquish_cause]
+
 	/* mov new thread (r0) to r2 */
 
 	mov r2, r0