ci: backport_issue_check: Use ubuntu-22.04 virtual environment

This commit updates the pull request backport issue check workflow to
use the Ubuntu 22.04 virtual environment.

Signed-off-by: Stephanos Ioannidis <root@stephanos.io>
(cherry picked from commit cadd6e6fa4)

.checkpatch.conf

@@ -29,3 +29,4 @@
 --ignore MULTISTATEMENT_MACRO_USE_DO_WHILE
 --ignore ENOSYS
 --ignore IS_ENABLED_CONFIG
+--exclude ext

.clang-format

@@ -1,42 +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
+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: 100
+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:
   - 'FOR_EACH'
   - 'FOR_EACH_FIXED_ARG'
-  - 'FOR_EACH_IDX'
-  - 'FOR_EACH_IDX_FIXED_ARG'
-  - 'FOR_EACH_NONEMPTY_TERM'
   - 'RB_FOR_EACH'
   - 'RB_FOR_EACH_CONTAINER'
   - 'SYS_DLIST_FOR_EACH_CONTAINER'
@@ -51,41 +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'
-  - 'TYPE_SECTION_FOREACH'
-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
+#IndentPPDirectives: None # Unknown to clang-format-5.0
 IndentWidth: 8
-InsertBraces: true
-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

.github/ISSUE_TEMPLATE/001_bug_report.md

@@ -1,57 +0,0 @@
----
-name: Bug report
-about: Create a report to help us improve Zephyr
-title: ''
-labels: bug
-assignees: ''
-
----
-
-**Notes (delete this)**
-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/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,45 @@
+---
+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.
+
+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?
+ - ...
+
+**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/ext-source.md

@@ -0,0 +1,62 @@
+---
+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 exernal 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
+
+## 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/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/nomination.md

@@ -0,0 +1,41 @@
+---
+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 an elevated permission level in
+the Contributor role.
+
+# 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/development_process/project_roles.html#tsc-project-roles>
+[GitHub Permission Level]: <https://docs.github.com/en/organizations/managing-access-to-your-organizations-repositories/repository-permission-levels-for-an-organization>

.github/SECURITY.md

@@ -8,12 +8,12 @@ updates:
   - The most recent release, and the release prior to that.
   - Active LTS releases.
 
-At this time, with the latest release of v3.3, the supported
+At this time, with the latest release of v3.0.0, the supported
 versions are:
 
-  - v2.7: Current LTS
-  - v3.2: Prior release
-  - v3.3: Current release
+  - v2.7.0: Current LTS
+  - v2.7.0: Prior release
+  - v3.0.0: Current release
 
 ## Reporting process
 

.github/labeler.yml

@@ -0,0 +1,171 @@
+"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: ARM64":
+  - "arch/arm64/**/*"
+  - "include/arch/arm64/**/*"
+"area: MIPS":
+  - "arch/mips/**/*"
+  - "include/arch/mips/**/*"
+"area: NIOS2":
+  - "arch/nios2/**/*"
+  - "include/arch/nios2/**/*"
+"area: Xtensa":
+  - "arch/xtensa/**/*"
+  - "include/arch/xtensa/**/*"
+"area: RISCV":
+  - "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 Audio":
+  - "subsys/bluetooth/audio/**/*"
+"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/**"
+"area: Power Management":
+  - "subsys/pm/**/*"
+  - "include/pm/**/*"
+  - "tests/subsys/pm/**/*"
+  - "samples/subsys/pm/**/*"
+"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,51 +0,0 @@
-name: Pull Request Assigner
-
-on:
-  pull_request_target:
-    types:
-    - opened
-    - synchronize
-    - reopened
-    - ready_for_review
-    branches:
-    - main
-    - 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@v3
-
-    - 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

@@ -9,23 +9,11 @@ on:
 
 jobs:
   backport:
+    runs-on: ubuntu-20.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.1-1
         with:
           github_token: ${{ secrets.ZB_GITHUB_TOKEN }}
-          issue_labels: Backport
-          labels_template: '["Backport"]'
+          issue_labels: backport

.github/workflows/backport_issue_check.yml

@@ -9,7 +9,6 @@ jobs:
   backport:
     name: Backport Issue Check
     runs-on: ubuntu-22.04
-    if: github.repository == 'zephyrproject-rtos/zephyr'
 
     steps:
       - name: Check out source code

.github/workflows/blackbox_tests.yml

@@ -1,99 +0,0 @@
-# Copyright (c) 2023 Intel Corporation.
-# SPDX-License-Identifier: Apache-2.0
-
-name: Twister BlackBox TestSuite
-
-on:
-  push:
-    branches:
-    - main
-    paths:
-    - 'scripts/pylib/twister/**'
-    - 'scripts/twister'
-    - 'scripts/tests/twister_blackbox/**'
-    - '.github/workflows/blackbox_tests.yml'
-  pull_request:
-    branches:
-    - main
-    paths:
-    - 'scripts/pylib/twister/**'
-    - 'scripts/twister'
-    - 'scripts/tests/twister_blackbox/**'
-    - '.github/workflows/blackbox_tests.yml'
-
-jobs:
-  twister-tests:
-    name: Twister Black Box Tests
-    runs-on: ${{ matrix.os }}
-    strategy:
-      matrix:
-        python-version: [3.8, 3.9, '3.10']
-        os: [ubuntu-22.04]
-    container:
-      image: ghcr.io/zephyrproject-rtos/ci:v0.26.4
-    env:
-      ZEPHYR_SDK_INSTALL_DIR: /opt/toolchains/zephyr-sdk-0.16.1
-
-    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@v3
-
-    - name: Environment Setup
-      run: |
-        echo "$HOME/.local/bin" >> $GITHUB_PATH
-
-        west init -l . || true
-        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'
-
-    - name: Set Up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v4
-      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
-
-    - name: Upload Unit Test Results
-      if: success() || failure()
-      uses: actions/upload-artifact@v2
-      with:
-        name: Black Box Test Results (Python ${{ matrix.python-version }})
-        path: |
-          twister-out*/twister.log
-          twister-out*/twister.json
-          twister-out*/testplan.log
-        retention-days: 14
-
-    - name: Clear Workspace
-      if: success() || failure()
-      run: |
-        rm -rf twister-out*/

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

@@ -0,0 +1,29 @@
+name: Publish Bluetooth Tests Results
+
+on:
+  workflow_run:
+    workflows: ["Bluetooth Tests"]
+    types:
+      - completed
+jobs:
+  bluetooth-test-results:
+    name: "Publish Bluetooth Test Results"
+    runs-on: ubuntu-20.04
+    if: github.event.workflow_run.conclusion != 'skipped'
+
+    steps:
+      - name: Download artifacts
+        uses: dawidd6/action-download-artifact@v2
+        with:
+          workflow: bluetooth-tests.yaml
+          run_id: ${{ github.event.workflow_run.id }}
+
+      - name: Publish Bluetooth Test Results
+        uses: EnricoMi/publish-unit-test-result-action@v1
+        with:
+          check_name: Bluetooth 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: "bluetooth-test-results/**/bsim_results.xml"

.github/workflows/bluetooth-tests.yaml

@@ -0,0 +1,67 @@
+name: Bluetooth Tests
+
+on:
+  pull_request:
+    paths:
+      - "west.yml"
+      - "subsys/bluetooth/**"
+      - "tests/bluetooth/bsim_bt/**"
+      - "boards/posix/**"
+      - "soc/posix/**"
+      - "arch/posix/**"
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event_name }}-${{ github.head_ref || github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  bluetooth-test:
+    runs-on: ubuntu-20.04
+    container:
+      image: zephyrprojectrtos/ci:v0.21.0
+      options: '--entrypoint /bin/bash'
+    env:
+      ZEPHYR_TOOLCHAIN_VARIANT: zephyr
+      ZEPHYR_SDK_INSTALL_DIR: /opt/toolchains/zephyr-sdk-0.13.2
+      CLANG_ROOT_DIR: /usr/lib/llvm-12
+      BSIM_OUT_PATH: /opt/bsim/
+      BSIM_COMPONENTS_PATH: /opt/bsim/components
+      EDTT_PATH: ../tools/edtt
+      bsim_bt_test_results_file: ./bsim_bt_out/bsim_results.xml
+    steps:
+      - name: Update PATH for west
+        run: |
+          echo "$HOME/.local/bin" >> $GITHUB_PATH
+
+      - name: checkout
+        uses: actions/checkout@v3
+
+      - 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: Run Bluetooth Tests with BSIM
+        run: |
+          export ZEPHYR_BASE=${PWD}
+          WORK_DIR=${ZEPHYR_BASE}/bsim_bt_out tests/bluetooth/bsim_bt/compile.sh
+          RESULTS_FILE=${ZEPHYR_BASE}/${bsim_bt_test_results_file} \
+          SEARCH_PATH=tests/bluetooth/bsim_bt/ tests/bluetooth/bsim_bt/run_parallel.sh
+
+      - name: Upload Test Results
+        if: always()
+        uses: actions/upload-artifact@v3
+        with:
+          name: bluetooth-test-results
+          path: |
+            ./bsim_bt_out/bsim_results.xml
+            ${{ github.event_path }}
+
+      - name: Upload Event Details
+        if: always()
+        uses: actions/upload-artifact@v3
+        with:
+          name: event
+          path: |
+            ${{ github.event_path }}

.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@v2
-        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,165 +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/**"
-      - "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*"
-
-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: zephyr-runner-linux-x64-4xlarge
-    container:
-      image: ghcr.io/zephyrproject-rtos/ci:v0.26.4
-      options: '--entrypoint /bin/bash'
-      volumes:
-        - /repo-cache/zephyrproject:/github/cache/zephyrproject
-    env:
-      ZEPHYR_TOOLCHAIN_VARIANT: zephyr
-      ZEPHYR_SDK_INSTALL_DIR: /opt/toolchains/zephyr-sdk-0.16.1
-      BSIM_OUT_PATH: /opt/bsim/
-      BSIM_COMPONENTS_PATH: /opt/bsim/components
-      EDTT_PATH: ../tools/edtt
-      bsim_bluetooth_test_results_file: ./bsim_bluetooth/bsim_results.xml
-      bsim_networking_test_results_file: ./bsim_net/bsim_results.xml
-    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: Clone cached Zephyr repository
-        continue-on-error: true
-        run: |
-          git clone --shared /github/cache/zephyrproject/zephyr .
-          git remote set-url origin ${GITHUB_SERVER_URL}/${GITHUB_REPOSITORY}
-
-      - name: Checkout
-        uses: actions/checkout@v3
-        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 /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'
-
-      - name: Check common triggering files
-        uses: tj-actions/changed-files@v35
-        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@v35
-        id: check-bluetooth-files
-        with:
-          files: |
-            tests/bsim/bluetooth/**
-            samples/bluetooth/**
-            subsys/bluetooth/**
-
-      - name: Check if Networking files changed
-        uses: tj-actions/changed-files@v35
-        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: Update BabbleSim to manifest revision
-        if: >
-          steps.check-bluetooth-files.outputs.any_changed == 'true'
-          || steps.check-networking-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 config --global advice.detachedHead false
-          git 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: |
-          export ZEPHYR_BASE=${PWD}
-          WORK_DIR=${ZEPHYR_BASE}/bsim_bluetooth nice tests/bsim/bluetooth/compile.sh
-          RESULTS_FILE=${ZEPHYR_BASE}/${bsim_bluetooth_test_results_file} \
-          SEARCH_PATH=tests/bsim/bluetooth/ tests/bsim/run_parallel.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: |
-          export ZEPHYR_BASE=${PWD}
-          WORK_DIR=${ZEPHYR_BASE}/bsim_net nice tests/bsim/net/compile.sh
-          RESULTS_FILE=${ZEPHYR_BASE}/${bsim_networking_test_results_file} \
-          SEARCH_PATH=tests/bsim/net/ tests/bsim/run_parallel.sh
-
-      - name: Upload Test Results
-        if: always()
-        uses: actions/upload-artifact@v3
-        with:
-          name: bsim-test-results
-          path: |
-            ./bsim_bluetooth/bsim_results.xml
-            ./bsim_net/bsim_results.xml
-            ${{ github.event_path }}
-          if-no-files-found: warn
-
-      - name: Upload Event Details
-        if: always()
-        uses: actions/upload-artifact@v3
-        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@v3
-
-    - 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@v2
-      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

@@ -8,10 +8,9 @@ concurrency:
 
 jobs:
   clang-build:
-    if: github.repository_owner == 'zephyrproject-rtos'
     runs-on: zephyr-runner-linux-x64-4xlarge
     container:
-      image: ghcr.io/zephyrproject-rtos/ci:v0.26.4
+      image: zephyrprojectrtos/ci:v0.21.0
       options: '--entrypoint /bin/bash'
       volumes:
         - /repo-cache/zephyrproject:/github/cache/zephyrproject
@@ -20,21 +19,13 @@ jobs:
       matrix:
         platform: ["native_posix"]
     env:
-      ZEPHYR_SDK_INSTALL_DIR: /opt/toolchains/zephyr-sdk-0.16.1
-      LLVM_TOOLCHAIN_PATH: /usr/lib/llvm-16
+      ZEPHYR_SDK_INSTALL_DIR: /opt/toolchains/zephyr-sdk-0.13.2
+      CLANG_ROOT_DIR: /usr/lib/llvm-12
       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: Clone cached Zephyr repository
         continue-on-error: true
         run: |
@@ -50,6 +41,7 @@ jobs:
 
       - name: Environment Setup
         run: |
+          pip3 install GitPython
           echo "$HOME/.local/bin" >> $GITHUB_PATH
           git config --global user.email "bot@zephyrproject.org"
           git config --global user.name "Zephyr Bot"
@@ -68,7 +60,7 @@ jobs:
       - name: Check Environment
         run: |
           cmake --version
-          ${LLVM_TOOLCHAIN_PATH}/bin/clang --version
+          ${CLANG_ROOT_DIR}/bin/clang --version
           gcc --version
           ls -la
 
@@ -80,22 +72,20 @@ jobs:
           string(REPLACE "/" "_" repo ${{github.repository}})
           string(REPLACE "-" "_" repo2 ${repo})
           file(APPEND $ENV{GITHUB_OUTPUT} "repo=${repo2}\n")
-
       - name: use cache
         id: cache-ccache
-        uses: zephyrproject-rtos/action-s3-cache@v1.2.0
+        uses: nashif/action-s3-cache@master
         with:
           key: ${{ steps.ccache_cache_timestamp.outputs.repo }}-${{ github.ref_name }}-clang-${{ matrix.platform }}-ccache
-          path: /github/home/.cache/ccache
+          path: /github/home/.ccache
           aws-s3-bucket: ccache.zephyrproject.org
-          aws-access-key-id: ${{ vars.AWS_CCACHE_ACCESS_KEY_ID }}
-          aws-secret-access-key: ${{ secrets.AWS_CCACHE_SECRET_ACCESS_KEY }}
+          aws-access-key-id: ${{ secrets.CCACHE_S3_ACCESS_KEY_ID }}
+          aws-secret-access-key: ${{ secrets.CCACHE_S3_SECRET_ACCESS_KEY }}
           aws-region: us-east-2
 
       - name: ccache stats initial
         run: |
-          mkdir -p /github/home/.cache
-          test -d github/home/.cache/ccache && rm -rf /github/home/.cache/ccache && mv github/home/.cache/ccache /github/home/.cache/ccache
+          test -d github/home/.ccache && rm -rf /github/home/.ccache && mv github/home/.ccache /github/home/.ccache
           ccache -M 10G -s
 
       - name: Run Tests with Twister
@@ -108,10 +98,10 @@ jobs:
           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
+          if [ -s testplan.csv ]; 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
+            ./scripts/twister --inline-logs -M -N -v --load-tests testplan.csv --retry-failed 2
           else
             # if nothing is run, skip reporting step
             echo "report_needed=0" >> $GITHUB_OUTPUT
@@ -120,7 +110,6 @@ jobs:
       - name: ccache stats post
         run: |
           ccache -s
-          ccache -p
 
       - name: Upload Unit Test Results
         if: always() && steps.twister.outputs.report_needed != 0
@@ -132,11 +121,11 @@ jobs:
   clang-build-results:
     name: "Publish Unit Tests Results"
     needs: clang-build
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-20.04
     if: (success() || failure() ) && needs.clang-build.outputs.report_needed != 0
     steps:
       - name: Download Artifacts
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v2
         with:
           path: artifacts
       - name: Merge Test Results
@@ -155,9 +144,10 @@ jobs:
             junit-clang.html
 
       - name: Publish Unit Test Results
-        uses: EnricoMi/publish-unit-test-result-action@v2
+        uses: EnricoMi/publish-unit-test-result-action@v1
         if: always()
         with:
           check_name: Unit Test Results
+          github_token: ${{ secrets.GITHUB_TOKEN }}
           files: "**/twister.xml"
           comment_mode: off

.github/workflows/codecov.yaml

@@ -10,10 +10,9 @@ concurrency:
 
 jobs:
   codecov:
-    if: github.repository == 'zephyrproject-rtos/zephyr'
     runs-on: zephyr-runner-linux-x64-4xlarge
     container:
-      image: ghcr.io/zephyrproject-rtos/ci:v0.26.4
+      image: zephyrprojectrtos/ci:v0.21.0
       options: '--entrypoint /bin/bash'
       volumes:
         - /repo-cache/zephyrproject:/github/cache/zephyrproject
@@ -22,16 +21,9 @@ jobs:
       matrix:
         platform: ["native_posix", "qemu_x86", "unit_testing"]
     env:
-      ZEPHYR_SDK_INSTALL_DIR: /opt/toolchains/zephyr-sdk-0.16.1
+      ZEPHYR_SDK_INSTALL_DIR: /opt/toolchains/zephyr-sdk-0.13.2
+      CLANG_ROOT_DIR: /usr/lib/llvm-12
     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: Update PATH for west
         run: |
           echo "$HOME/.local/bin" >> $GITHUB_PATH
@@ -55,6 +47,7 @@ jobs:
       - name: Check Environment
         run: |
           cmake --version
+          ${CLANG_ROOT_DIR}/bin/clang --version
           gcc --version
           ls -la
       - name: Prepare ccache keys
@@ -67,19 +60,18 @@ jobs:
 
       - name: use cache
         id: cache-ccache
-        uses: zephyrproject-rtos/action-s3-cache@v1.2.0
+        uses: nashif/action-s3-cache@master
         with:
           key: ${{ steps.ccache_cache_prop.outputs.repo }}-${{github.event_name}}-${{matrix.platform}}-codecov-ccache
-          path: /github/home/.cache/ccache
+          path: /github/home/.ccache
           aws-s3-bucket: ccache.zephyrproject.org
-          aws-access-key-id: ${{ vars.AWS_CCACHE_ACCESS_KEY_ID }}
-          aws-secret-access-key: ${{ secrets.AWS_CCACHE_SECRET_ACCESS_KEY }}
+          aws-access-key-id: ${{ secrets.CCACHE_S3_ACCESS_KEY_ID }}
+          aws-secret-access-key: ${{ secrets.CCACHE_S3_SECRET_ACCESS_KEY }}
           aws-region: us-east-2
 
       - name: ccache stats initial
         run: |
-          mkdir -p /github/home/.cache
-          test -d github/home/.cache/ccache && mv github/home/.cache/ccache /github/home/.cache/ccache
+          test -d github/home/.ccache && mv github/home/.ccache /github/home/.ccache
           ccache -M 10G -s
 
       - name: Run Tests with Twister (Push)
@@ -88,7 +80,7 @@ jobs:
           export ZEPHYR_BASE=${PWD}
           export ZEPHYR_TOOLCHAIN_VARIANT=zephyr
           mkdir -p coverage/reports
-          ./scripts/twister --force-color -N -v --filter runnable -p ${{ matrix.platform }} --coverage -T tests
+          ./scripts/twister -N -v --filter runnable -p ${{ matrix.platform }} --coverage -T tests
 
       - name: Generate Coverage Report
         run: |
@@ -101,7 +93,6 @@ jobs:
       - name: ccache stats post
         run: |
           ccache -s
-          ccache -p
 
       - name: Upload Coverage Results
         if: always()
@@ -113,8 +104,8 @@ jobs:
   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
+    runs-on: ubuntu-latest
+      # the codecov job might be skipped, we don't need to run this job then
     if: success() || failure()
 
     steps:
@@ -123,7 +114,7 @@ jobs:
         with:
           fetch-depth: 0
       - name: Download Artifacts
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v2
         with:
           path: coverage/reports
 
@@ -167,7 +158,7 @@ jobs:
 
       - name: Upload coverage to Codecov
         if: always()
-        uses: codecov/codecov-action@v3
+        uses: codecov/codecov-action@v2
         with:
           directory: ./coverage/reports
           env_vars: OS,PYTHON

.github/workflows/coding_guidelines.yml

@@ -4,7 +4,7 @@ on: pull_request
 
 jobs:
   compliance_job:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-20.04
     name: Run coding guidelines checks on patch series (PR)
     steps:
     - name: Checkout the code
@@ -28,7 +28,9 @@ jobs:
     - name: Install Packages
       run: |
         sudo apt-get update
-        sudo apt-get install coccinelle
+        sudo apt-get install ocaml-base-nox
+        wget https://launchpad.net/~npalix/+archive/ubuntu/coccinelle/+files/coccinelle_1.0.8~20.04npalix1_amd64.deb
+        sudo dpkg -i coccinelle_1.0.8~20.04npalix1_amd64.deb
 
     - name: Run Coding Guildeines Checks
       continue-on-error: true

.github/workflows/compliance.yml

@@ -3,8 +3,24 @@ name: Compliance Checks
 on: pull_request
 
 jobs:
+  maintainer_check:
+    runs-on: ubuntu-20.04
+    name: Check MAINTAINERS file
+    steps:
+    - name: Checkout the code
+      uses: actions/checkout@v3
+      with:
+        ref: ${{ github.event.pull_request.head.sha }}
+        fetch-depth: 0
+    - name: Run Maintainers Script
+      id: maintainer
+      env:
+        BASE_REF: ${{ github.base_ref }}
+      run: |
+        python3 ./scripts/get_maintainer.py path CMakeLists.txt
+
   check_compliance:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-20.04
     name: Run compliance checks on patch series (PR)
     steps:
     - name: Update PATH for west
@@ -27,7 +43,7 @@ jobs:
       run: |
         pip3 install setuptools
         pip3 install wheel
-        pip3 install python-magic lxml junitparser gitlint pylint pykwalify yamllint
+        pip3 install python-magic junitparser==1.6.3 gitlint pylint pykwalify
         pip3 install west
 
     - name: west setup
@@ -37,9 +53,6 @@ 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
@@ -56,12 +69,11 @@ jobs:
         # debug
         ls -la
         git log  --pretty=oneline | head -n 10
-        ./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@v3
-      continue-on-error: true
+      continue-on-error: True
       with:
         name: compliance.xml
         path: compliance.xml
@@ -72,15 +84,13 @@ jobs:
           exit 1;
         fi
 
-        files=($(./scripts/ci/check_compliance.py -l))
-        for file in "${files[@]}"; do
-          f="${file}.txt"
-          if [[ -s $f ]]; then
-            errors=$(cat $f)
+        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=${f}::$errors"
+            echo "::error file=${file}::$errors"
             exit=1
           fi
         done

.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@v2
+        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-20.04
     if: github.repository == 'zephyrproject-rtos/zephyr'
 
     steps:
     - name: Configure AWS Credentials
-      uses: aws-actions/configure-aws-credentials@v2
+      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

.github/workflows/devicetree_checks.yml

@@ -26,13 +26,13 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        python-version: [3.8, 3.9, '3.10']
-        os: [ubuntu-22.04, macos-11, windows-2022]
+        python-version: [3.6, 3.7, 3.8]
+        os: [ubuntu-20.04, macos-11, windows-2022]
         exclude:
-        - os: macos-11
-          python-version: 3.6
-        - os: windows-2022
-          python-version: 3.6
+          - os: macos-11
+            python-version: 3.6
+          - os: windows-2022
+            python-version: 3.6
     steps:
     - name: checkout
       uses: actions/checkout@v3

.github/workflows/do_not_merge.yml

@@ -1,18 +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') }}
-    name: Prevent Merging
-    runs-on: ubuntu-22.04
-    steps:
-      - name: Check for label
-        run: |
-          echo "Pull request is labeled as 'DNM' or 'TSC'"
-          echo "This workflow fails so that the pull request cannot be merged"
-          exit 1

.github/workflows/doc-build.yml

@@ -22,21 +22,22 @@ on:
     - 'west.yml'
     - '.github/workflows/doc-build.yml'
     - 'scripts/dts/**'
-    - 'doc/requirements.txt'
+    - 'scripts/requirements-doc.txt'
 
 env:
   # NOTE: west docstrings will be extracted from the version listed here
-  WEST_VERSION: 1.0.0
+  WEST_VERSION: 0.12.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.9.6
+  DOXYGEN_VERSION: 1.9.2
 
 jobs:
   doc-build-html:
     name: "Documentation Build (HTML)"
-    runs-on: zephyr-runner-linux-x64-4xlarge
-    timeout-minutes: 45
+    runs-on: ubuntu-20.04
+    timeout-minutes: 30
+
     concurrency:
       group: doc-build-html-${{ github.ref }}
       cancel-in-progress: true
@@ -48,8 +49,8 @@ jobs:
     - name: install-pkgs
       run: |
         sudo apt-get update
-        sudo apt-get install -y ninja-build graphviz
-        wget --no-verbose "https://github.com/doxygen/doxygen/releases/download/Release_${DOXYGEN_VERSION//./_}/doxygen-${DOXYGEN_VERSION}.linux.bin.tar.gz"
+        sudo apt-get install -y ninja-build graphviz libclang1-9 libclang-cpp9
+        wget --no-verbose https://downloads.sourceforge.net/project/doxygen/rel-${DOXYGEN_VERSION}/doxygen-${DOXYGEN_VERSION}.linux.bin.tar.gz
         tar xf doxygen-${DOXYGEN_VERSION}.linux.bin.tar.gz
         echo "${PWD}/doxygen-${DOXYGEN_VERSION}/bin" >> $GITHUB_PATH
 
@@ -57,12 +58,12 @@ jobs:
       uses: actions/cache@v3
       with:
         path: ~/.cache/pip
-        key: pip-${{ hashFiles('doc/requirements.txt') }}
+        key: pip-${{ hashFiles('scripts/requirements-doc.txt') }}
 
     - name: install-pip
       run: |
         sudo pip3 install -U setuptools wheel pip
-        pip3 install -r doc/requirements.txt
+        pip3 install -r scripts/requirements-doc.txt
         pip3 install west==${WEST_VERSION}
         pip3 install cmake==${CMAKE_VERSION}
 
@@ -71,7 +72,6 @@ jobs:
         west init -l .
 
     - name: build-docs
-      shell: bash
       run: |
         if [[ "$GITHUB_REF" =~ "refs/tags/v" ]]; then
           DOC_TAG="release"
@@ -85,7 +85,7 @@ jobs:
           DOC_TARGET="html"
         fi
 
-        DOC_TAG=${DOC_TAG} SPHINXOPTS_EXTRA="-q -t publish" make -C doc ${DOC_TARGET}
+        DOC_TAG=${DOC_TAG} SPHINXOPTS="-q -W -t publish" make -C doc ${DOC_TARGET}
 
     - name: compress-docs
       run: |
@@ -105,7 +105,7 @@ jobs:
         DOC_URL="https://builds.zephyrproject.io/${REPO_NAME}/pr/${PR_NUM}/docs/"
 
         echo "${PR_NUM}" > pr_num
-        echo "Documentation will be available shortly at: ${DOC_URL}" >> $GITHUB_STEP_SUMMARY
+        echo "::notice:: Documentation will be available shortly at: ${DOC_URL}"
 
     - name: upload-pr-number
       uses: actions/upload-artifact@v3
@@ -116,10 +116,9 @@ jobs:
 
   doc-build-pdf:
     name: "Documentation Build (PDF)"
-    if: github.event_name != 'pull_request'
-    runs-on: zephyr-runner-linux-x64-4xlarge
+    runs-on: ubuntu-20.04
     container: texlive/texlive:latest
-    timeout-minutes: 60
+    timeout-minutes: 30
     concurrency:
       group: doc-build-pdf-${{ github.ref }}
       cancel-in-progress: true
@@ -131,24 +130,18 @@ jobs:
     - name: install-pkgs
       run: |
         apt-get update
-        apt-get install -y python3-pip python3-venv ninja-build doxygen graphviz librsvg2-bin
+        apt-get install -y python3-pip ninja-build doxygen graphviz librsvg2-bin
 
     - name: cache-pip
       uses: actions/cache@v3
       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
+        key: pip-${{ hashFiles('scripts/requirements-doc.txt') }}
 
     - name: install-pip
       run: |
         pip3 install -U setuptools wheel pip
-        pip3 install -r doc/requirements.txt
+        pip3 install -r scripts/requirements-doc.txt
         pip3 install west==${WEST_VERSION}
         pip3 install cmake==${CMAKE_VERSION}
 
@@ -157,8 +150,6 @@ jobs:
         west init -l .
 
     - name: build-docs
-      shell: bash
-      continue-on-error: true
       run: |
         if [[ "$GITHUB_REF" =~ "refs/tags/v" ]]; then
           DOC_TAG="release"
@@ -169,11 +160,7 @@ jobs:
         DOC_TAG=${DOC_TAG} SPHINXOPTS="-q -j auto" LATEXMKOPTS="-quiet -halt-on-error" make -C doc pdf
 
     - name: upload-build
-      if: always()
       uses: actions/upload-artifact@v3
       with:
         name: pdf-output
-        if-no-files-found: ignore
-        path: |
-          doc/_build/latex/zephyr.pdf
-          doc/_build/latex/zephyr.log
+        path: doc/_build/latex/zephyr.pdf

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

@@ -13,7 +13,7 @@ on:
 jobs:
   doc-publish:
     name: Publish Documentation
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-20.04
     if: |
       github.event.workflow_run.event == 'pull_request' &&
       github.event.workflow_run.conclusion == 'success' &&
@@ -32,7 +32,7 @@ jobs:
 
     - name: Check PR number
       id: check-pr
-      uses: carpentries/actions/check-valid-pr@v0.14.0
+      uses: carpentries/actions/check-valid-pr@v0.8
       with:
         pr: ${{ env.PR_NUM }}
         sha: ${{ github.event.workflow_run.head_sha }}
@@ -48,9 +48,9 @@ jobs:
         tar xf html-output/html-output.tar.xz -C html-output
 
     - name: Configure AWS Credentials
-      uses: aws-actions/configure-aws-credentials@v2
+      uses: aws-actions/configure-aws-credentials@v1
       with:
-        aws-access-key-id: ${{ vars.AWS_BUILDS_ZEPHYR_PR_ACCESS_KEY_ID }}
+        aws-access-key-id: ${{ secrets.AWS_BUILDS_ZEPHYR_PR_ACCESS_KEY_ID }}
         aws-secret-access-key: ${{ secrets.AWS_BUILDS_ZEPHYR_PR_SECRET_ACCESS_KEY }}
         aws-region: us-east-1
 

.github/workflows/doc-publish.yml

@@ -16,9 +16,8 @@ on:
 jobs:
   doc-publish:
     name: Publish Documentation
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-20.04
     if: |
-      github.event.workflow_run.event != 'pull_request' &&
       github.event.workflow_run.conclusion == 'success' &&
       github.repository == 'zephyrproject-rtos/zephyr'
 
@@ -34,10 +33,10 @@ jobs:
         tar xf html-output/html-output.tar.xz -C html-output
 
     - name: Configure AWS Credentials
-      uses: aws-actions/configure-aws-credentials@v2
+      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: Upload to AWS S3

.github/workflows/errno.yml

@@ -2,27 +2,15 @@ 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
+    runs-on: ubuntu-20.04
     container:
-      image: ghcr.io/zephyrproject-rtos/ci:v0.26.4
-    env:
-      ZEPHYR_SDK_INSTALL_DIR: /opt/toolchains/zephyr-sdk-0.16.1
+      image: zephyrprojectrtos/ci:v0.21.0
 
     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@v3
 

.github/workflows/footprint-tracking.yml

@@ -8,9 +8,6 @@ on:
     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
@@ -22,33 +19,23 @@ concurrency:
 
 jobs:
   footprint-tracking:
-    runs-on: ubuntu-22.04
-    if: github.repository_owner == 'zephyrproject-rtos'
+    runs-on: ubuntu-20.04
+    if: github.repository == 'zephyrproject-rtos/zephyr'
     container:
-      image: ghcr.io/zephyrproject-rtos/ci:v0.26.4
+      image: zephyrprojectrtos/ci:v0.21.0
       options: '--entrypoint /bin/bash'
     strategy:
       fail-fast: false
     env:
-      ZEPHYR_SDK_INSTALL_DIR: /opt/toolchains/zephyr-sdk-0.16.1
+      ZEPHYR_SDK_INSTALL_DIR: /opt/toolchains/zephyr-sdk-0.13.2
+      CLANG_ROOT_DIR: /usr/lib/llvm-12
       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: Update PATH for west
         run: |
           echo "$HOME/.local/bin" >> $GITHUB_PATH
-
-      - name: Install packages
+      - name: Install pip packages
         run: |
-          sudo apt-get update
-          sudo apt-get install -y python3-venv
           sudo pip3 install -U setuptools wheel pip gitpython
 
       - name: checkout
@@ -64,10 +51,10 @@ jobs:
           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@v2
+        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.FOOTPRINT_AWS_KEY_ID }}
+          aws-secret-access-key: ${{ secrets.FOOTPRINT_AWS_ACCESS_KEY }}
           aws-region: us-east-1
 
       - name: Record Footprint
@@ -76,10 +63,4 @@ jobs:
         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/footprint.yml

@@ -8,25 +8,18 @@ concurrency:
 
 jobs:
   footprint-delta:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-20.04
     if: github.repository == 'zephyrproject-rtos/zephyr'
     container:
-      image: ghcr.io/zephyrproject-rtos/ci:v0.26.4
+      image: zephyrprojectrtos/ci:v0.21.0
       options: '--entrypoint /bin/bash'
     strategy:
       fail-fast: false
     env:
-      ZEPHYR_SDK_INSTALL_DIR: /opt/toolchains/zephyr-sdk-0.16.1
+      ZEPHYR_SDK_INSTALL_DIR: /opt/toolchains/zephyr-sdk-0.13.2
+      CLANG_ROOT_DIR: /usr/lib/llvm-12
       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: Update PATH for west
         run: |
           echo "$HOME/.local/bin" >> $GITHUB_PATH
@@ -53,7 +46,6 @@ jobs:
           git remote -v
           git rebase origin/${BASE_REF}
           git checkout -b this_pr
-          west update
           west build -b frdm_k64f  tests/benchmarks/footprints -t ram_report
           cp build/ram.json ram2.json
           west build -b frdm_k64f  tests/benchmarks/footprints -t rom_report

.github/workflows/greet_first_time_contributor.yml

@@ -1,52 +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@v3
-      - uses: zephyrproject-rtos/action-first-interaction@v1.1.1-zephyr-4
-        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!
-
-
-            A project maintainer just triggered our CI pipeline to run it against your PR and
-            ensure it's compliant and doesn't cause any issues. You might want to take this
-            opportunity to review the project's [Contributor
-            Expectations](https://docs.zephyrproject.org/latest/contribute/contributor_expectations.html)
-            and make any updates to your pull request if necessary. 😊
-
-          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/issue_count.yml

@@ -2,7 +2,7 @@ name: Issue Tracker
 
 on:
   schedule:
-  - cron: '*/10 * * * *'
+    - cron:  '*/10 * * * *'
 
 env:
   OUTPUT_FILE_NAME: IssuesReport.md
@@ -14,7 +14,7 @@ env:
 jobs:
   track-issues:
     name: "Collect Issue Stats"
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-20.04
     if: github.repository == 'zephyrproject-rtos/zephyr'
 
     steps:
@@ -36,16 +36,16 @@ jobs:
 
     - name: upload-stats
       uses: actions/upload-artifact@v3
-      continue-on-error: true
+      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@v2
+      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

.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,14 +4,14 @@ on: [pull_request]
 
 jobs:
   scancode_job:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-20.04
     name: Scan code for licenses
     steps:
     - name: Checkout the code
-      uses: actions/checkout@v3
+      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

.github/workflows/manifest.yml

@@ -1,6 +1,8 @@
 name: Manifest
 on:
   pull_request_target:
+    paths:
+      - 'west.yml'
 
 jobs:
   contribs:
@@ -15,24 +17,13 @@ jobs:
           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@f223dce288b0d8f30bfd57eb2b14b18c230a7d8b
+        uses: zephyrproject-rtos/action-manifest@2f1ad2908599d4fe747f886f9d733dd7eebae4ef
         with:
-          github-token: ${{ secrets.ZB_GITHUB_TOKEN }}
+          github-token: ${{ secrets.GITHUB_TOKEN }}
           manifest-path: 'west.yml'
           checkout-path: 'zephyrproject/zephyr'
-          use-tree-checkout: 'true'
           label-prefix: 'manifest-'
           verbosity-level: '1'
-          labels: 'manifest'
+          labels: 'manifest, west'
           dnm-labels: 'DNM'

.github/workflows/release.yml

@@ -4,11 +4,10 @@ on:
   push:
     tags:
       - 'v*'
-      - '!v*rc*'
 
 jobs:
   release:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-20.04
     steps:
       - uses: actions/checkout@v3
         with:
@@ -18,7 +17,6 @@ jobs:
         id: get_version
         run: |
           echo "VERSION=${GITHUB_REF#refs/tags/}" >> $GITHUB_OUTPUT
-          echo "TRIMMED_VERSION=${GITHUB_REF#refs/tags/v}" >> $GITHUB_OUTPUT
 
       - name: REUSE Compliance Check
         uses: fsfe/reuse-action@v1
@@ -27,14 +25,18 @@ jobs:
 
       - name: upload-results
         uses: actions/upload-artifact@v3
-        continue-on-error: true
+        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 +45,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/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.8, 3.9, '3.10']
-        os: [ubuntu-20.04]
-    steps:
-      - name: checkout
-        uses: actions/checkout@v3
-        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@v4
-        with:
-          python-version: ${{ matrix.python-version }}
-
-      - name: cache-pip-linux
-        if: startsWith(runner.os, 'Linux')
-        uses: actions/cache@v3
-        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,19 +6,14 @@ on:
 jobs:
   stale:
     name: Find Stale issues and PRs
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-20.04
     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'

.github/workflows/twister.yaml

@@ -10,8 +10,8 @@ on:
       - main
       - v*-branch
   schedule:
-    # Run at 03:00 UTC on every Sunday
-    - cron: '0 3 * * 0'
+    # Run at 00:00 on Wednesday and Saturday
+    - cron: '0 0 * * 3,6'
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.event_name }}-${{ github.head_ref || github.ref }}
@@ -19,10 +19,9 @@ concurrency:
 
 jobs:
   twister-build-prep:
-    if: github.repository_owner == 'zephyrproject-rtos'
     runs-on: zephyr-runner-linux-x64-4xlarge
     container:
-      image: ghcr.io/zephyrproject-rtos/ci:v0.26.4
+      image: zephyrprojectrtos/ci:v0.21.0
       options: '--entrypoint /bin/bash'
       volumes:
         - /repo-cache/zephyrproject:/github/cache/zephyrproject
@@ -34,21 +33,12 @@ jobs:
       MATRIX_SIZE: 10
       PUSH_MATRIX_SIZE: 15
       DAILY_MATRIX_SIZE: 80
-      ZEPHYR_SDK_INSTALL_DIR: /opt/toolchains/zephyr-sdk-0.16.1
-      BSIM_OUT_PATH: /opt/bsim/
-      BSIM_COMPONENTS_PATH: /opt/bsim/components
+      ZEPHYR_SDK_INSTALL_DIR: /opt/toolchains/zephyr-sdk-0.13.2
+      CLANG_ROOT_DIR: /usr/lib/llvm-12
       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: Clone cached Zephyr repository
         if: github.event_name == 'pull_request_target'
         continue-on-error: true
@@ -67,16 +57,14 @@ jobs:
       - name: Environment Setup
         if: github.event_name == 'pull_request_target'
         run: |
+          pip3 install GitPython
           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 /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'
+          # no need for west update here
 
       - name: Generate Test Plan with Twister
         if: github.event_name == 'pull_request_target'
@@ -90,7 +78,7 @@ jobs:
           else
             echo "TWISTER_NODES=${MATRIX_SIZE}" >> $GITHUB_ENV
           fi
-          rm -f testplan.json .testplan
+          rm -f testplan.csv .testplan
 
       - name: Determine matrix size
         id: output-services
@@ -120,7 +108,7 @@ jobs:
     needs: twister-build-prep
     if: needs.twister-build-prep.outputs.size != 0
     container:
-      image: ghcr.io/zephyrproject-rtos/ci:v0.26.4
+      image: zephyrprojectrtos/ci:v0.21.0
       options: '--entrypoint /bin/bash'
       volumes:
         - /repo-cache/zephyrproject:/github/cache/zephyrproject
@@ -129,24 +117,15 @@ jobs:
       matrix:
         subset: ${{fromJSON(needs.twister-build-prep.outputs.subset)}}
     env:
-      ZEPHYR_SDK_INSTALL_DIR: /opt/toolchains/zephyr-sdk-0.16.1
-      BSIM_OUT_PATH: /opt/bsim/
-      BSIM_COMPONENTS_PATH: /opt/bsim/components
-      TWISTER_COMMON: ' --force-color --inline-logs -v -N -M --retry-failed 3 '
-      DAILY_OPTIONS: ' -M --build-only --all --show-footprint'
-      PR_OPTIONS: ' --clobber-output --integration'
-      PUSH_OPTIONS: ' --clobber-output -M --show-footprint'
+      ZEPHYR_SDK_INSTALL_DIR: /opt/toolchains/zephyr-sdk-0.13.2
+      CLANG_ROOT_DIR: /usr/lib/llvm-12
+      TWISTER_COMMON: ' --inline-logs -v -N -M --retry-failed 3 '
+      DAILY_OPTIONS: ' -M --build-only --all '
+      PR_OPTIONS: ' --clobber-output --integration '
+      PUSH_OPTIONS: ' --clobber-output -M '
       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: Clone cached Zephyr repository
         continue-on-error: true
         run: |
@@ -162,6 +141,7 @@ jobs:
 
       - name: Environment Setup
         run: |
+          pip3 install GitPython
           if [ "${{github.event_name}}" = "pull_request_target" ]; then
             git config --global user.email "bot@zephyrproject.org"
             git config --global user.name "Zephyr Builder"
@@ -179,6 +159,7 @@ jobs:
       - name: Check Environment
         run: |
           cmake --version
+          ${CLANG_ROOT_DIR}/bin/clang --version
           gcc --version
           ls -la
           echo "github.ref: ${{ github.ref }}"
@@ -196,20 +177,18 @@ jobs:
 
       - name: use cache
         id: cache-ccache
-        uses: zephyrproject-rtos/action-s3-cache@v1.2.0
-        continue-on-error: true
+        uses: nashif/action-s3-cache@master
         with:
           key: ${{ steps.ccache_cache_timestamp.outputs.repo }}-${{ github.ref_name }}-${{github.event_name}}-${{ matrix.subset }}-ccache
-          path: /github/home/.cache/ccache
+          path: /github/home/.ccache
           aws-s3-bucket: ccache.zephyrproject.org
-          aws-access-key-id: ${{ vars.AWS_CCACHE_ACCESS_KEY_ID }}
-          aws-secret-access-key: ${{ secrets.AWS_CCACHE_SECRET_ACCESS_KEY }}
+          aws-access-key-id: ${{ secrets.CCACHE_S3_ACCESS_KEY_ID }}
+          aws-secret-access-key: ${{ secrets.CCACHE_S3_SECRET_ACCESS_KEY }}
           aws-region: us-east-2
 
       - name: ccache stats initial
         run: |
-          mkdir -p /github/home/.cache
-          test -d github/home/.cache/ccache && rm -rf /github/home/.cache/ccache && mv github/home/.cache/ccache /github/home/.cache/ccache
+          test -d github/home/.ccache && rm -rf /github/home/.ccache && mv github/home/.ccache /github/home/.ccache
           ccache -M 10G -s
 
       - if: github.event_name == 'push'
@@ -228,11 +207,11 @@ jobs:
       - if: github.event_name == 'pull_request_target'
         name: Run Tests with Twister (Pull Request)
         run: |
-          rm -f testplan.json
+          rm -f testplan.csv
           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}
+          ./scripts/twister --subset ${{matrix.subset}}/${{ strategy.job-total }} --load-tests testplan.csv ${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
@@ -255,7 +234,6 @@ jobs:
 
       - name: ccache stats post
         run: |
-          ccache -p
           ccache -s
 
       - name: Upload Unit Test Results
@@ -266,48 +244,21 @@ jobs:
           if-no-files-found: ignore
           path: |
             twister-out/twister.xml
-            twister-out/twister.json
-            module_tests/twister.xml
-            testplan.json
+            testplan.csv
 
   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
+    runs-on: ubuntu-20.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@v3
-        with:
-          fetch-depth: 0
-          persist-credentials: false
-
       - name: Download Artifacts
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v2
         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
@@ -324,8 +275,9 @@ jobs:
             junit.html
 
       - name: Publish Unit Test Results
-        uses: EnricoMi/publish-unit-test-result-action@v2
+        uses: EnricoMi/publish-unit-test-result-action@v1
         with:
           check_name: Unit Test Results
+          github_token: ${{ secrets.GITHUB_TOKEN }}
           files: "**/twister.xml"
           comment_mode: off

.github/workflows/twister_tests.yml

@@ -29,8 +29,8 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        python-version: [3.8, 3.9, '3.10']
-        os: [ubuntu-22.04]
+        python-version: [3.6, 3.7, 3.8]
+        os: [ubuntu-20.04]
     steps:
     - name: checkout
       uses: actions/checkout@v3
@@ -48,19 +48,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
-    - 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/west_cmds.yml

@@ -27,13 +27,13 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        python-version: [3.8, 3.9, '3.10']
-        os: [ubuntu-22.04, macos-11, windows-2022]
+        python-version: [3.6, 3.7, 3.8]
+        os: [ubuntu-20.04, macos-11, windows-2022]
         exclude:
-        - os: macos-11
-          python-version: 3.6
-        - os: windows-2022
-          python-version: 3.6
+          - os: macos-11
+            python-version: 3.6
+          - os: windows-2022
+            python-version: 3.6
     steps:
     - name: checkout
       uses: actions/checkout@v3
@@ -69,7 +69,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,13 +7,9 @@
 *.swp
 *.swo
 *~
-.\#*
-\#*\#
 build*/
-!doc/build/
-!scripts/build
+!doc/guides/build
 !tests/drivers/build_all
-!scripts/pylib/build_helpers
 cscope.*
 .dir
 
@@ -37,9 +33,7 @@ doc/latex
 doc/themes/zephyr-docs-theme
 sanity-out*
 twister-out*
-bsim_out
 bsim_bt_out
-tests/RunResults.xml
 scripts/grub
 doc/reference/kconfig/*.rst
 doc/doc.warnings
@@ -51,7 +45,6 @@ hide-defaults-note
 venv
 .venv
 .DS_Store
-.clangd
 
 # CI output
 compliance.xml
@@ -65,19 +58,3 @@ TAGS
 tags
 
 .idea
-
-# from check_compliance.py
-BinaryFiles.txt
-Checkpatch.txt
-DevicetreeBindings.txt
-Gitlint.txt
-Identity.txt
-ImageSize.txt
-Kconfig.txt
-KconfigBasic.txt
-KconfigBasicNoModules.txt
-MaintainersFormat.txt
-ModulesMaintainers.txt
-Nits.txt
-Pylint.txt
-YAMLLint.txt

.gitlint

@@ -1,5 +1,4 @@
 # 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
@@ -17,13 +16,13 @@ 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:)(([^:]+):)(\s([^:]+):)*\s(.+)$
@@ -43,7 +42,7 @@ words=wip
 
 [max-line-length-with-exceptions]
 # B1 = body-max-line-length
-# line-length=75
+line-length=75
 
 [body-min-length]
 min-length=3

.mailmap

@@ -1,121 +1,35 @@
-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>
-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>
+Marc Herbert <marc.herbert@intel.com> <46978960+marc-hb@users.noreply.github.com>
+Martin Jäger <martin@libre.solar>  <17674105+martinjaeger@users.noreply.github.com>
+Armand Ciejak <armand@riedonetworks.com>  <armandciejak@users.noreply.github.com>

.uncrustify.cfg

@@ -0,0 +1,87 @@
+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{"
+
+#
+# End of file behavior
+#
+
+nl_end_of_file      = force     # string (add/force/ignore/remove)
+nl_end_of_file_min  = 1         # The min number of newlines at end of file
+
+#
+# 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

CMakeLists.txt

@@ -54,7 +54,7 @@ set(CMAKE_EXECUTABLE_SUFFIX .elf)
 # into the `zephyr_final` target.
 #
 # Multiple linking stages are required in the following cases:
-# - device dependencies structs must be generated (CONFIG_DEVICE_DEPS=y)
+# - device handles structs must be generated (CONFIG_HAS_DTS=y)
 # - ISR tables must be generated (CONFIG_GEN_ISR_TABLES=y)
 # - Kernel objects hash tables (CONFIG_USERSPACE=y)
 # - Application memory partitions (CONFIG_USERSPACE=y)
@@ -75,7 +75,7 @@ set(ZEPHYR_LINK_STAGE_EXECUTABLE zephyr_pre${ZEPHYR_CURRENT_LINKER_PASS})
 # existing variable to allow slowly cleanup of linking stage handling.
 # Three stage linking active: pre0 -> pre1 -> final, this will correspond to `pre1`
 # Two stage linking active:   pre0 -> final, this will correspond to `pre0`
-if(CONFIG_USERSPACE OR CONFIG_DEVICE_DEPS)
+if(CONFIG_USERSPACE OR CONFIG_HAS_DTS)
   set(ZEPHYR_PREBUILT_EXECUTABLE zephyr_pre1)
 else()
   set(ZEPHYR_PREBUILT_EXECUTABLE zephyr_pre0)
@@ -92,11 +92,6 @@ set(PARSE_SYSCALLS_TARGET      parse_syscalls_target)
 define_property(GLOBAL PROPERTY PROPERTY_OUTPUT_FORMAT BRIEF_DOCS " " FULL_DOCS " ")
 set_property(   GLOBAL PROPERTY PROPERTY_OUTPUT_FORMAT elf32-little${ARCH}) # BFD format
 
-# Contains the list of files with syscall function prototypes.
-add_library(syscalls_interface INTERFACE)
-set(syscalls_file_list_output
-    ${CMAKE_CURRENT_BINARY_DIR}/misc/generated/syscalls_file_list.txt)
-
 # "zephyr_interface" is a source-less library that encapsulates all the global
 # compiler options needed by all source files. All zephyr libraries,
 # including the library named "zephyr" link with this library to
@@ -123,7 +118,6 @@ include(${ZEPHYR_BASE}/cmake/linker_script/${ARCH}/linker.cmake OPTIONAL)
 foreach(optional_include_dir
   ${SOC_DIR}/${ARCH}/${SOC_PATH}
   ${SOC_DIR}/${ARCH}/${SOC_PATH}/include
-  ${SOC_DIR}/${ARCH}/${SOC_PATH}/include/${SOC_NAME}
   ${SOC_DIR}/${ARCH}/${SOC_FAMILY}/include
   ${SOC_DIR}/${ARCH}/${SOC_FAMILY}/common/include
   )
@@ -132,51 +126,19 @@ foreach(optional_include_dir
   endif()
 endforeach()
 
-# Don't inherit compiler flags from the environment
-foreach(var AFLAGS CFLAGS CXXFLAGS CPPFLAGS LDFLAGS)
-  if(DEFINED ENV{${var}})
-    message(WARNING "The environment variable '${var}' was set to $ENV{${var}}, "
-                    "but Zephyr ignores flags from the environment. Use 'cmake "
-                    "-DEXTRA_${var}=$ENV{${var}}' instead."
-    )
-    unset(ENV{${var}})
-  endif()
-endforeach()
-
 zephyr_compile_definitions(
   KERNEL
   __ZEPHYR__=1
 )
 
-# Ensure that include/zephyr/toolchain.h includes toolchain/other.h for all off-tree toolchains
+# Ensure that include/toolchain.h includes toolchain/other.h for all off-tree toolchains
 if(TOOLCHAIN_USE_CUSTOM)
   zephyr_compile_definitions(__TOOLCHAIN_CUSTOM__)
 endif()
 
-# @Intent: Set compiler specific flag for disabling strict aliasing rule
-zephyr_compile_options($<$<COMPILE_LANGUAGE:C>:$<TARGET_PROPERTY:compiler,no_strict_aliasing>>)
-zephyr_compile_options($<$<COMPILE_LANGUAGE:CXX>:$<TARGET_PROPERTY:compiler-cpp,no_strict_aliasing>>)
-
-# Extra warnings options for twister run
-if (CONFIG_COMPILER_WARNINGS_AS_ERRORS)
-  zephyr_compile_options($<$<COMPILE_LANGUAGE:C>:$<TARGET_PROPERTY:compiler,warnings_as_errors>>)
-  zephyr_compile_options($<$<COMPILE_LANGUAGE:ASM>:$<TARGET_PROPERTY:asm,warnings_as_errors>>)
-  zephyr_link_libraries($<TARGET_PROPERTY:linker,warnings_as_errors>)
-endif()
-
 # @Intent: Set compiler flags to enable buffer overflow checks in libc functions
-# @details:
-#  Kconfig.zephyr "Detect buffer overflows in libc calls" is a kconfig choice,
-#  ensuring at most *one* of CONFIG_FORTIFY_SOURCE_{COMPILE_TIME,RUN_TIME} is
-#  set. Refer to Kconfig.zephyr for selection logic and description of these
-#  choices. Toolchains set both of the security_fortify_{compile_time,run_time}
-#  properties and the Kconfig settings are used here to select between those.
-#
-if(CONFIG_FORTIFY_SOURCE_RUN_TIME)
-  zephyr_compile_definitions($<TARGET_PROPERTY:compiler,security_fortify_run_time> )
-elseif(CONFIG_FORTIFY_SOURCE_COMPILE_TIME)
-  zephyr_compile_definitions($<TARGET_PROPERTY:compiler,security_fortify_compile_time> )
-endif()
+# @config in CONFIG_NO_OPTIMIZATIONS optional : Optimizations may affect security
+zephyr_compile_definitions($<TARGET_PROPERTY:compiler,security_fortify> )
 
 # @Intent: Set compiler flags to detect general stack overflows across all functions
 if(CONFIG_STACK_CANARIES)
@@ -229,7 +191,7 @@ zephyr_compile_options(${OPTIMIZATION_FLAG})
 zephyr_compile_options($<$<COMPILE_LANGUAGE:CXX>:$<TARGET_PROPERTY:compiler-cpp,required>>)
 
 # @Intent: Obtain compiler specific flags for compiling under different ISO standards of C++
-if(CONFIG_CPP)
+if(CONFIG_CPLUSPLUS)
   # From kconfig choice, pick a single dialect.
   # Kconfig choice ensures only one of these CONFIG_STD_CPP* is set.
   if(CONFIG_STD_CPP98)
@@ -261,12 +223,12 @@ if(CONFIG_CPP)
   zephyr_compile_options($<$<COMPILE_LANGUAGE:CXX>:${STD_CPP_DIALECT_FLAGS}>)
 endif()
 
-if(NOT CONFIG_CPP_EXCEPTIONS)
+if(NOT CONFIG_EXCEPTIONS)
   # @Intent: Obtain compiler specific flags related to C++ Exceptions
   zephyr_compile_options($<$<COMPILE_LANGUAGE:CXX>:$<TARGET_PROPERTY:compiler-cpp,no_exceptions>>)
 endif()
 
-if(NOT CONFIG_CPP_RTTI)
+if(NOT CONFIG_RTTI)
   # @Intent: Obtain compiler specific flags related to C++ Run Time Type Information
   zephyr_compile_options($<$<COMPILE_LANGUAGE:CXX>:$<TARGET_PROPERTY:compiler-cpp,no_rtti>>)
 endif()
@@ -287,16 +249,8 @@ endif()
 # @Intent: Set compiler specific macro inclusion of AUTOCONF_H
 zephyr_compile_options("SHELL: $<TARGET_PROPERTY:compiler,imacros> ${AUTOCONF_H}")
 
-if(CONFIG_COMPILER_FREESTANDING)
-  # @Intent: Set compiler specific flag for bare metal freestanding option
-  zephyr_compile_options($<$<COMPILE_LANGUAGE:C>:$<TARGET_PROPERTY:compiler,freestanding>>)
-  zephyr_compile_options($<$<COMPILE_LANGUAGE:ASM>:$<TARGET_PROPERTY:compiler,freestanding>>)
-endif()
-
-if (CONFIG_PICOLIBC AND NOT CONFIG_PICOLIBC_IO_FLOAT)
-  # @Intent: Set compiler specific flag to disable printf-related optimizations
-  zephyr_compile_options($<$<COMPILE_LANGUAGE:C>:$<TARGET_PROPERTY:compiler,no_printf_return_value>>)
-endif()
+# @Intent: Set compiler specific flag for bare metal freestanding option
+zephyr_compile_options($<TARGET_PROPERTY:compiler,freestanding>)
 
 # @Intent: Set compiler specific flag for tentative definitions, no-common
 zephyr_compile_options($<TARGET_PROPERTY:compiler,no_common>)
@@ -304,16 +258,6 @@ zephyr_compile_options($<TARGET_PROPERTY:compiler,no_common>)
 # @Intent: Set compiler specific flag for production of debug information
 zephyr_compile_options($<TARGET_PROPERTY:compiler,debug>)
 
-if(CONFIG_COMPILER_SAVE_TEMPS)
-  # @Intent: Set compiler specific flag for saving temporary object files
-  zephyr_compile_options($<TARGET_PROPERTY:compiler,save_temps>)
-endif()
-
-if(NOT CONFIG_COMPILER_TRACK_MACRO_EXPANSION)
-  # @Intent: Set compiler specific flags to not track macro expansion
-  zephyr_compile_options($<TARGET_PROPERTY:compiler,no_track_macro_expansion>)
-endif()
-
 if(CONFIG_COMPILER_COLOR_DIAGNOSTICS)
 # @Intent: Set compiler specific flag for diagnostic messages
 zephyr_compile_options($<TARGET_PROPERTY:compiler,diagnostic>)
@@ -327,10 +271,13 @@ zephyr_compile_options(
 # ToDo: Remember to get feedback from Oticon on this, as they might use the `ASM_BASE_FLAG` since this is done this way.
 zephyr_compile_options($<$<COMPILE_LANGUAGE:ASM>:$<TARGET_PROPERTY:asm,required>>)
 
-# @Intent: Enforce standard integer type correspondence to match Zephyr usage.
+# @Intent: Enforce standard integer type correspondance to match Zephyr usage.
 # (must be after compiler specific flags)
-if(CONFIG_ENFORCE_ZEPHYR_STDINT)
-  zephyr_compile_options("SHELL: $<TARGET_PROPERTY:compiler,imacros> ${ZEPHYR_BASE}/include/zephyr/toolchain/zephyr_stdint.h")
+if(NOT CONFIG_ARCH_POSIX)
+  # `zephyr_stdint.h` is not included for the POSIX (native) arch because it
+  # compiles with the host toolchain/headers and there can be conflicts if we
+  # arbitrarily redefine our own type system (see #37718).
+  zephyr_compile_options("SHELL: $<TARGET_PROPERTY:compiler,imacros> ${ZEPHYR_BASE}/include/toolchain/zephyr_stdint.h")
 endif()
 
 # Common toolchain-agnostic assembly flags
@@ -346,12 +293,12 @@ toolchain_ld_force_undefined_symbols(
   _ConfigAbsSyms
 )
 
-if(NOT CONFIG_NATIVE_BUILD)
+if(NOT CONFIG_NATIVE_APPLICATION)
   # @Intent: Set linker specific flags for bare metal target
   toolchain_ld_baremetal()
 endif()
 
-if(CONFIG_CPP AND NOT CONFIG_MINIMAL_LIBCPP AND NOT CONFIG_NATIVE_LIBRARY)
+if(CONFIG_LIB_CPLUSPLUS)
   # @Intent: Set linker specific flags for C++
   toolchain_ld_cpp()
 endif()
@@ -391,25 +338,13 @@ zephyr_compile_options($<TARGET_PROPERTY:compiler,warning_extended>)
 zephyr_compile_options($<$<COMPILE_LANGUAGE:C>:$<TARGET_PROPERTY:compiler,warning_error_implicit_int>>)
 zephyr_compile_options($<$<COMPILE_LANGUAGE:CXX>:$<TARGET_PROPERTY:compiler-cpp,warning_error_implicit_int>>)
 
-# @Intent: Do not make position independent code / executable
-zephyr_compile_options($<$<COMPILE_LANGUAGE:C>:$<TARGET_PROPERTY:compiler,no_position_independent>>)
-zephyr_compile_options($<$<COMPILE_LANGUAGE:CXX>:$<TARGET_PROPERTY:compiler,no_position_independent>>)
-
-# In case of CONFIG_NATIVE_LIBRARY we also don't want position independent code,
-# but we cannot tell that to the linker yet as we are first only doing a
-# relocatable link into a static library
-zephyr_link_libraries_ifndef(CONFIG_NATIVE_LIBRARY
-                             $<TARGET_PROPERTY:linker,no_position_independent>)
-
 # Allow the user to inject options when calling cmake, e.g.
 # 'cmake -DEXTRA_CFLAGS="-Werror -Wno-deprecated-declarations" ..'
 include(cmake/extra_flags.cmake)
 
 zephyr_cc_option(-fno-asynchronous-unwind-tables)
-
-if(CONFIG_USERSPACE)
-  zephyr_compile_options($<TARGET_PROPERTY:compiler,no_global_merge>)
-endif()
+zephyr_cc_option(-fno-pie)
+zephyr_cc_option(-fno-pic)
 
 if(CONFIG_THREAD_LOCAL_STORAGE)
 # Only support local exec TLS model at this point.
@@ -429,25 +364,13 @@ zephyr_compile_options(${COMPILER_OPT_AS_LIST})
 
 # TODO: Include arch compiler options at this point.
 
-if(NOT CMAKE_C_COMPILER_ID STREQUAL "Clang" AND
-   NOT CMAKE_C_COMPILER_ID STREQUAL "IntelLLVM" AND
-   NOT CMAKE_C_COMPILER_ID STREQUAL "ARMClang")
+if(NOT CMAKE_C_COMPILER_ID STREQUAL "Clang")
   # GCC assumed
   zephyr_cc_option(-fno-reorder-functions)
 
-  # GCC 11 and above may generate a warning when dereferencing a constant
-  # address pointer whose address is below the value specified by the
-  # `min-pagesize` parameter (defaults to 0x1000). The `min-pagesize` parameter
-  # is set to 0 such that GCC never generates any warnings for the constant
-  # address pointers. For more details, refer to the GCC PR99578.
-  zephyr_cc_option(--param=min-pagesize=0)
-
   if(NOT ${ZEPHYR_TOOLCHAIN_VARIANT} STREQUAL "xcc")
     zephyr_cc_option(-fno-defer-pop)
   endif()
-else()
-  # Clang produces false positive vla warnings
-  zephyr_cc_option(-Wno-vla)
 endif()
 
 zephyr_cc_option_ifdef(CONFIG_STACK_USAGE            -fstack-usage)
@@ -458,15 +381,14 @@ zephyr_cc_option_ifdef(CONFIG_STACK_USAGE            -fstack-usage)
 # application code. This saves some memory, stops leaking user locations
 # in binaries, makes failure logs more deterministic and most
 # importantly makes builds more deterministic
-if(CONFIG_BUILD_OUTPUT_STRIP_PATHS)
-  # If several match then the last one wins. This matters for instances
-  # like tests/ and samples/: they're inside all of them! Then let's
-  # strip as little as possible.
-  zephyr_cc_option(-fmacro-prefix-map=${CMAKE_SOURCE_DIR}=CMAKE_SOURCE_DIR)
-  zephyr_cc_option(-fmacro-prefix-map=${ZEPHYR_BASE}=ZEPHYR_BASE)
-  if(WEST_TOPDIR)
-    zephyr_cc_option(-fmacro-prefix-map=${WEST_TOPDIR}=WEST_TOPDIR)
-  endif()
+
+# If several match then the last one wins. This matters for instances
+# like tests/ and samples/: they're inside all of them! Then let's
+# strip as little as possible.
+zephyr_cc_option(-fmacro-prefix-map=${CMAKE_SOURCE_DIR}=CMAKE_SOURCE_DIR)
+zephyr_cc_option(-fmacro-prefix-map=${ZEPHYR_BASE}=ZEPHYR_BASE)
+if(WEST_TOPDIR)
+  zephyr_cc_option(-fmacro-prefix-map=${WEST_TOPDIR}=WEST_TOPDIR)
 endif()
 
 # TODO: Archiver arguments
@@ -485,9 +407,8 @@ if(CONFIG_USERSPACE)
 endif()
 
 get_property(TOPT GLOBAL PROPERTY TOPT)
-get_property(COMPILER_TOPT TARGET compiler PROPERTY linker_script)
-set_ifndef(  TOPT "${COMPILER_TOPT}")
-set_ifndef(  TOPT -Wl,-T) # Use this if the compiler driver doesn't set a value
+set_ifndef(  TOPT -Wl,-T) # clang doesn't pick -T for some reason and complains,
+                          # while -Wl,-T works for both, gcc and clang
 
 if(CONFIG_HAVE_CUSTOM_LINKER_SCRIPT)
   set(LINKER_SCRIPT ${APPLICATION_SOURCE_DIR}/${CONFIG_CUSTOM_LINKER_SCRIPT})
@@ -510,74 +431,65 @@ endif()
 
 if(DEFINED BUILD_VERSION)
   set(build_version_argument "-DBUILD_VERSION=${BUILD_VERSION}")
-elseif(NOT ZEPHYR_GIT_INDEX)
-  set(ZEPHYR_GIT_INDEX ZEPHYR_GIT_INDEX-NOTFOUND CACHE PATH
-    "Path to Zephyr git repository index file")
-  if(EXISTS ${ZEPHYR_BASE}/.git/index)
-    set(ZEPHYR_GIT_DIR ${ZEPHYR_BASE}/.git/index CACHE PATH
-      "Path to Zephyr git repository index file" FORCE)
-  elseif(EXISTS ${ZEPHYR_BASE}/.git)
-    # Likely a git-submodule. Let's ask git where the real database is located.
-    find_package(Git QUIET)
-    if(GIT_FOUND)
-      execute_process(
-        COMMAND ${GIT_EXECUTABLE} rev-parse --absolute-git-dir
-        WORKING_DIRECTORY ${ZEPHYR_BASE}
-        OUTPUT_VARIABLE zephyr_git_dir
-        OUTPUT_STRIP_TRAILING_WHITESPACE
-        ERROR_STRIP_TRAILING_WHITESPACE
-        ERROR_VARIABLE stderr
-        RESULT_VARIABLE return_code)
-      if(return_code)
-        message(WARNING "BUILD_VERSION: git rev-parse failed: ${stderr}")
-      else()
-        if(NOT "${stderr}" STREQUAL "")
-          message(WARNING "BUILD_VERSION: git rev-parse warned: ${stderr}")
-        endif()
-        set(ZEPHYR_GIT_INDEX ${zephyr_git_dir}/index CACHE PATH
-          "Path to Zephyr git repository index file" FORCE)
-      endif()
-    else()
-      message(WARNING "Could not find git installation, "
-        "please specify '-DBUILD_VERSION=<version>'")
-    endif()
-  else()
-    message(WARNING "ZEPHYR_BASE=${ZEPHYR_BASE} doesn't appear to be a git "
-      "repository, please specify '-DBUILD_VERSION=<version>'")
-  endif()
+elseif(EXISTS ${ZEPHYR_BASE}/.git/index)
+  set(git_dependency ${ZEPHYR_BASE}/.git/index)
+else()
+  message(WARNING "ZEPHYR_BASE=${ZEPHYR_BASE} doesn't appear to be a git "
+    "repository, please specify '-DBUILD_VERSION=<version>'")
 endif()
-
-if(ZEPHYR_GIT_INDEX)
-  set(git_dependency ${ZEPHYR_GIT_INDEX})
-endif()
-
 add_custom_command(
   OUTPUT ${PROJECT_BINARY_DIR}/include/generated/version.h
   COMMAND ${CMAKE_COMMAND} -DZEPHYR_BASE=${ZEPHYR_BASE}
     -DOUT_FILE=${PROJECT_BINARY_DIR}/include/generated/version.h
-    -DVERSION_TYPE=KERNEL
-    -DVERSION_FILE=${ZEPHYR_BASE}/VERSION
-    -DKERNEL_VERSION_CUSTOMIZATION="${KERNEL_VERSION_CUSTOMIZATION}"
     ${build_version_argument}
     -P ${ZEPHYR_BASE}/cmake/gen_version_h.cmake
   DEPENDS ${ZEPHYR_BASE}/VERSION ${git_dependency}
 )
 add_custom_target(version_h DEPENDS ${PROJECT_BINARY_DIR}/include/generated/version.h)
 
-if(EXISTS ${APPLICATION_SOURCE_DIR}/VERSION)
-  add_custom_command(
-    OUTPUT ${PROJECT_BINARY_DIR}/include/generated/app_version.h
-    COMMAND ${CMAKE_COMMAND} -DZEPHYR_BASE=${ZEPHYR_BASE}
-      -DOUT_FILE=${PROJECT_BINARY_DIR}/include/generated/app_version.h
-      -DVERSION_TYPE=APP
-      -DVERSION_FILE=${APPLICATION_SOURCE_DIR}/VERSION
-      -DAPP_VERSION_CUSTOMIZATION="${APP_VERSION_CUSTOMIZATION}"
-      ${build_version_argument}
-      -P ${ZEPHYR_BASE}/cmake/gen_version_h.cmake
-    DEPENDS ${APPLICATION_SOURCE_DIR}/VERSION ${git_dependency}
-  )
-  add_custom_target(app_version_h DEPENDS ${PROJECT_BINARY_DIR}/include/generated/app_version.h)
-  add_dependencies(zephyr_interface app_version_h)
+# Error-out when the deprecated naming convention is found (until
+# after 1.14.0 has been released)
+foreach(path
+    ${BOARD_DIR}/dts.fixup
+    ${PROJECT_SOURCE_DIR}/soc/${ARCH}/${SOC_PATH}/dts.fixup
+    ${APPLICATION_SOURCE_DIR}/dts.fixup
+    )
+  if(EXISTS ${path})
+    message(FATAL_ERROR
+      "A deprecated filename has been detected. Porting is required."
+      "The file '${path}' exists, but it should be named dts_fixup.h instead."
+      "See https://github.com/zephyrproject-rtos/zephyr/pull/10352 for more details"
+      )
+  endif()
+endforeach()
+
+set_ifndef(  DTS_BOARD_FIXUP_FILE                                   ${BOARD_DIR}/dts_fixup.h)
+set_ifndef(    DTS_SOC_FIXUP_FILE                 ${SOC_DIR}/${ARCH}/${SOC_PATH}/dts_fixup.h)
+set(           DTS_APP_FIXUP_FILE                      ${APPLICATION_SOURCE_DIR}/dts_fixup.h)
+
+set_ifndef(DTS_CAT_OF_FIXUP_FILES ${ZEPHYR_BINARY_DIR}/include/generated/devicetree_fixups.h)
+
+# Concatenate the fixups into a single header file for easy
+# #include'ing
+file(WRITE ${DTS_CAT_OF_FIXUP_FILES}.new "/* May only be included by devicetree.h */\n\n")
+set(DISCOVERED_FIXUP_FILES)
+foreach(fixup_file
+    ${DTS_BOARD_FIXUP_FILE}
+    ${DTS_SOC_FIXUP_FILE}
+    ${DTS_APP_FIXUP_FILE}
+    ${shield_dts_fixups}
+    )
+  if(EXISTS ${fixup_file})
+    file(READ ${fixup_file} contents)
+    file(APPEND ${DTS_CAT_OF_FIXUP_FILES}.new "${contents}")
+    string(APPEND DISCOVERED_FIXUP_FILES "- ${fixup_file}\n")
+  endif()
+endforeach()
+zephyr_file_copy(${DTS_CAT_OF_FIXUP_FILES}.new ${DTS_CAT_OF_FIXUP_FILES} ONLY_IF_DIFFERENT)
+file(REMOVE ${DTS_CAT_OF_FIXUP_FILES}.new)
+
+if (DISCOVERED_FIXUP_FILES)
+  message(WARNING "One or more dts_fixup.h files detected:\n${DISCOVERED_FIXUP_FILES}Use of these files is deprecated; use the devicetree.h API instead.")
 endif()
 
 # Unfortunately, the order in which CMakeLists.txt code is processed
@@ -603,7 +515,12 @@ add_subdirectory(lib)
 # property which is set implicitly for custom command outputs
 include(misc/generated/CMakeLists.txt)
 
-add_subdirectory(soc)
+if(EXISTS ${SOC_DIR}/${ARCH}/CMakeLists.txt)
+  add_subdirectory(${SOC_DIR}/${ARCH} soc/${ARCH})
+else()
+  add_subdirectory(${SOC_DIR}/${ARCH}/${SOC_PATH} soc/${ARCH}/${SOC_PATH})
+endif()
+
 add_subdirectory(boards)
 add_subdirectory(subsys)
 add_subdirectory(drivers)
@@ -626,9 +543,6 @@ endforeach()
 set(ZEPHYR_CURRENT_MODULE_DIR)
 set(ZEPHYR_CURRENT_CMAKE_DIR)
 
-get_property(LIBC_LINK_LIBRARIES TARGET zephyr_interface PROPERTY LIBC_LINK_LIBRARIES)
-zephyr_link_libraries(${LIBC_LINK_LIBRARIES})
-
 set(syscall_list_h   ${CMAKE_CURRENT_BINARY_DIR}/include/generated/syscall_list.h)
 set(syscalls_json    ${CMAKE_CURRENT_BINARY_DIR}/misc/generated/syscalls.json)
 set(struct_tags_json ${CMAKE_CURRENT_BINARY_DIR}/misc/generated/struct_tags.json)
@@ -652,10 +566,10 @@ endif()
 execute_process(
   COMMAND
   ${PYTHON_EXECUTABLE}
-  ${ZEPHYR_BASE}/scripts/build/subfolder_list.py
+  ${ZEPHYR_BASE}/scripts/subfolder_list.py
   --directory        ${ZEPHYR_BASE}/include      # Walk this directory
   --out-file         ${syscalls_subdirs_txt}     # Write file with discovered folder
-  --trigger-file     ${syscalls_subdirs_trigger} # Trigger file that is used for json generation
+  --trigger          ${syscalls_subdirs_trigger} # Trigger file that is used for json generation
   ${syscalls_links}                              # If defined, create symlinks for dependencies
 )
 file(STRINGS ${syscalls_subdirs_txt} PARSE_SYSCALLS_PATHS_DEPENDS ENCODING UTF-8)
@@ -685,10 +599,10 @@ else()
     ${syscalls_subdirs_trigger}
     COMMAND
     ${PYTHON_EXECUTABLE}
-    ${ZEPHYR_BASE}/scripts/build/subfolder_list.py
+    ${ZEPHYR_BASE}/scripts/subfolder_list.py
     --directory        ${ZEPHYR_BASE}/include      # Walk this directory
     --out-file         ${syscalls_subdirs_txt}     # Write file with discovered folder
-    --trigger-file     ${syscalls_subdirs_trigger} # Trigger file that is used for json generation
+    --trigger          ${syscalls_subdirs_trigger} # Trigger file that is used for json generation
     ${syscalls_links}                              # If defined, create symlinks for dependencies
     DEPENDS ${PARSE_SYSCALLS_PATHS_DEPENDS}
   )
@@ -712,15 +626,6 @@ endif()
 
 if(CONFIG_ZTEST)
   list(APPEND SYSCALL_INCLUDE_DIRS ${ZEPHYR_BASE}/subsys/testsuite/ztest/include)
-
-  if(CONFIG_NO_OPTIMIZATIONS AND CONFIG_ZTEST_WARN_NO_OPTIMIZATIONS)
-    message(WARNING "Running tests with CONFIG_NO_OPTIMIZATIONS is generally "
-    "not supported and known to break in many cases due to stack overflow or "
-    "other problems. Please do not file issues about it unless the test is "
-    "specifically tuned to run in this configuration. To disable this warning "
-    "set CONFIG_ZTEST_WARN_NO_OPTIMIZATIONS=n.")
-  endif()
-
 endif()
 
 foreach(d ${SYSCALL_INCLUDE_DIRS})
@@ -735,27 +640,17 @@ add_custom_command(
   ${struct_tags_json}
   COMMAND
   ${PYTHON_EXECUTABLE}
-  ${ZEPHYR_BASE}/scripts/build/parse_syscalls.py
-  --scan             ${ZEPHYR_BASE}/include         # Read files from this dir
-  --scan             ${ZEPHYR_BASE}/drivers         # For net sockets
-  --scan             ${ZEPHYR_BASE}/subsys/net      # More net sockets
+  ${ZEPHYR_BASE}/scripts/parse_syscalls.py
+   --include          ${ZEPHYR_BASE}/include        # Read files from this dir
+   --include          ${ZEPHYR_BASE}/drivers        # For net sockets
+   --include          ${ZEPHYR_BASE}/subsys/net     # More net sockets
   ${parse_syscalls_include_args}                    # Read files from these dirs also
   --json-file        ${syscalls_json}               # Write this file
   --tag-struct-file  ${struct_tags_json}            # Write subsystem list to this file
-  --file-list        ${syscalls_file_list_output}
-  $<$<BOOL:${CONFIG_EMIT_ALL_SYSCALLS}>:--emit-all-syscalls>
   DEPENDS ${syscalls_subdirs_trigger} ${PARSE_SYSCALLS_HEADER_DEPENDS}
-          ${syscalls_file_list_output} ${syscalls_interface}
   )
 
-# Make sure Picolibc is built before the rest of the system; there's no explicit
-# reference to any of the files as they're all picked up by various compiler
-# settings
-if(CONFIG_PICOLIBC_USE_MODULE)
-  set(picolibc_dependency PicolibcBuild)
-endif()
-
-add_custom_target(${SYSCALL_LIST_H_TARGET} DEPENDS ${syscall_list_h} ${picolibc_dependency})
+add_custom_target(${SYSCALL_LIST_H_TARGET} DEPENDS ${syscall_list_h})
 
 set_property(TARGET ${SYSCALL_LIST_H_TARGET}
              APPEND PROPERTY
@@ -777,19 +672,18 @@ if(CONFIG_64BIT)
 endif()
 
 if(CONFIG_TIMEOUT_64BIT)
-  set(SYSCALL_SPLIT_TIMEOUT_ARG --split-type k_timeout_t --split-type k_ticks_t)
+  set(SYSCALL_SPLIT_TIMEOUT_ARG --split-type k_timeout_t)
 endif()
 
 add_custom_command(OUTPUT include/generated/syscall_dispatch.c ${syscall_list_h}
   # Also, some files are written to include/generated/syscalls/
   COMMAND
   ${PYTHON_EXECUTABLE}
-  ${ZEPHYR_BASE}/scripts/build/gen_syscalls.py
+  ${ZEPHYR_BASE}/scripts/gen_syscalls.py
   --json-file        ${syscalls_json}                     # Read this file
   --base-output      include/generated/syscalls           # Write to this dir
   --syscall-dispatch include/generated/syscall_dispatch.c # Write this file
   --syscall-list     ${syscall_list_h}
-  $<$<BOOL:${CONFIG_USERSPACE}>:--gen-mrsh-files>
   ${SYSCALL_LONG_REGISTERS_ARG}
   ${SYSCALL_SPLIT_TIMEOUT_ARG}
   WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
@@ -797,19 +691,19 @@ add_custom_command(OUTPUT include/generated/syscall_dispatch.c ${syscall_list_h}
   )
 
 # This is passed into all calls to the gen_kobject_list.py script.
-set(gen_kobject_list_include_args --include-subsystem-list ${struct_tags_json})
+set(gen_kobject_list_include_args --include ${struct_tags_json})
 
 set(DRV_VALIDATION ${PROJECT_BINARY_DIR}/include/generated/driver-validation.h)
 add_custom_command(
   OUTPUT ${DRV_VALIDATION}
   COMMAND
   ${PYTHON_EXECUTABLE}
-  ${ZEPHYR_BASE}/scripts/build/gen_kobject_list.py
+  ${ZEPHYR_BASE}/scripts/gen_kobject_list.py
   --validation-output ${DRV_VALIDATION}
   ${gen_kobject_list_include_args}
   $<$<BOOL:${CMAKE_VERBOSE_MAKEFILE}>:--verbose>
   DEPENDS
-  ${ZEPHYR_BASE}/scripts/build/gen_kobject_list.py
+  ${ZEPHYR_BASE}/scripts/gen_kobject_list.py
   ${PARSE_SYSCALLS_TARGET}
   WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
   )
@@ -848,7 +742,7 @@ add_dependencies(zephyr_interface
 
 add_custom_command(
   OUTPUT ${OFFSETS_H_PATH}
-  COMMAND ${PYTHON_EXECUTABLE} ${ZEPHYR_BASE}/scripts/build/gen_offset_header.py
+  COMMAND ${PYTHON_EXECUTABLE} ${ZEPHYR_BASE}/scripts/gen_offset_header.py
   -i $<TARGET_OBJECTS:${OFFSETS_LIB}>
   -o ${OFFSETS_H_PATH}
   DEPENDS
@@ -861,14 +755,6 @@ zephyr_get_include_directories_for_lang(C ZEPHYR_INCLUDES)
 
 add_subdirectory(kernel)
 
-get_property(
-  syscalls_file_list
-  TARGET syscalls_interface
-  PROPERTY INTERFACE_INCLUDE_DIRECTORIES
-)
-file(CONFIGURE OUTPUT ${syscalls_file_list_output}
-     CONTENT "@syscalls_file_list@" @ONLY)
-
 # Read list content
 get_property(ZEPHYR_LIBS_PROPERTY GLOBAL PROPERTY ZEPHYR_LIBS)
 
@@ -915,38 +801,25 @@ zephyr_get_include_directories_for_lang(C
   STRIP_PREFIX # Don't use a -I prefix
   )
 
-if(CONFIG_DEVICE_DEPS)
-  if(CONFIG_DEVICE_DEPS_DYNAMIC)
-    set(dynamic_deps --dynamic-deps)
-  endif()
-
-  if(CONFIG_PM_DEVICE_POWER_DOMAIN_DYNAMIC)
-    set(number_of_dynamic_devices ${CONFIG_PM_DEVICE_POWER_DOMAIN_DYNAMIC_NUM})
-  else()
-    set(number_of_dynamic_devices 0)
-  endif()
-
-  # device_deps.c is generated from ${ZEPHYR_LINK_STAGE_EXECUTABLE} by
-  # gen_device_deps.py
+if(CONFIG_HAS_DTS)
+  # dev_handles.c is generated from ${ZEPHYR_LINK_STAGE_EXECUTABLE} by
+  # gen_handles.py
   add_custom_command(
-    OUTPUT device_deps.c
+    OUTPUT dev_handles.c
     COMMAND
     ${PYTHON_EXECUTABLE}
-    ${ZEPHYR_BASE}/scripts/build/gen_device_deps.py
-    --output-source device_deps.c
-    --output-graphviz dev_graph.dot
-    ${dynamic_deps}
-    --num-dynamic-devices ${number_of_dynamic_devices}
+    ${ZEPHYR_BASE}/scripts/gen_handles.py
+    --output-source dev_handles.c
     --kernel $<TARGET_FILE:${ZEPHYR_LINK_STAGE_EXECUTABLE}>
     --zephyr-base ${ZEPHYR_BASE}
     --start-symbol "$<TARGET_PROPERTY:linker,devices_start_symbol>"
     VERBATIM
     DEPENDS ${ZEPHYR_LINK_STAGE_EXECUTABLE}
     )
-  set_property(GLOBAL APPEND PROPERTY GENERATED_APP_SOURCE_FILES device_deps.c)
+  set_property(GLOBAL APPEND PROPERTY GENERATED_APP_SOURCE_FILES dev_handles.c)
 
-  # gen_device_deps runs on `__device_deps_pass1` so pass this info to the linker script generator
-  list(APPEND LINKER_PASS_${ZEPHYR_CURRENT_LINKER_PASS}_DEFINE "LINKER_DEVICE_DEPS_PASS1")
+  # gen_handles runs on `__device_handles_pass1` so pass this info to the linker script generator
+  list(APPEND LINKER_PASS_${ZEPHYR_CURRENT_LINKER_PASS}_DEFINE "LINKER_DEVICE_HANDLES_PASS1")
 endif()
 
 if(CONFIG_CODE_DATA_RELOCATION)
@@ -960,8 +833,8 @@ if(CONFIG_USERSPACE)
          NO_COVERAGE_FLAGS "${compiler_flags_priv}"
   )
 
-  set(GEN_KOBJ_LIST ${ZEPHYR_BASE}/scripts/build/gen_kobject_list.py)
-  set(PROCESS_GPERF ${ZEPHYR_BASE}/scripts/build/process_gperf.py)
+  set(GEN_KOBJ_LIST ${ZEPHYR_BASE}/scripts/gen_kobject_list.py)
+  set(PROCESS_GPERF ${ZEPHYR_BASE}/scripts/process_gperf.py)
 endif()
 
 get_property(CSTD GLOBAL PROPERTY CSTD)
@@ -1004,29 +877,25 @@ if(CONFIG_USERSPACE)
   set(OBJ_FILE_DIR "${PROJECT_BINARY_DIR}/../")
 
   if(CONFIG_NEWLIB_LIBC)
-    set(LIBC_PART -l libc.a z_libc_partition -l libm.a z_libc_partition)
+    set(NEWLIB_PART -l libc.a z_libc_partition)
   endif()
   if(CONFIG_NEWLIB_LIBC_NANO)
-    set(LIBC_PART -l libc_nano.a z_libc_partition -l libm_nano.a z_libc_partition)
-  endif()
-  if(CONFIG_PICOLIBC)
-    set(LIBC_PART -l libc.a z_libc_partition)
+    set(NEWLIB_PART -l libc_nano.a z_libc_partition)
   endif()
 
   add_custom_command(
     OUTPUT ${APP_SMEM_UNALIGNED_LD} ${APP_SMEM_PINNED_UNALIGNED_LD}
     COMMAND ${PYTHON_EXECUTABLE}
-    ${ZEPHYR_BASE}/scripts/build/gen_app_partitions.py
+    ${ZEPHYR_BASE}/scripts/gen_app_partitions.py
     -f ${CMAKE_BINARY_DIR}/compile_commands.json
     -o ${APP_SMEM_UNALIGNED_LD}
     $<$<BOOL:${APP_SMEM_PINNED_UNALIGNED_LD}>:--pinoutput=${APP_SMEM_PINNED_UNALIGNED_LD}>
     ${APP_SMEM_PINNED_PARTITION_LIST_ARG}
-    ${LIBC_PART}
+    ${NEWLIB_PART}
     $<TARGET_PROPERTY:zephyr_property_target,COMPILE_OPTIONS>
     $<$<BOOL:${CMAKE_VERBOSE_MAKEFILE}>:--verbose>
     DEPENDS
     kernel
-    ${CMAKE_BINARY_DIR}/compile_commands.json
     ${ZEPHYR_LIBS_PROPERTY}
     WORKING_DIRECTORY ${PROJECT_BINARY_DIR}/
     COMMAND_EXPAND_LISTS
@@ -1055,12 +924,12 @@ if (CONFIG_USERSPACE)
   add_custom_command(
     OUTPUT ${APP_SMEM_ALIGNED_LD} ${APP_SMEM_PINNED_ALIGNED_LD}
     COMMAND ${PYTHON_EXECUTABLE}
-    ${ZEPHYR_BASE}/scripts/build/gen_app_partitions.py
+    ${ZEPHYR_BASE}/scripts/gen_app_partitions.py
     -e $<TARGET_FILE:${ZEPHYR_LINK_STAGE_EXECUTABLE}>
     -o ${APP_SMEM_ALIGNED_LD}
     $<$<BOOL:${APP_SMEM_PINNED_ALIGNED_LD}>:--pinoutput=${APP_SMEM_PINNED_ALIGNED_LD}>
     ${APP_SMEM_PINNED_PARTITION_LIST_ARG}
-    ${LIBC_PART}
+    ${NEWLIB_PART}
     $<TARGET_PROPERTY:zephyr_property_target,COMPILE_OPTIONS>
     $<$<BOOL:${CMAKE_VERBOSE_MAKEFILE}>:--verbose>
     DEPENDS
@@ -1162,7 +1031,7 @@ if(CONFIG_USERSPACE)
     OUTPUT ${KOBJECT_LINKER_HEADER_DATA}
     COMMAND
     ${PYTHON_EXECUTABLE}
-    ${ZEPHYR_BASE}/scripts/build/gen_kobject_placeholders.py
+    ${ZEPHYR_BASE}/scripts/gen_kobject_placeholders.py
     --object $<TARGET_OBJECTS:kobj_prebuilt_hash_output_lib>
     --outdir ${PROJECT_BINARY_DIR}/include/generated
     --datapct ${CONFIG_KOBJECT_DATA_AREA_RESERVE_EXTRA_PERCENT}
@@ -1180,7 +1049,7 @@ if(CONFIG_USERSPACE)
   )
 endif()
 
-if(CONFIG_USERSPACE OR CONFIG_DEVICE_DEPS)
+if(CONFIG_USERSPACE OR CONFIG_HAS_DTS)
   configure_linker_script(
     ${ZEPHYR_CURRENT_LINKER_CMD}
     "${LINKER_PASS_${ZEPHYR_CURRENT_LINKER_PASS}_DEFINE}"
@@ -1212,8 +1081,6 @@ if(CONFIG_USERSPACE OR CONFIG_DEVICE_DEPS)
     LIBRARIES_POST_SCRIPT ""
     DEPENDENCIES          ${CODE_RELOCATION_DEP}
   )
-  target_link_libraries_ifdef(CONFIG_NATIVE_LIBRARY ${ZEPHYR_LINK_STAGE_EXECUTABLE}
-                              $<TARGET_PROPERTY:linker,no_position_independent>)
   target_byproducts(TARGET ${ZEPHYR_LINK_STAGE_EXECUTABLE}
                     BYPRODUCTS ${PROJECT_BINARY_DIR}/${ZEPHYR_LINK_STAGE_EXECUTABLE}.map
   )
@@ -1249,7 +1116,7 @@ if(CONFIG_GEN_ISR_TABLES)
             $<TARGET_PROPERTY:bintools,elfconvert_flag_outfile>isrList.bin
             $<TARGET_PROPERTY:bintools,elfconvert_flag_final>
     COMMAND ${PYTHON_EXECUTABLE}
-    ${ZEPHYR_BASE}/scripts/build/gen_isr_tables.py
+    ${ZEPHYR_BASE}/arch/common/gen_isr_tables.py
     --output-source isr_tables.c
     --kernel $<TARGET_FILE:${ZEPHYR_LINK_STAGE_EXECUTABLE}>
     --intlist isrList.bin
@@ -1362,7 +1229,6 @@ if(CONFIG_USERSPACE)
     OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${KOBJECT_HASH_OUTPUT_OBJ_RENAMED}
     COMMAND $<TARGET_PROPERTY:bintools,elfconvert_command>
             $<TARGET_PROPERTY:bintools,elfconvert_flag>
-            $<TARGET_PROPERTY:bintools,elfconvert_flag_section_rename>.literal=.kobject_data.literal
             $<TARGET_PROPERTY:bintools,elfconvert_flag_section_rename>.data=.kobject_data.data
             $<TARGET_PROPERTY:bintools,elfconvert_flag_section_rename>.sdata=.kobject_data.sdata
             $<TARGET_PROPERTY:bintools,elfconvert_flag_section_rename>.text=.kobject_data.text
@@ -1431,12 +1297,9 @@ toolchain_ld_link_elf(
   LINKER_SCRIPT         ${PROJECT_BINARY_DIR}/${ZEPHYR_CURRENT_LINKER_CMD}
   DEPENDENCIES          ${CODE_RELOCATION_DEP}
 )
-target_link_libraries_ifdef(CONFIG_NATIVE_LIBRARY ${ZEPHYR_LINK_STAGE_EXECUTABLE}
-                            $<TARGET_PROPERTY:linker,partial_linking>)
 target_byproducts(TARGET ${ZEPHYR_LINK_STAGE_EXECUTABLE}
                   BYPRODUCTS ${PROJECT_BINARY_DIR}/${ZEPHYR_LINK_STAGE_EXECUTABLE}.map
 )
-set(BYPRODUCT_KERNEL_ELF_NAME "${PROJECT_BINARY_DIR}/${KERNEL_ELF_NAME}" CACHE FILEPATH "Kernel elf file" FORCE)
 set_property(TARGET
   ${ZEPHYR_LINK_STAGE_EXECUTABLE}
   PROPERTY LINK_DEPENDS ${PROJECT_BINARY_DIR}/${ZEPHYR_CURRENT_LINKER_CMD}
@@ -1507,7 +1370,7 @@ set(post_build_byproducts "")
 list(APPEND
   post_build_commands
   COMMAND
-  ${CMAKE_COMMAND} -E copy ${logical_target_for_zephyr_elf}.map ${KERNEL_MAP_NAME}
+  ${CMAKE_COMMAND} -E rename ${logical_target_for_zephyr_elf}.map ${KERNEL_MAP_NAME}
 )
 list(APPEND post_build_byproducts ${KERNEL_MAP_NAME})
 
@@ -1554,7 +1417,7 @@ if(CONFIG_BUILD_OUTPUT_ADJUST_LMA)
     )
 endif()
 
-if(NOT CONFIG_CPP_EXCEPTIONS)
+if(NOT CONFIG_EXCEPTIONS)
   set(eh_frame_section ".eh_frame")
 else()
   set(eh_frame_section "")
@@ -1582,8 +1445,8 @@ if(CONFIG_BUILD_OUTPUT_HEX OR BOARD_FLASH_RUNNER STREQUAL openocd)
     list(APPEND
       post_build_byproducts
       ${KERNEL_HEX_NAME}
+      # ${out_hex_byprod} # Is this needed ?
       )
-    set(BYPRODUCT_KERNEL_HEX_NAME "${PROJECT_BINARY_DIR}/${KERNEL_HEX_NAME}" CACHE FILEPATH "Kernel hex file" FORCE)
   endif()
 endif()
 
@@ -1604,8 +1467,8 @@ if(CONFIG_BUILD_OUTPUT_BIN)
     list(APPEND
       post_build_byproducts
       ${KERNEL_BIN_NAME}
+      # ${out_hex_byprod} # Is this needed ?
       )
-    set(BYPRODUCT_KERNEL_BIN_NAME "${PROJECT_BINARY_DIR}/${KERNEL_BIN_NAME}" CACHE FILEPATH "Kernel binary file" FORCE)
   endif()
 endif()
 
@@ -1627,7 +1490,7 @@ if(CONFIG_BUILD_OUTPUT_BIN AND CONFIG_BUILD_OUTPUT_UF2)
 
   list(APPEND
     post_build_commands
-    COMMAND ${PYTHON_EXECUTABLE} ${ZEPHYR_BASE}/scripts/build/uf2conv.py
+    COMMAND ${PYTHON_EXECUTABLE} ${ZEPHYR_BASE}/scripts/uf2conv.py
             -c
             -f ${CONFIG_BUILD_OUTPUT_UF2_FAMILY_ID}
             -b ${flash_addr}
@@ -1638,7 +1501,6 @@ if(CONFIG_BUILD_OUTPUT_BIN AND CONFIG_BUILD_OUTPUT_UF2)
     post_build_byproducts
     ${KERNEL_UF2_NAME}
   )
-  set(BYPRODUCT_KERNEL_UF2_NAME "${PROJECT_BINARY_DIR}/${KERNEL_UF2_NAME}" CACHE FILEPATH "Kernel uf2 file" FORCE)
 endif()
 
 if(CONFIG_BUILD_OUTPUT_META)
@@ -1647,7 +1509,7 @@ if(CONFIG_BUILD_OUTPUT_META)
     COMMAND ${PYTHON_EXECUTABLE} ${ZEPHYR_BASE}/scripts/zephyr_module.py
             ${WEST_ARG}
             ${ZEPHYR_MODULES_ARG}
-            ${EXTRA_ZEPHYR_MODULES_ARG}
+            ${ZEPHYR_EXTRA_MODULES_ARG}
             --meta-out ${KERNEL_META_NAME}
             $<$<BOOL:${CONFIG_BUILD_OUTPUT_META_STATE_PROPAGATE}>:--meta-state-propagate>
   )
@@ -1687,8 +1549,9 @@ if(CONFIG_BUILD_OUTPUT_S19)
     list(APPEND
       post_build_byproducts
       ${KERNEL_S19_NAME}
+      # ${out_S19_byprod} # Is this needed ?
+
       )
-    set(BYPRODUCT_KERNEL_S19_NAME "${PROJECT_BINARY_DIR}/${KERNEL_S19_NAME}" CACHE FILEPATH "Kernel s19 file" FORCE)
   endif()
 endif()
 
@@ -1710,25 +1573,12 @@ if(CONFIG_OUTPUT_DISASSEMBLE_ALL)
   list(APPEND
     post_build_byproducts
     ${KERNEL_LST_NAME}
-    )
-endif()
-
-if(CONFIG_OUTPUT_SYMBOLS)
-  list(APPEND
-    post_build_commands
-    COMMAND $<TARGET_PROPERTY:bintools,symbols_command>
-            $<TARGET_PROPERTY:bintools,symbols_flag>
-            $<TARGET_PROPERTY:bintools,symbols_infile>${KERNEL_ELF_NAME}
-            $<TARGET_PROPERTY:bintools,symbols_outfile>${KERNEL_SYMBOLS_NAME}
-            $<TARGET_PROPERTY:bintools,symbols_final>
-    )
-  list(APPEND
-    post_build_byproducts
-    ${KERNEL_SYMBOLS_NAME}
+#    ${out_disassembly_byprod} # Needed ??
     )
 endif()
 
 if(CONFIG_OUTPUT_STAT)
+#  zephyr_post_build(TOOLS bintools COMMAND readelf FLAGS headers INFILE file OUTFILE outfile)
   list(APPEND
     post_build_commands
     COMMAND $<TARGET_PROPERTY:bintools,readelf_command>
@@ -1761,39 +1611,21 @@ if(CONFIG_BUILD_OUTPUT_STRIPPED)
 endif()
 
 if(CONFIG_BUILD_OUTPUT_EXE)
-  if (NOT CONFIG_NATIVE_LIBRARY)
-    list(APPEND
-      post_build_commands
-      COMMAND
-      ${CMAKE_COMMAND} -E copy ${KERNEL_ELF_NAME} ${KERNEL_EXE_NAME}
-      )
-    list(APPEND
-      post_build_byproducts
-      ${KERNEL_EXE_NAME}
-      )
-    set(BYPRODUCT_KERNEL_EXE_NAME "${PROJECT_BINARY_DIR}/${KERNEL_EXE_NAME}" CACHE FILEPATH "Kernel exe file" FORCE)
-  else()
-    if(CMAKE_GENERATOR STREQUAL "Unix Makefiles")
-      set(MAKE "${CMAKE_MAKE_PROGRAM}" CACHE FILEPATH "cmake defined make")
-    endif()
-    find_program(MAKE make REQUIRED)
-    add_custom_target(native_runner_executable
-      ALL
-      COMMENT "Building native simulator runner, and linking final executable"
-      COMMAND
-      ${MAKE} -f ${ZEPHYR_BASE}/scripts/native_simulator/Makefile all --warn-undefined-variables
-        -r NSI_CONFIG_FILE=${CMAKE_BINARY_DIR}/zephyr/NSI/nsi_config
-      # nsi_config is created by the board cmake file
-      DEPENDS ${logical_target_for_zephyr_elf}
-      BYPRODUCTS ${KERNEL_EXE_NAME}
+  list(APPEND
+    post_build_commands
+    COMMAND
+    ${CMAKE_COMMAND} -E copy ${KERNEL_ELF_NAME} ${KERNEL_EXE_NAME}
+    )
+  list(APPEND
+    post_build_byproducts
+    ${KERNEL_EXE_NAME}
     )
-  endif()
 endif()
 
 if(CONFIG_BUILD_OUTPUT_INFO_HEADER)
   list(APPEND
     post_build_commands
-    COMMAND ${PYTHON_EXECUTABLE} ${ZEPHYR_BASE}/scripts/build/gen_image_info.py
+    COMMAND ${PYTHON_EXECUTABLE} ${ZEPHYR_BASE}/scripts/gen_image_info.py
     --elf-file=${KERNEL_ELF_NAME}
     --header-file=${PROJECT_BINARY_DIR}/include/public/zephyr_image_info.h
     $<$<BOOL:${adjustment}>:--adjusted-lma=${adjustment}>
@@ -1804,48 +1636,9 @@ if(CONFIG_BUILD_OUTPUT_INFO_HEADER)
     )
 endif()
 
-if(CONFIG_CHECK_INIT_PRIORITIES)
-  if(CONFIG_CHECK_INIT_PRIORITIES_FAIL_ON_WARNING)
-    set(fail_on_warning "--fail-on-warning")
-  endif()
-  list(APPEND
-    post_build_commands
-    COMMAND ${PYTHON_EXECUTABLE} ${ZEPHYR_BASE}/scripts/build/check_init_priorities.py
-      --elf-file=${ZEPHYR_BINARY_DIR}/${KERNEL_ELF_NAME}
-      ${fail_on_warning}
-    )
-endif()
-
-if(NOT CMAKE_C_COMPILER_ID STREQUAL "ARMClang")
-  add_custom_target(
-    initlevels
-    COMMAND ${PYTHON_EXECUTABLE} ${ZEPHYR_BASE}/scripts/build/check_init_priorities.py
-      --elf-file=${ZEPHYR_BINARY_DIR}/${KERNEL_ELF_NAME}
-      --initlevels
-    DEPENDS ${logical_target_for_zephyr_elf}
-    USES_TERMINAL
-  )
-endif()
-
 # Generate and use MCUboot related artifacts as needed.
 if(CONFIG_BOOTLOADER_MCUBOOT)
-  get_target_property(signing_script zephyr_property_target SIGNING_SCRIPT)
-  if(NOT signing_script)
-    set_target_properties(zephyr_property_target PROPERTIES SIGNING_SCRIPT ${CMAKE_CURRENT_LIST_DIR}/cmake/mcuboot.cmake)
-  endif()
-endif()
-
-# Include signing script, if set
-get_target_property(signing_script zephyr_property_target SIGNING_SCRIPT)
-if(signing_script)
-  message(STATUS "Including signing script: ${signing_script}")
-
-  include(${signing_script})
-endif()
-
-# Generate USB-C VIF policies in XML format
-if (CONFIG_BUILD_OUTPUT_VIF)
-  include(${CMAKE_CURRENT_LIST_DIR}/cmake/vif.cmake)
+  include(${CMAKE_CURRENT_LIST_DIR}/cmake/mcuboot.cmake)
 endif()
 
 get_property(extra_post_build_commands
@@ -1868,28 +1661,22 @@ list(APPEND
   ${extra_post_build_byproducts}
   )
 
-if(CONFIG_LOG_DICTIONARY_DB)
-  set(log_dict_db_output --json=${PROJECT_BINARY_DIR}/log_dictionary.json)
-elseif(CONFIG_LOG_MIPI_SYST_USE_CATALOG)
-  set(log_dict_db_output --syst=${PROJECT_BINARY_DIR}/mipi_syst_collateral.xml)
-endif()
+if(CONFIG_LOG_DICTIONARY_SUPPORT)
+  set(LOG_DICT_DB_NAME ${PROJECT_BINARY_DIR}/log_dictionary.json)
 
-if(log_dict_db_output)
   list(APPEND
     post_build_commands
     COMMAND
     ${PYTHON_EXECUTABLE}
     ${ZEPHYR_BASE}/scripts/logging/dictionary/database_gen.py
     ${KERNEL_ELF_NAME}
-    ${log_dict_db_output}
+    ${LOG_DICT_DB_NAME}
     --build-header ${PROJECT_BINARY_DIR}/include/generated/version.h
     )
   list(APPEND
     post_build_byproducts
     ${LOG_DICT_DB_NAME}
     )
-
-  unset(log_dict_db_output)
 endif()
 
 # Add post_build_commands to post-process the final .elf file produced by
@@ -1918,7 +1705,7 @@ if(HEX_FILES_TO_MERGE)
     OUTPUT ${MERGED_HEX_NAME}
     COMMAND
     ${PYTHON_EXECUTABLE}
-    ${ZEPHYR_BASE}/scripts/build/mergehex.py
+    ${ZEPHYR_BASE}/scripts/mergehex.py
     -o ${MERGED_HEX_NAME}
     ${HEX_FILES_TO_MERGE}
     DEPENDS ${HEX_FILES_TO_MERGE} ${logical_target_for_zephyr_elf}
@@ -1932,14 +1719,10 @@ endif()
 
 if(SUPPORTED_EMU_PLATFORMS)
   list(GET SUPPORTED_EMU_PLATFORMS 0 default_emu)
-  if(EXISTS ${ZEPHYR_BASE}/cmake/emu/${default_emu}.cmake)
-    add_custom_target(run DEPENDS run_${default_emu})
-  endif()
+  add_custom_target(run DEPENDS run_${default_emu})
 
   foreach(EMU_PLATFORM ${SUPPORTED_EMU_PLATFORMS})
-    if(EXISTS ${ZEPHYR_BASE}/cmake/emu/${EMU_PLATFORM}.cmake)
-      include(${ZEPHYR_BASE}/cmake/emu/${EMU_PLATFORM}.cmake)
-    endif()
+    include(${ZEPHYR_BASE}/cmake/emu/${EMU_PLATFORM}.cmake)
   endforeach()
 
   if(TARGET debugserver_${default_emu})
@@ -2006,7 +1789,7 @@ endif()
 zephyr_compile_options($<TARGET_PROPERTY:compiler,nostdinc>)
 target_include_directories(zephyr_interface SYSTEM INTERFACE $<TARGET_PROPERTY:compiler,nostdinc_include>)
 
-if(CONFIG_MINIMAL_LIBCPP)
+if(NOT CONFIG_LIB_CPLUSPLUS)
   zephyr_compile_options($<$<COMPILE_LANGUAGE:CXX>:$<TARGET_PROPERTY:compiler-cpp,nostdincxx>>)
 endif()
 

Kconfig.zephyr

@@ -2,10 +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
 
-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.
@@ -29,12 +27,6 @@ osource "$(KCONFIG_BINARY_DIR)/Kconfig.soc.defconfig"
 osource "soc/$(ARCH)/*/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"
 
 menu "Modules"
 
@@ -46,6 +38,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"
@@ -56,7 +49,7 @@ menu "Build and Link Features"
 
 menu "Linker Options"
 
-choice LINKER_ORPHAN_CONFIGURATION
+choice
 	prompt "Linker Orphan Section Handling"
 	default LINKER_ORPHAN_SECTION_WARN
 
@@ -228,7 +221,7 @@ config SRAM_OFFSET
 menu "Linker Sections"
 
 config LINKER_USE_BOOT_SECTION
-	bool "Use Boot Linker Section"
+	bool "Enable Usage of 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
@@ -238,7 +231,7 @@ config LINKER_USE_BOOT_SECTION
 	  board or custom linker script.
 
 config LINKER_USE_PINNED_SECTION
-	bool "Use Pinned Linker Section"
+	bool "Enable Usage of 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
@@ -261,49 +254,6 @@ config LINKER_GENERIC_SECTIONS_PRESENT_AT_BOOT
 
 	  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"
 
 endmenu
@@ -316,39 +266,12 @@ config CODING_GUIDELINE_CHECK
 	  Use available compiler flags to check coding guideline rules during
 	  the build.
 
-config NATIVE_BUILD
-	bool
-	select FULL_LIBC_SUPPORTED
-	select FULL_LIBCPP_SUPPORTED if CPP
-	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
 	prompt "Optimization level"
 	default NO_OPTIMIZATIONS    if COVERAGE
@@ -383,67 +306,14 @@ 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 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"
+	bool "Enable 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
 	string "Custom compiler options"
 	help
@@ -479,7 +349,7 @@ config NO_RUNTIME_CHECKS
 	  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 CHECK macro. This
 	  option is the default and the only option used during testing.
@@ -500,13 +370,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.
 
@@ -536,8 +402,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."
@@ -593,8 +458,7 @@ 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 "0x1c5f21b0" if SOC_ESP32
 	default "0xada52840" if SOC_NRF52840_QIAA
 	default "0x4fb2d5bd" if SOC_SERIES_IMX_RT
 	default "0x2abc77ec" if SOC_SERIES_LPC55XXX
@@ -614,7 +478,7 @@ config BUILD_OUTPUT_UF2_FAMILY_ID
 	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 "0x57755a57" if SOC_STM32F401XC || SOC_STM32F401XE
 	default "0x6d0922fa" if SOC_STM32F407XE
 	default "0x8fb060fe" if SOC_STM32F407XG
 	help
@@ -674,15 +538,6 @@ config BUILD_OUTPUT_INFO_HEADER
 	  - 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
@@ -730,65 +585,8 @@ config BUILD_OUTPUT_META_STATE_PROPAGATE
 	           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
-	depends on !NATIVE_LIBRARY
-	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), see CHECK_INIT_PRIORITIES_FAIL_ON_WARNING to fail on
-	  warnings (dependent devices, same priority) as well.
-
-config CHECK_INIT_PRIORITIES_FAIL_ON_WARNING
-	bool "Fail the build on priority check warnings"
-	depends on CHECK_INIT_PRIORITIES
-	help
-	  Fail the build if the dependency check script identifies any pair of
-	  devices depending on each other but initialized with the same
-	  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.
-
 endmenu
 
-config DEPRECATED
-	bool
-	help
-	  Symbol that must be selected by a feature or module if it is
-	  considered to be 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
@@ -802,28 +600,6 @@ config WARN_EXPERIMENTAL
 	  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
 
 
@@ -839,7 +615,7 @@ config IS_BOOTLOADER
 
 config BOOTLOADER_SRAM_SIZE
 	int "SRAM reserved for bootloader"
-	default 0
+	default 16
 	depends on !XIP || IS_BOOTLOADER
 	depends on ARM || XTENSA
 	help
@@ -849,10 +625,122 @@ config BOOTLOADER_SRAM_SIZE
 	  - Zephyr is a !XIP image, which implicitly assumes existence of a
 	  bootloader that loads the Zephyr !XIP image onto SRAM.
 
+config MCUBOOT
+	bool
+	help
+	  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 ""
+	depends on !MCUBOOT_GENERATE_UNSIGNED_IMAGE
+	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 a path to the same file as the
+	  BOOT_SIGNATURE_KEY_FILE option in your MCUboot .config. The path
+	  may be absolute or relative to the west workspace topdir. (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.)
+
+	  If left empty, you must sign the Zephyr binaries manually.
+
+config MCUBOOT_ENCRYPTION_KEY_FILE
+	string "Path to the mcuboot encryption key file"
+	default ""
+	depends on MCUBOOT_SIGNATURE_KEY_FILE != ""
+	help
+	  The file contains the public key that is used to encrypt the
+	  ephemeral key that encrypts the image. The corresponding
+	  private key is hard coded in the MCUboot source code and is
+	  used to decrypt the ephemeral key that is embedded in the
+	  image. The file is in PEM format.
+
+	  If set to a non-empty value, the build system tries to
+	  sign and encrypt the final binaries using a 'west sign -t imgtool'
+	  command. The binaries are placed in the build directory at
+	  zephyr/zephyr.signed.encrypted.bin and
+	  zephyr/zephyr.signed.encrypted.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 either be an absolute path or a path relative to
+	  the west workspace topdir.
+	  Example: './bootloader/mcuboot/enc-rsa2048-pub.pem'
+
+	  If left empty, you must encrypt 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_UNSIGNED_IMAGE
+	bool "Generate unsigned binary image bootable with MCUboot"
+	help
+	  Enabling this configuration allows automatic unsigned binary image
+	  generation when MCUboot signing key is not provided,
+	  i.e., MCUBOOT_SIGNATURE_KEY_FILE is left empty.
+
+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_FAMILY_ESP32 && !BOOTLOADER_MCUBOOT && !MCUBOOT
-	default	y
+	depends on (SOC_ESP32 || SOC_ESP32S2 || SOC_ESP32C3) && !BOOTLOADER_MCUBOOT
+	default y
 	help
 	  This option will trigger the compilation of the ESP-IDF bootloader
 	  inside the build folder.

README.rst

@@ -2,11 +2,7 @@
 
    <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/_static/images/logo-readme.svg">
      </p>
    </a>
 
@@ -26,9 +22,9 @@ 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
 
@@ -82,11 +78,11 @@ Here's a quick summary of resources to help you find your way around:
 .. _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/develop/getting_started/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/develop/getting_started/index.html#asking-for-help
+.. _Asking for Help Tips: https://docs.zephyrproject.org/latest/getting_started/index.html#asking-for-help

VERSION

@@ -1,5 +1,5 @@
 VERSION_MAJOR = 3
-VERSION_MINOR = 4
-PATCHLEVEL = 99
+VERSION_MINOR = 0
+PATCHLEVEL = 0
 VERSION_TWEAK = 0
 EXTRAVERSION =

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

@@ -33,8 +33,7 @@ config ARM
 	# 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 CPU_CORTEX_R || CPU_CORTEX_M
 	help
 	  ARM architecture
 
@@ -43,13 +42,10 @@ config ARM64
 	select ARCH_IS_SET
 	select 64BIT
 	select HAS_DTS
-	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
 	help
 	  ARM64 (AArch64) architecture
 
@@ -88,11 +84,9 @@ config X86
 	select ARCH_HAS_TIMING_FUNCTIONS
 	select ARCH_HAS_THREAD_LOCAL_STORAGE
 	select ARCH_HAS_DEMAND_PAGING
-	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
 	help
 	  x86 architecture
 
@@ -111,13 +105,7 @@ config RISCV
 	select ARCH_IS_SET
 	select HAS_DTS
 	select ARCH_SUPPORTS_COREDUMP
-	select ARCH_HAS_CODE_DATA_RELOCATION
 	select ARCH_HAS_THREAD_LOCAL_STORAGE
-	select IRQ_OFFLOAD_NESTED if IRQ_OFFLOAD
-	select USE_SWITCH_SUPPORTED
-	select USE_SWITCH
-	select SCHED_IPI_SUPPORTED if SMP
-	select BARRIER_OPERATIONS_BUILTIN
 	imply XIP
 	help
 	  RISCV architecture
@@ -128,9 +116,6 @@ config XTENSA
 	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
 	imply ATOMIC_OPERATIONS_ARCH
 	help
 	  Xtensa architecture
@@ -143,9 +128,8 @@ config ARCH_POSIX
 	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
 	help
 	  POSIX (native) architecture
 
@@ -157,12 +141,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
@@ -173,14 +159,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
@@ -209,7 +187,7 @@ config SRAM_BASE_ADDRESS
 	  /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 || ARM64 || NIOS2 || X86
 
 # Workaround for not being able to have commas in macro arguments
 DT_CHOSEN_Z_FLASH := zephyr,flash
@@ -230,7 +208,7 @@ config FLASH_BASE_ADDRESS
 	  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 || ARM64 || ARC || NIOS2 || X86
 
 if ARCH_HAS_TRUSTED_EXECUTION
 
@@ -280,7 +258,6 @@ 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
@@ -295,7 +272,6 @@ config USERSPACE
 
 config PRIVILEGED_STACK_SIZE
 	int "Size of privileged stack"
-	default 2048 if EMUL
 	default 1024
 	depends on ARCH_HAS_USERSPACE
 	help
@@ -397,29 +373,12 @@ config NOCACHE_MEMORY
 menu "Interrupt Configuration"
 
 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
@@ -439,35 +398,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
@@ -480,14 +410,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
@@ -502,21 +431,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 EXTRA_EXCEPTION_INFO
 	bool "Collect extra exception info"
@@ -526,18 +447,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
@@ -613,14 +522,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
-
 #
 # Other architecture related options
 #
@@ -628,12 +529,6 @@ config ARCH_HAS_STACK_CANARIES_TLS
 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
 #
@@ -648,7 +543,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
@@ -689,16 +584,6 @@ config ARCH_HAS_RESERVED_PAGE_FRAMES
 	  memory mappings. The architecture will need to implement
 	  arch_reserved_pages_update().
 
-config CPU_HAS_DCACHE
-	bool
-	help
-	  This hidden configuration should be selected when the CPU has a d-cache.
-
-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
@@ -719,28 +604,14 @@ config ARCH_MAPS_ALL_RAM
 	  this mapping at all; non-kernel pages will be considered free (unless marked
 	  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
-	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.
-
 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
@@ -812,19 +683,10 @@ 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 "Floating Point Options"
 
 config FPU
-	bool "Floating point unit (FPU)"
+	bool "Enable floating point unit (FPU)"
 	depends on CPU_HAS_FPU
 	help
 	  This option enables the hardware Floating Point Unit (FPU), in order to
@@ -864,30 +726,15 @@ 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_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
@@ -898,8 +745,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
@@ -910,7 +757,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
@@ -921,8 +768,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
@@ -933,17 +780,17 @@ config ICACHE_LINE_SIZE
 choice CACHE_TYPE
 	prompt "Cache type"
 	depends on CACHE_MANAGEMENT
-	default ARCH_CACHE
+	default HAS_ARCH_CACHE
 
-config ARCH_CACHE
+config HAS_ARCH_CACHE
 	bool "Integrated cache controller"
 	help
-	  Integrated on-core cache controller
+	  "Integrade on-core cache controller"
 
-config EXTERNAL_CACHE
+config HAS_EXTERNAL_CACHE
 	bool "External cache controller"
 	help
-	  External cache controller
+	  "External cache controller or cache management system"
 
 endchoice
 
@@ -975,6 +822,15 @@ config SOC_FAMILY
 	  This option holds the directory name used by the build system to locate
 	  the correct linker and header files.
 
+config BOARD
+	string
+	help
+	  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>
+
 config TOOLCHAIN_HAS_BUILTIN_FFS
 	bool
 	default y if !(64BIT && RISCV)

arch/arc/CMakeLists.txt

@@ -12,36 +12,15 @@ 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()
+if(CONFIG_ISA_ARCV2)
+  # Instruct compiler to use register R26 as thread pointer
+  # for thread local storage.
+  # For ARCv3 the register is fixed to r30, so we don't need to specify it
+  zephyr_cc_option_ifdef(CONFIG_THREAD_LOCAL_STORAGE -mtp-regno=26)
 endif()
 
 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

@@ -31,7 +31,6 @@ 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
@@ -39,7 +38,6 @@ config ISA_ARCV2
 
 config ISA_ARCV3
 	bool "ARC ISA v3"
-	select ARCH_HAS_SINGLE_THREAD_SUPPORT if !SMP
 	select USE_SWITCH
 	select USE_SWITCH_SUPPORTED
 
@@ -76,45 +74,23 @@ config CPU_EM4_FPUDA
 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
+	  If y, the SoC uses an ARC HS3x or 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
 
@@ -179,7 +155,6 @@ 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
@@ -193,7 +168,7 @@ config ARC_FIRQ
 	  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
@@ -245,7 +220,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
@@ -286,8 +261,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 CPU_HS3X
 	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
@@ -346,13 +321,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
@@ -385,13 +358,6 @@ config ARC_EXCEPTION_DEBUG
 	  and parameters, at a cost of code/data size for the human-readable
 	  strings.
 
-config ARC_EARLY_SOC_INIT
-	bool "Make early stage SoC-specific initialization"
-	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.
-
 endmenu
 
 config MAIN_STACK_SIZE
@@ -409,7 +375,7 @@ config IDLE_STACK_SIZE
 config IPM_CONSOLE_STACK_SIZE
 	default 2048 if 64BIT
 
-config TEST_EXTRA_STACK_SIZE
+config TEST_EXTRA_STACKSIZE
 	default 2048 if 64BIT
 
 config CMSIS_THREAD_MAX_STACK_SIZE

arch/arc/arcmwdt/CMakeLists.txt

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

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

@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/toolchain.h>
+#include <toolchain.h>
 
 __weak void *__dso_handle;
 

arch/arc/core/CMakeLists.txt

@@ -19,7 +19,7 @@ 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)

arch/arc/core/arc_connect.c

@@ -10,9 +10,9 @@
  *
  */
 
-#include <zephyr/kernel.h>
-#include <zephyr/arch/cpu.h>
-#include <zephyr/spinlock.h>
+#include <kernel.h>
+#include <arch/cpu.h>
+#include <spinlock.h>
 #include <kernel_internal.h>
 
 static struct k_spinlock arc_connect_spinlock;
@@ -20,7 +20,7 @@ static struct k_spinlock arc_connect_spinlock;
 /* 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 +28,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 +38,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 +51,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 +64,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 +85,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 +94,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 +103,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 +112,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 +123,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 +137,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 +148,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 +161,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 +174,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 +187,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 +198,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 +233,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 +241,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 +249,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 +260,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 +273,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 +284,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 +292,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 +302,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 +317,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 +328,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 +342,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 +353,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 +364,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 +372,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 +382,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 +395,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 +406,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 +417,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 +433,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

@@ -9,18 +9,24 @@
  * @brief codes required for ARC multicore and Zephyr smp support
  *
  */
-#include <zephyr/device.h>
-#include <zephyr/kernel.h>
-#include <zephyr/kernel_structs.h>
+#include <device.h>
+#include <kernel.h>
+#include <kernel_structs.h>
 #include <ksched.h>
-#include <zephyr/init.h>
-#include <zephyr/irq.h>
-#include <arc_irq_offload.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_MAX_NUM_CPUS];
+} arc_cpu_init[CONFIG_MP_NUM_CPUS];
 
 /*
  * arc_cpu_wake_flag is used to sync up master core and slave cores
@@ -36,7 +42,7 @@ 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_MAX_NUM_CPUS];
+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,
@@ -65,14 +71,7 @@ static void arc_connect_debug_mask_update(int cpu_num)
 {
 	uint32_t core_mask = 1 << cpu_num;
 
-	/*
-	 * MDB debugger may modify debug_select and debug_mask registers on start, so we can't
-	 * rely on debug_select reset value.
-	 */
-	if (cpu_num != ARC_MP_PRIMARY_CPU_ID) {
-		core_mask |= z_arc_connect_debug_select_read();
-	}
-
+	core_mask |= z_arc_connect_debug_select_read();
 	z_arc_connect_debug_select_set(core_mask);
 	/* Debugger halts cores at all conditions:
 	 * ARC_CONNECT_CMD_DEBUG_MASK_H: Core global halt.
@@ -86,8 +85,6 @@ static void arc_connect_debug_mask_update(int cpu_num)
 }
 #endif
 
-void arc_core_private_intc_init(void);
-
 /* the C entry of slave cores */
 void z_arc_slave_start(int cpu_num)
 {
@@ -105,14 +102,9 @@ void z_arc_slave_start(int cpu_num)
 
 	z_irq_setup();
 
-	arc_core_private_intc_init();
-
-	arc_irq_offload_init_smp();
-
 	z_arc_connect_ici_clear();
-	z_irq_priority_set(DT_IRQN(DT_NODELABEL(ici)),
-			   DT_IRQ(DT_NODELABEL(ici), priority), 0);
-	irq_enable(DT_IRQN(DT_NODELABEL(ici)));
+	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;
@@ -138,15 +130,14 @@ void arch_sched_ipi(void)
 	/* broadcast sched_ipi request to other cores
 	 * if the target is current core, hardware will ignore it
 	 */
-	unsigned int num_cpus = arch_num_cpus();
-
-	for (i = 0U; i < num_cpus; i++) {
+	for (i = 0U; i < CONFIG_MP_NUM_CPUS; i++) {
 		z_arc_connect_ici_generate(i);
 	}
 }
 
-static int arc_smp_init(void)
+static int arc_smp_init(const struct device *dev)
 {
+	ARG_UNUSED(dev);
 	struct arc_connect_bcr bcr;
 
 	/* necessary master core init */
@@ -156,17 +147,16 @@ static int arc_smp_init(void)
 
 	if (bcr.dbg) {
 		/* configure inter-core debug unit if available */
-		arc_connect_debug_mask_update(ARC_MP_PRIMARY_CPU_ID);
+		arc_connect_debug_mask_update(0);
 	}
 
 	if (bcr.ipi) {
 	/* register ici interrupt, just need master core to register once */
 		z_arc_connect_ici_clear();
-		IRQ_CONNECT(DT_IRQN(DT_NODELABEL(ici)),
-			    DT_IRQ(DT_NODELABEL(ici), priority),
-			    sched_ipi_handler, NULL, 0);
+		IRQ_CONNECT(IRQ_ICI, ARCV2_ICI_IRQ_PRIORITY,
+		    sched_ipi_handler, NULL, 0);
 
-		irq_enable(DT_IRQN(DT_NODELABEL(ici)));
+		irq_enable(IRQ_ICI);
 	} else {
 		__ASSERT(0,
 			"ARC connect has no inter-core interrupt\n");
@@ -178,7 +168,7 @@ static int arc_smp_init(void)
 		z_arc_connect_gfrc_enable();
 
 		/* when all cores halt, gfrc halt */
-		z_arc_connect_gfrc_core_set((1 << arch_num_cpus()) - 1);
+		z_arc_connect_gfrc_core_set((1 << CONFIG_MP_NUM_CPUS) - 1);
 		z_arc_connect_gfrc_clear();
 	} else {
 		__ASSERT(0,

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,12 +61,7 @@ void arch_dcache_enable(void)
 	dcache_dc_ctrl(DC_CTRL_DC_ENABLE);
 }
 
-void arch_dcache_disable(void)
-{
-	/* nothing */
-}
-
-int arch_dcache_flush_range(void *start_addr_ptr, size_t size)
+static void arch_dcache_flush(void *start_addr_ptr, size_t size)
 {
 	size_t line_size = sys_cache_data_line_size_get();
 	uintptr_t start_addr = (uintptr_t)start_addr_ptr;
@@ -73,7 +69,7 @@ int arch_dcache_flush_range(void *start_addr_ptr, size_t size)
 	unsigned int key;
 
 	if (!dcache_available() || (size == 0U) || line_size == 0U) {
-		return -ENOTSUP;
+		return;
 	}
 
 	end_addr = start_addr + size;
@@ -99,10 +95,9 @@ 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();
 	uintptr_t start_addr = (uintptr_t)start_addr_ptr;
@@ -110,7 +105,7 @@ int arch_dcache_invd_range(void *start_addr_ptr, size_t size)
 	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,57 +157,9 @@ size_t arch_dcache_line_size_get(void)
 }
 #endif
 
-void arch_icache_enable(void)
-{
-	/* nothing */
-}
-
-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)
+static int init_dcache(const struct device *unused)
 {
+	ARG_UNUSED(unused);
 
 	arch_dcache_enable();
 

arch/arc/core/cpu_idle.S

@@ -11,12 +11,12 @@
  * 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>
+#include <arch/arc/asm-compat/assembler.h>
 
 GTEXT(arch_cpu_idle)
 GTEXT(arch_cpu_atomic_idle)

arch/arc/core/dsp/Kconfig

@@ -1,75 +0,0 @@
-# Digital Signal Processing (DSP) configuration options
-
-# Copyright (c) 2022 Synopsys
-# SPDX-License-Identifier: Apache-2.0
-
-config ARC_HAS_DSP
-	bool
-	help
-	  This option is enabled when the ARC CPU has hardware DSP unit.
-
-menu "ARC DSP Options"
-depends on ARC_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 ARC_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 ARC_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_ARC_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_ARC_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_ARC_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,11 +13,11 @@
  * 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)
@@ -145,13 +145,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 +239,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

arch/arc/core/fatal.c

@@ -12,12 +12,12 @@
  * ARCv2 CPUs.
  */
 
-#include <zephyr/kernel.h>
+#include <kernel.h>
 #include <offsets_short.h>
-#include <zephyr/arch/cpu.h>
-#include <zephyr/logging/log.h>
+#include <arch/cpu.h>
+#include <logging/log.h>
 #include <kernel_arch_data.h>
-#include <zephyr/arch/arc/v2/exc.h>
+#include <arch/arc/v2/exc.h>
 
 LOG_MODULE_DECLARE(os, CONFIG_KERNEL_LOG_LEVEL);
 

arch/arc/core/fault.c

@@ -11,15 +11,15 @@
  * Common fault handler for ARCv2 processors.
  */
 
-#include <zephyr/toolchain.h>
-#include <zephyr/linker/sections.h>
+#include <toolchain.h>
+#include <linker/sections.h>
 #include <inttypes.h>
 
-#include <zephyr/kernel.h>
+#include <kernel.h>
 #include <kernel_internal.h>
-#include <zephyr/kernel_structs.h>
-#include <zephyr/arch/common/exc_handle.h>
-#include <zephyr/logging/log.h>
+#include <kernel_structs.h>
+#include <exc_handle.h>
+#include <logging/log.h>
 LOG_MODULE_DECLARE(os, CONFIG_KERNEL_LOG_LEVEL);
 
 #ifdef CONFIG_USERSPACE
@@ -51,10 +51,8 @@ static const struct z_exc_handle exceptions[] = {
  */
 static bool z_check_thread_stack_fail(const uint32_t fault_addr, uint32_t sp)
 {
-	uint32_t guard_end, guard_start;
-
-#if defined(CONFIG_MULTITHREADING)
 	const struct k_thread *thread = _current;
+	uint32_t guard_end, guard_start;
 
 	if (!thread) {
 		/* TODO: Under what circumstances could we get here ? */
@@ -88,7 +86,6 @@ static bool z_check_thread_stack_fail(const uint32_t fault_addr, uint32_t sp)
 		guard_end = thread->stack_info.start;
 		guard_start = guard_end - Z_ARC_STACK_GUARD_SIZE;
 	}
-#endif /* CONFIG_MULTITHREADING */
 
 	 /* treat any MPU exceptions within the guard region as a stack
 	  * overflow.As some instrustions

arch/arc/core/fault_s.S

@@ -12,12 +12,12 @@
  * Fault handlers for ARCv2 processors.
  */
 
-#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>
-#include <zephyr/syscall.h>
-#include <zephyr/arch/arc/asm-compat/assembler.h>
+#include <syscall.h>
+#include <arch/arc/asm-compat/assembler.h>
 
 GTEXT(_Fault)
 GTEXT(__reset)
@@ -34,6 +34,9 @@ GTEXT(__ev_extension)
 GTEXT(__ev_div_zero)
 GTEXT(__ev_dc_error)
 GTEXT(__ev_maligned)
+#ifdef CONFIG_IRQ_OFFLOAD
+GTEXT(z_irq_do_offload);
+#endif
 
 .macro _save_exc_regs_into_stack
 #ifdef CONFIG_ARC_HAS_SECURE
@@ -116,12 +119,7 @@ _exc_return:
 
 	_get_next_switch_handle
 
-	BREQR r0, 0, _exc_return_from_exc
-
-	/* Save old thread into switch handle which is required by z_sched_switch_spin which
-	 * will be called during old thread abort.
-	 */
-	STR r2, r2, ___thread_t_switch_handle_OFFSET
+	BREQR r0, r2, _exc_return_from_exc
 
 	MOVR r2, r0
 
@@ -233,4 +231,38 @@ valid_syscall_id:
 
 _do_non_syscall_trap:
 #endif /* CONFIG_USERSPACE */
+#ifdef CONFIG_IRQ_OFFLOAD
+	/*
+	 * IRQ_OFFLOAD is to simulate interrupt handling through exception,
+	 * so its entry is different with normal exception handling, it is
+	 * handled in isr stack
+	 */
+	CMPR ilink, _TRAP_S_SCALL_IRQ_OFFLOAD
+	bne _exc_entry
+	/* save caller saved registers */
+	_create_irq_stack_frame
+
+	_save_exc_regs_into_stack
+
+	/* check whether irq stack is used */
+	_check_and_inc_int_nest_counter r0, r1
+
+	bne.d exc_nest_handle
+	MOVR r0, sp
+
+	_get_curr_cpu_irq_stack sp
+exc_nest_handle:
+	PUSHR r0
+
+	jl z_irq_do_offload
+
+	POPR sp
+
+	_dec_int_nest_counter r0, r1
+
+	_pop_irq_stack_frame
+
+	/* ERSTATUS, ERET are not changed, so ok to rtie */
+	rtie
+#endif /* CONFIG_IRQ_OFFLOAD */
 	b _exc_entry

arch/arc/core/irq_manage.c

@@ -17,14 +17,14 @@
  * number from 16 to last IRQ number on the platform.
  */
 
-#include <zephyr/kernel.h>
-#include <zephyr/arch/cpu.h>
-#include <zephyr/sys/__assert.h>
-#include <zephyr/toolchain.h>
-#include <zephyr/linker/sections.h>
-#include <zephyr/sw_isr_table.h>
-#include <zephyr/irq.h>
-#include <zephyr/sys/printk.h>
+#include <kernel.h>
+#include <arch/cpu.h>
+#include <sys/__assert.h>
+#include <toolchain.h>
+#include <linker/sections.h>
+#include <sw_isr_table.h>
+#include <irq.h>
+#include <sys/printk.h>
 
 
 /*
@@ -32,7 +32,7 @@
  */
 #if defined(CONFIG_ARC_FIRQ_STACK)
 #if defined(CONFIG_SMP)
-K_KERNEL_STACK_ARRAY_DEFINE(_firq_interrupt_stack, CONFIG_MP_MAX_NUM_CPUS,
+K_KERNEL_STACK_ARRAY_DEFINE(_firq_interrupt_stack, CONFIG_MP_NUM_CPUS,
 			    CONFIG_ARC_FIRQ_STACK_SIZE);
 #else
 K_KERNEL_STACK_DEFINE(_firq_interrupt_stack, CONFIG_ARC_FIRQ_STACK_SIZE);
@@ -81,53 +81,6 @@ void z_arc_firq_stack_set(void)
 }
 #endif
 
-/*
- * ARC CPU interrupt controllers hierarchy.
- *
- * Single-core (UP) case:
- *
- *   --------------------------
- *   |  CPU core 0            |
- *   --------------------------
- *   |  core 0 (private)      |
- *   |  interrupt controller  |
- *   --------------------------
- *               |
- *      [internal interrupts]
- *      [external interrupts]
- *
- *
- * Multi-core (SMP) case:
- *
- *   --------------------------               --------------------------
- *   |  CPU core 0            |               |  CPU core 1            |
- *   --------------------------               --------------------------
- *   |  core 0 (private)      |               |  core 1 (private)      |
- *   |  interrupt controller  |               |  interrupt controller  |
- *   --------------------------               --------------------------
- *     |    |      |                                |     |      |
- *     |    | [core 0 private internal interrupts]  |     |   [core 1 private internal interrupts]
- *     |    |                                       |     |
- *     |    |                                       |     |
- *     |   -------------------------------------------    |
- *     |   |     IDU (Interrupt Distribution Unit)   |    |
- *     |   -------------------------------------------    |
- *     |                       |                          |
- *     |          [common (shared) interrupts]            |
- *     |                                                  |
- *     |                                                  |
- *   [core 0 private external interrupts]               [core 1 private external interrupts]
- *
- *
- *
- *  The interrupts are grouped in HW in the same order - firstly internal interrupts
- *  (with lowest line numbers in IVT), than common interrupts (if present), than external
- *  interrupts (with highest line numbers in IVT).
- *
- *  NOTE: in case of SMP system we currently support in Zephyr only private internal and common
- *  interrupts, so the core-private external interrupts are currently not supported for SMP.
- */
-
 /**
  * @brief Enable an interrupt line
  *
@@ -135,7 +88,11 @@ void z_arc_firq_stack_set(void)
  * line. After this call, the CPU will receive interrupts for the specified
  * @a irq.
  */
-void arch_irq_enable(unsigned int irq);
+
+void arch_irq_enable(unsigned int irq)
+{
+	z_arc_v2_irq_unit_int_enable(irq);
+}
 
 /**
  * @brief Disable an interrupt line
@@ -143,7 +100,11 @@ void arch_irq_enable(unsigned int irq);
  * Disable an interrupt line. After this call, the CPU will stop receiving
  * interrupts for the specified @a irq.
  */
-void arch_irq_disable(unsigned int irq);
+
+void arch_irq_disable(unsigned int irq)
+{
+	z_arc_v2_irq_unit_int_disable(irq);
+}
 
 /**
  * @brief Return IRQ enable state
@@ -151,55 +112,10 @@ void arch_irq_disable(unsigned int irq);
  * @param irq IRQ line
  * @return interrupt enable state, true or false
  */
-int arch_irq_is_enabled(unsigned int irq);
-
-#ifdef CONFIG_ARC_CONNECT
-
-#define IRQ_NUM_TO_IDU_NUM(id)		((id) - ARC_CONNECT_IDU_IRQ_START)
-#define IRQ_IS_COMMON(id)		((id) >= ARC_CONNECT_IDU_IRQ_START)
-
-void arch_irq_enable(unsigned int irq)
-{
-	if (IRQ_IS_COMMON(irq)) {
-		z_arc_connect_idu_set_mask(IRQ_NUM_TO_IDU_NUM(irq), 0x0);
-	} else {
-		z_arc_v2_irq_unit_int_enable(irq);
-	}
-}
-
-void arch_irq_disable(unsigned int irq)
-{
-	if (IRQ_IS_COMMON(irq)) {
-		z_arc_connect_idu_set_mask(IRQ_NUM_TO_IDU_NUM(irq), 0x1);
-	} else {
-		z_arc_v2_irq_unit_int_disable(irq);
-	}
-}
-
-int arch_irq_is_enabled(unsigned int irq)
-{
-	if (IRQ_IS_COMMON(irq)) {
-		return !z_arc_connect_idu_read_mask(IRQ_NUM_TO_IDU_NUM(irq));
-	} else {
-		return z_arc_v2_irq_unit_int_enabled(irq);
-	}
-}
-#else
-void arch_irq_enable(unsigned int irq)
-{
-	z_arc_v2_irq_unit_int_enable(irq);
-}
-
-void arch_irq_disable(unsigned int irq)
-{
-	z_arc_v2_irq_unit_int_disable(irq);
-}
-
 int arch_irq_is_enabled(unsigned int irq)
 {
 	return z_arc_v2_irq_unit_int_enabled(irq);
 }
-#endif /* CONFIG_ARC_CONNECT */
 
 /**
  * @internal
@@ -219,7 +135,7 @@ void z_irq_priority_set(unsigned int irq, unsigned int prio, uint32_t flags)
 
 	__ASSERT(prio < CONFIG_NUM_IRQ_PRIO_LEVELS,
 		 "invalid priority %d for irq %d", prio, irq);
-/* 0 -> CONFIG_NUM_IRQ_PRIO_LEVELS allocated to secure world
+/* 0 -> CONFIG_NUM_IRQ_PRIO_LEVELS allocted to secure world
  * left prio levels allocated to normal world
  */
 #if defined(CONFIG_ARC_SECURE_FIRMWARE)

arch/arc/core/irq_offload.c

@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2015 Intel corporation
- * Copyright (c) 2022 Synopsys
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -9,63 +8,26 @@
  * @file Software interrupts utility code - ARC implementation
  */
 
-#include <zephyr/kernel.h>
-#include <zephyr/irq_offload.h>
-#include <zephyr/init.h>
+#include <kernel.h>
+#include <irq_offload.h>
 
-/* Choose a reasonable default for interrupt line which is used for irq_offload with the option
- * to override it by setting interrupt line via device tree.
- */
-#if DT_NODE_EXISTS(DT_NODELABEL(test_irq_offload_line_0))
-#define IRQ_OFFLOAD_LINE	DT_IRQN(DT_NODELABEL(test_irq_offload_line_0))
-#else
-/* Last two lined are already used in the IRQ tests, so we choose 3rd from the end line */
-#define IRQ_OFFLOAD_LINE	(CONFIG_NUM_IRQS - 3)
-#endif
+static irq_offload_routine_t offload_routine;
+static const void *offload_param;
 
-#define IRQ_OFFLOAD_PRIO	0
-
-#define CURR_CPU (IS_ENABLED(CONFIG_SMP) ? arch_curr_cpu()->id : 0)
-
-static struct {
-	volatile irq_offload_routine_t fn;
-	const void *volatile arg;
-} offload_params[CONFIG_MP_MAX_NUM_CPUS];
-
-static void arc_irq_offload_handler(const void *unused)
+/* Called by trap_s exception handler */
+void z_irq_do_offload(void)
 {
-	ARG_UNUSED(unused);
-
-	offload_params[CURR_CPU].fn(offload_params[CURR_CPU].arg);
+	offload_routine(offload_param);
 }
 
 void arch_irq_offload(irq_offload_routine_t routine, const void *parameter)
 {
-	offload_params[CURR_CPU].fn = routine;
-	offload_params[CURR_CPU].arg = parameter;
-	compiler_barrier();
 
-	z_arc_v2_aux_reg_write(_ARC_V2_AUX_IRQ_HINT, IRQ_OFFLOAD_LINE);
+	offload_routine = routine;
+	offload_param = parameter;
 
-	__asm__ volatile("sync");
+	__asm__ volatile ("trap_s %[id]"
+		:
+		: [id] "i"(_TRAP_S_SCALL_IRQ_OFFLOAD) : );
 
-	/* If _current was aborted in the offload routine, we shouldn't be here */
-	__ASSERT_NO_MSG((_current->base.thread_state & _THREAD_DEAD) == 0);
 }
-
-/* need to be executed on every core in the system */
-int arc_irq_offload_init(void)
-{
-
-	IRQ_CONNECT(IRQ_OFFLOAD_LINE, IRQ_OFFLOAD_PRIO, arc_irq_offload_handler, NULL, 0);
-
-	/* The line is triggered and controlled with core private interrupt controller,
-	 * so even in case common (IDU) interrupt line usage on SMP we need to enable it not
-	 * with generic irq_enable() but via z_arc_v2_irq_unit_int_enable().
-	 */
-	z_arc_v2_irq_unit_int_enable(IRQ_OFFLOAD_LINE);
-
-	return 0;
-}
-
-SYS_INIT(arc_irq_offload_init, POST_KERNEL, 0);

arch/arc/core/isr_wrapper.S

@@ -14,13 +14,13 @@
  */
 
 #include <offsets_short.h>
-#include <zephyr/toolchain.h>
-#include <zephyr/linker/sections.h>
-#include <zephyr/sw_isr_table.h>
-#include <zephyr/kernel_structs.h>
-#include <zephyr/arch/cpu.h>
+#include <toolchain.h>
+#include <linker/sections.h>
+#include <sw_isr_table.h>
+#include <kernel_structs.h>
+#include <arch/cpu.h>
 #include <swap_macros.h>
-#include <zephyr/arch/arc/asm-compat/assembler.h>
+#include <arch/arc/asm-compat/assembler.h>
 
 GTEXT(_isr_wrapper)
 GTEXT(_isr_demux)
@@ -272,9 +272,7 @@ SECTION_FUNC(TEXT, _isr_demux)
 	PUSHR r30
 #ifdef CONFIG_ARC_HAS_ACCL_REGS
 	PUSHR r58
-#ifndef CONFIG_64BIT
 	PUSHR r59
-#endif /* !CONFIG_64BIT */
 #endif
 
 #ifdef CONFIG_SCHED_THREAD_USAGE
@@ -312,9 +310,7 @@ irq_hint_handled:
 #endif
 
 #ifdef CONFIG_ARC_HAS_ACCL_REGS
-#ifndef CONFIG_64BIT
 	POPR r59
-#endif /* !CONFIG_64BIT */
 	POPR r58
 #endif
 

arch/arc/core/mpu/Kconfig

@@ -5,12 +5,12 @@
 
 config ARC_MPU_VER
 	int "ARC MPU version"
-	range 2 8
+	range 2 6
 	default 2
 	help
 	  ARC MPU has several versions. For MPU v2, the minimum region is 2048 bytes;
 	  For other versions, the minimum region is 32 bytes; v4 has secure features,
-	  v6 supports up to 32 regions. Note: MPU v5 & v7 are not supported.
+	  v6 supports up to 32 regions.
 
 config ARC_CORE_MPU
 	bool "ARC Core MPU functionalities"
@@ -32,8 +32,8 @@ config ARC_MPU
 	select SRAM_REGION_PERMISSIONS
 	select ARC_CORE_MPU
 	select THREAD_STACK_INFO
-	select GEN_PRIV_STACKS if !(ARC_MPU_VER = 4 || ARC_MPU_VER = 8)
-	select MPU_REQUIRES_POWER_OF_TWO_ALIGNMENT if !(ARC_MPU_VER = 4 || ARC_MPU_VER = 8)
-	select MPU_REQUIRES_NON_OVERLAPPING_REGIONS if (ARC_MPU_VER = 4 || ARC_MPU_VER = 8)
+	select GEN_PRIV_STACKS if ARC_MPU_VER != 4
+	select MPU_REQUIRES_POWER_OF_TWO_ALIGNMENT if ARC_MPU_VER !=4
+	select MPU_REQUIRES_NON_OVERLAPPING_REGIONS if ARC_MPU_VER = 4
 	help
-	  Target has ARC MPU
+	  Target has ARC MPU (currently only works for EMSK 2.2/2.3 ARCEM7D)

arch/arc/core/mpu/arc_core_mpu.c

@@ -4,11 +4,12 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/device.h>
-#include <zephyr/init.h>
-#include <zephyr/kernel.h>
-#include <zephyr/arch/arc/v2/mpu/arc_core_mpu.h>
-#include <zephyr/kernel_structs.h>
+#include <device.h>
+#include <init.h>
+#include <kernel.h>
+#include <soc.h>
+#include <arch/arc/v2/mpu/arc_core_mpu.h>
+#include <kernel_structs.h>
 
 /*
  * @brief Configure MPU for the thread

arch/arc/core/mpu/arc_mpu.c

@@ -4,16 +4,17 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/device.h>
-#include <zephyr/init.h>
-#include <zephyr/kernel.h>
-#include <zephyr/arch/arc/v2/aux_regs.h>
-#include <zephyr/arch/arc/v2/mpu/arc_mpu.h>
-#include <zephyr/arch/arc/v2/mpu/arc_core_mpu.h>
-#include <zephyr/linker/linker-defs.h>
+#include <device.h>
+#include <init.h>
+#include <kernel.h>
+#include <soc.h>
+#include <arch/arc/v2/aux_regs.h>
+#include <arch/arc/v2/mpu/arc_mpu.h>
+#include <arch/arc/v2/mpu/arc_core_mpu.h>
+#include <linker/linker-defs.h>
 
 #define LOG_LEVEL CONFIG_MPU_LOG_LEVEL
-#include <zephyr/logging/log.h>
+#include <logging/log.h>
 LOG_MODULE_REGISTER(mpu);
 
 /**
@@ -51,7 +52,7 @@ static inline uint32_t get_region_attr_by_type(uint32_t type)
 	}
 }
 
-#if (CONFIG_ARC_MPU_VER == 4) || (CONFIG_ARC_MPU_VER == 8)
+#if CONFIG_ARC_MPU_VER == 4
 #include "arc_mpu_v4_internal.h"
 #else
 #include "arc_mpu_common_internal.h"

arch/arc/core/mpu/arc_mpu_common_internal.h

@@ -238,8 +238,9 @@ int arc_core_mpu_buffer_validate(void *addr, size_t size, int write)
  * This function provides the default configuration mechanism for the Memory
  * Protection Unit (MPU).
  */
-static int arc_mpu_init(void)
+static int arc_mpu_init(const struct device *arg)
 {
+	ARG_UNUSED(arg);
 
 	uint32_t num_regions = get_num_regions();
 

arch/arc/core/mpu/arc_mpu_v4_internal.h

@@ -132,7 +132,7 @@ static inline bool _is_user_accessible_region(uint32_t r_index, int write)
 	return false;
 }
 #else /* CONFIG_ARC_NORMAL_FIRMWARE */
-/* the following functions are prepared for SECURE_FIRMWARE */
+/* the following functions are prepared for SECURE_FRIMWARE */
 static inline void _region_init(uint32_t index, uint32_t region_addr, uint32_t size,
 				uint32_t region_attr)
 {
@@ -814,8 +814,9 @@ int arc_core_mpu_buffer_validate(void *addr, size_t size, int write)
  * This function provides the default configuration mechanism for the Memory
  * Protection Unit (MPU).
  */
-static int arc_mpu_init(void)
+static int arc_mpu_init(const struct device *arg)
 {
+	ARG_UNUSED(arg);
 	uint32_t num_regions;
 	uint32_t i;
 

arch/arc/core/offsets/offsets.c

@@ -22,13 +22,10 @@
  * completeness.
  */
 
-#include <zephyr/kernel.h>
+#include <kernel.h>
 #include <kernel_arch_data.h>
 #include <gen_offset.h>
 #include <kernel_offsets.h>
-#ifdef CONFIG_ARC_DSP_SHARING
-#include "../dsp/dsp_offsets.c"
-#endif
 
 GEN_OFFSET_SYM(_thread_arch_t, relinquish_cause);
 #ifdef CONFIG_ARC_STACK_CHECKING
@@ -79,6 +76,7 @@ GEN_OFFSET_SYM(_isf_t, status32);
 GEN_ABSOLUTE_SYM(___isf_t_SIZEOF, sizeof(_isf_t));
 
 GEN_OFFSET_SYM(_callee_saved_t, sp);
+GEN_ABSOLUTE_SYM(___callee_saved_t_SIZEOF, sizeof(_callee_saved_t));
 
 GEN_OFFSET_SYM(_callee_saved_stack_t, r13);
 GEN_OFFSET_SYM(_callee_saved_stack_t, r14);
@@ -106,9 +104,7 @@ GEN_OFFSET_SYM(_callee_saved_stack_t, user_sp);
 GEN_OFFSET_SYM(_callee_saved_stack_t, r30);
 #ifdef CONFIG_ARC_HAS_ACCL_REGS
 GEN_OFFSET_SYM(_callee_saved_stack_t, r58);
-#ifndef CONFIG_64BIT
 GEN_OFFSET_SYM(_callee_saved_stack_t, r59);
-#endif /* !CONFIG_64BIT */
 #endif
 #ifdef CONFIG_FPU_SHARING
 GEN_OFFSET_SYM(_callee_saved_stack_t, fpu_status);
@@ -119,8 +115,10 @@ GEN_OFFSET_SYM(_callee_saved_stack_t, dpfp2l);
 GEN_OFFSET_SYM(_callee_saved_stack_t, dpfp1h);
 GEN_OFFSET_SYM(_callee_saved_stack_t, dpfp1l);
 #endif
-#endif
 
+#endif
 GEN_ABSOLUTE_SYM(___callee_saved_stack_t_SIZEOF, sizeof(_callee_saved_stack_t));
 
+GEN_ABSOLUTE_SYM(_K_THREAD_NO_FLOAT_SIZEOF, sizeof(struct k_thread));
+
 GEN_ABS_SYM_END

arch/arc/core/prep_c.c

@@ -17,10 +17,10 @@
  */
 
 #include <zephyr/types.h>
-#include <zephyr/toolchain.h>
-#include <zephyr/linker/linker-defs.h>
-#include <zephyr/arch/arc/v2/aux_regs.h>
-#include <zephyr/kernel_structs.h>
+#include <toolchain.h>
+#include <linker/linker-defs.h>
+#include <arch/arc/v2/aux_regs.h>
+#include <kernel_structs.h>
 #include <kernel_internal.h>
 
 

arch/arc/core/regular_irq.S

@@ -14,13 +14,13 @@
  * 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>
-#include <zephyr/arch/arc/asm-compat/assembler.h>
+#include <arch/arc/asm-compat/assembler.h>
 
 GTEXT(_rirq_enter)
 GTEXT(_rirq_exit)
@@ -239,13 +239,14 @@ SECTION_FUNC(TEXT, _rirq_exit)
 
 	jne _rirq_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
+	CMPR r0, r2
 	beq _rirq_no_switch
 
 #ifdef CONFIG_ARC_SECURE_FIRMWARE
@@ -254,13 +255,12 @@ SECTION_FUNC(TEXT, _rirq_exit)
 	push_s r3
 #endif
 
-	/* r2 is old thread
-	 * _thread_arch.relinquish_cause is 32 bit despite of platform bittnes
-	 */
-	_st32_huge_offset _CAUSE_RIRQ, r2, _thread_offset_to_relinquish_cause, r1
-
+	/* r2 is old thread */
 	_irq_store_old_thread_callee_regs
 
+	/* _thread_arch.relinquish_cause is 32 bit despite of platform bittnes */
+	_st32_huge_offset _CAUSE_RIRQ, r2, _thread_offset_to_relinquish_cause, r2
+
 	/* mov new thread (r0) to r2 */
 	MOVR r2, r0
 

arch/arc/core/reset.S

@@ -11,14 +11,11 @@
  * Reset handler that prepares the system for running C code.
  */
 
-#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>
-#include <zephyr/arch/arc/asm-compat/assembler.h>
-#ifdef CONFIG_ARC_EARLY_SOC_INIT
-  #include <soc_ctrl.h>
-#endif
+#include <arch/arc/asm-compat/assembler.h>
 
 GDATA(z_interrupt_stacks)
 GDATA(z_main_stack)
@@ -112,12 +109,6 @@ done_icache_invalidate:
 
 done_dcache_invalidate:
 
-#ifdef CONFIG_ARC_EARLY_SOC_INIT
-	soc_early_asm_init_percpu
-#endif
-
-	_dsp_extension_probe
-
 /*
  * Init ARC internal architecture state
  * Force to initialize internal architecture state to reset values
@@ -126,8 +117,8 @@ done_dcache_invalidate:
  * substitution of normal hardware reset sequence.
  */
 #ifdef CONFIG_INIT_ARCH_HW_AT_BOOT
-	/* Set MPU (v4 or v8) registers to default */
-#if CONFIG_ARC_MPU_VER == 4 || CONFIG_ARC_MPU_VER == 8
+	/* Set MPU (v4) registers to default */
+#if CONFIG_ARC_MPU_VER == 4
 	/* Set default reset value to _ARC_V2_MPU_EN register */
 #define ARC_MPU_EN_RESET_VALUE 0x400181C0
 	mov_s r1, ARC_MPU_EN_RESET_VALUE
@@ -151,7 +142,7 @@ done_mpu_regions_reset:
 #endif
 #endif
 
-#if defined(CONFIG_SMP) || CONFIG_MP_MAX_NUM_CPUS  > 1
+#if defined(CONFIG_SMP) || CONFIG_MP_NUM_CPUS  > 1
 	_get_cpu_id r0
 	breq r0, 0, _master_core_startup
 
@@ -159,7 +150,7 @@ done_mpu_regions_reset:
  * Non-masters wait for master core (core 0) to boot enough
  */
 _slave_core_wait:
-#if CONFIG_MP_MAX_NUM_CPUS == 1
+#if CONFIG_MP_NUM_CPUS == 1
 	kflag	1
 #endif
 	ld r1, [arc_cpu_wake_flag]

arch/arc/core/secureshield/arc_secure.S

@@ -3,9 +3,9 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-#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>
 
 .macro clear_scratch_regs
 	mov r1, 0

arch/arc/core/secureshield/arc_sjli.c

@@ -4,14 +4,14 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/device.h>
-#include <zephyr/kernel.h>
+#include <device.h>
+#include <kernel.h>
 #include <errno.h>
 #include <zephyr/types.h>
-#include <zephyr/init.h>
-#include <zephyr/toolchain.h>
+#include <init.h>
+#include <toolchain.h>
 
-#include <zephyr/arch/arc/v2/secureshield/arc_secure.h>
+#include <arch/arc/v2/secureshield/arc_secure.h>
 
 static void _default_sjli_entry(void);
 /*
@@ -34,7 +34,7 @@ static void _default_sjli_entry(void)
 }
 
 /*
- * @brief initialization of sjli related functions
+ * @brief initializaiton of sjli related functions
  *
  */
 static void sjli_table_init(void)
@@ -46,9 +46,9 @@ static void sjli_table_init(void)
 }
 
 /*
- * @brief initialization of secureshield related functions.
+ * @brief initializaiton of secureshield related functions.
  */
-static int arc_secureshield_init(void)
+static int arc_secureshield_init(const struct device *arg)
 {
 	sjli_table_init();
 

arch/arc/core/secureshield/secure_sys_services.c

@@ -4,12 +4,13 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 #include <errno.h>
-#include <zephyr/kernel.h>
-#include <zephyr/arch/cpu.h>
+#include <kernel.h>
+#include <arch/cpu.h>
 #include <zephyr/types.h>
-#include <zephyr/toolchain.h>
+#include <soc.h>
+#include <toolchain.h>
 
-#include <zephyr/arch/arc/v2/secureshield/arc_secure.h>
+#include <arch/arc/v2/secureshield/arc_secure.h>
 
 #define IRQ_PRIO_MASK (0xffff << ARC_N_IRQ_START_LEVEL)
 /*

arch/arc/core/switch.S

@@ -14,14 +14,14 @@
  * 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 <v2/irq.h>
 #include <swap_macros.h>
-#include <zephyr/arch/arc/asm-compat/assembler.h>
+#include <arch/arc/asm-compat/assembler.h>
 
 GTEXT(z_arc_switch)
 

arch/arc/core/thread.c

@@ -11,18 +11,15 @@
  * Core thread related primitives for the ARCv2 processor architecture.
  */
 
-#include <zephyr/kernel.h>
+#include <kernel.h>
 #include <ksched.h>
 #include <offsets_short.h>
+#include <wait_q.h>
 
 #ifdef CONFIG_USERSPACE
-#include <zephyr/arch/arc/v2/mpu/arc_core_mpu.h>
+#include <arch/arc/v2/mpu/arc_core_mpu.h>
 #endif
 
-#if defined(CONFIG_ARC_DSP) && defined(CONFIG_ARC_DSP_SHARING)
-#include <zephyr/arch/arc/v2/dsp/arc_dsp.h>
-static struct k_spinlock lock;
-#endif
 /*  initial stack frame */
 struct init_stack_frame {
 	uintptr_t pc;
@@ -124,15 +121,10 @@ static inline void arch_setup_callee_saved_regs(struct k_thread *thread,
 
 	ARG_UNUSED(regs);
 
-/* GCC uses tls pointer cached in register, MWDT just call for _mwget_tls */
-#if defined(CONFIG_THREAD_LOCAL_STORAGE) && !defined(__CCAC__)
+#ifdef CONFIG_THREAD_LOCAL_STORAGE
 #ifdef CONFIG_ISA_ARCV2
-#if __ARC_TLS_REGNO__ <= 0
-#error Compiler not configured for thread local storage
-#endif
-#define TLSREG _CONCAT(r, __ARC_TLS_REGNO__)
-	/* __ARC_TLS_REGNO__ is used for thread pointer for ARCv2 */
-	regs->TLSREG = thread->tls;
+	/* R26 is used for thread pointer for ARCv2 */
+	regs->r26 = thread->tls;
 #else
 	/* R30 is used for thread pointer for ARCv3 */
 	regs->r30 = thread->tls;
@@ -202,21 +194,12 @@ void arch_new_thread(struct k_thread *thread, k_thread_stack_t *stack,
 	/* initial values in all other regs/k_thread entries are irrelevant */
 }
 
-#ifdef CONFIG_MULTITHREADING
 void *z_arch_get_next_switch_handle(struct k_thread **old_thread)
 {
 	*old_thread =  _current;
 
-	return z_get_next_switch_handle(NULL);
+	return z_get_next_switch_handle(*old_thread);
 }
-#else
-void *z_arch_get_next_switch_handle(struct k_thread **old_thread)
-{
-	ARG_UNUSED(old_thread);
-
-	return NULL;
-}
-#endif
 
 #ifdef CONFIG_USERSPACE
 FUNC_NORETURN void arch_user_mode_enter(k_thread_entry_t user_entry,
@@ -270,53 +253,3 @@ int arch_float_enable(struct k_thread *thread, unsigned int options)
 	return 0;
 }
 #endif /* CONFIG_FPU && CONFIG_FPU_SHARING */
-
-#if !defined(CONFIG_MULTITHREADING)
-
-K_KERNEL_STACK_ARRAY_DECLARE(z_interrupt_stacks, CONFIG_MP_MAX_NUM_CPUS, CONFIG_ISR_STACK_SIZE);
-K_THREAD_STACK_DECLARE(z_main_stack, CONFIG_MAIN_STACK_SIZE);
-
-extern void z_main_no_multithreading_entry_wrapper(void *p1, void *p2, void *p3,
-						   void *main_stack, void *main_entry);
-
-FUNC_NORETURN void z_arc_switch_to_main_no_multithreading(k_thread_entry_t main_entry,
-							  void *p1, void *p2, void *p3)
-{
-	_kernel.cpus[0].id = 0;
-	_kernel.cpus[0].irq_stack = (Z_KERNEL_STACK_BUFFER(z_interrupt_stacks[0]) +
-				     K_KERNEL_STACK_SIZEOF(z_interrupt_stacks[0]));
-
-	void *main_stack = (Z_THREAD_STACK_BUFFER(z_main_stack) +
-			    K_THREAD_STACK_SIZEOF(z_main_stack));
-
-	arch_irq_unlock(_ARC_V2_INIT_IRQ_LOCK_KEY);
-
-	z_main_no_multithreading_entry_wrapper(p1, p2, p3, main_stack, main_entry);
-
-	CODE_UNREACHABLE; /* LCOV_EXCL_LINE */
-}
-#endif /* !CONFIG_MULTITHREADING */
-
-#if defined(CONFIG_ARC_DSP) && defined(CONFIG_ARC_DSP_SHARING)
-void arc_dsp_disable(struct k_thread *thread, unsigned int options)
-{
-	/* Ensure a preemptive context switch does not occur */
-	k_spinlock_key_t key = k_spin_lock(&lock);
-
-	/* Disable DSP or AGU capabilities for the thread */
-	thread->base.user_options &= ~(uint8_t)options;
-
-	k_spin_unlock(&lock, key);
-}
-
-void arc_dsp_enable(struct k_thread *thread, unsigned int options)
-{
-	/* Ensure a preemptive context switch does not occur */
-	k_spinlock_key_t key = k_spin_lock(&lock);
-
-	/* Enable dsp or agu capabilities for the thread */
-	thread->base.user_options |= (uint8_t)options;
-
-	k_spin_unlock(&lock, key);
-}
-#endif /* CONFIG_ARC_DSP && CONFIG_ARC_DSP_SHARING */

arch/arc/core/thread_entry_wrapper.S

@@ -11,10 +11,10 @@
  * Wrapper for z_thread_entry routine when called from the initial context.
  */
 
-#include <zephyr/toolchain.h>
-#include <zephyr/linker/sections.h>
+#include <toolchain.h>
+#include <linker/sections.h>
 #include <v2/irq.h>
-#include <zephyr/arch/arc/asm-compat/assembler.h>
+#include <arch/arc/asm-compat/assembler.h>
 
 GTEXT(z_thread_entry_wrapper)
 GTEXT(z_thread_entry_wrapper1)
@@ -35,24 +35,3 @@ z_thread_entry_wrapper1:
 	POPR r0
 	j z_thread_entry
 	nop
-
-
-#if !defined(CONFIG_MULTITHREADING)
-GTEXT(z_main_no_multithreading_entry_wrapper)
-
-/* void z_main_no_multithreading_entry_wrapper(*p1, *p2, *p3, *main_stack, *main_entry) */
-SECTION_FUNC(TEXT, z_main_no_multithreading_entry_wrapper)
-	MOVR sp, r3
-
-	/* *p1, *p2, *p3 are in r0, r1, r2 already */
-	jl [r4]
-	nop
-
-	/*
-	 * If we return from main we'll return from main wrapper and appear here.
-	 * Go to infinite loop as there is nothing more to do.
-	 */
-z_main_no_multithreading_entry_wrapper_end:
-	b z_main_no_multithreading_entry_wrapper_end
-
-#endif /* !CONFIG_MULTITHREADING */

arch/arc/core/timestamp.c

@@ -11,9 +11,9 @@
  * Provide 64-bit time stamp API
  */
 
-#include <zephyr/kernel.h>
-#include <zephyr/toolchain.h>
-#include <zephyr/kernel_structs.h>
+#include <kernel.h>
+#include <toolchain.h>
+#include <kernel_structs.h>
 
 /*
  * @brief Read 64-bit timestamp value