release: Zephyr v4.2.1

Set the version to v4.1.1

Signed-off-by: Fabio Baltieri <fabiobaltieri@google.com>
Signed-off-by: Benjamin Cabé <benjamin@zephyrproject.org>

.checkpatch.conf

@@ -29,4 +29,3 @@
 --ignore ENOSYS
 --ignore IS_ENABLED_CONFIG
 --ignore EXPORT_SYMBOL
---ignore COMPARISON_TO_NULL

.clang-format

@@ -82,7 +82,6 @@ ForEachMacros:
   - 'HTTP_SERVICE_FOREACH_RESOURCE'
   - 'I3C_BUS_FOR_EACH_I3CDEV'
   - 'I3C_BUS_FOR_EACH_I2CDEV'
-  - 'MIN_HEAP_FOREACH'
 IfMacros:
   - 'CHECKIF'
 # Disabled for now, see bug https://github.com/zephyrproject-rtos/zephyr/issues/48520
@@ -100,7 +99,6 @@ IndentCaseLabels: false
 IndentGotoLabels: false
 IndentWidth: 8
 InsertBraces: true
-InsertNewlineAtEOF: true
 SpaceBeforeInheritanceColon: False
 SpaceBeforeParens: ControlStatementsExceptControlMacros
 SortIncludes: Never

.editorconfig

@@ -86,10 +86,6 @@ indent_size = 8
 [COMMIT_EDITMSG]
 max_line_length = 75
 
-# Patches
-[{*.patch,*.diff}]
-trim_trailing_whitespace = false
-
 # Kconfig
 [Kconfig*]
 indent_style = tab

.github/ISSUE_TEMPLATE/001_bug_report.md

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

.github/ISSUE_TEMPLATE/001_bug_report.yml

@@ -1,85 +0,0 @@
-name: Bug Report
-description: File a bug report.
-labels: ["bug"]
-type: "Bug"
-assignees: []
-body:
-  - type: markdown
-    attributes:
-      value: |
-        Thanks for taking the time to fill out this bug report!
-  - type: textarea
-    id: what-happened
-    attributes:
-      label: Describe the bug
-      description: |
-        A clear and concise description of what the bug is.
-
-      placeholder: |
-        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?
-    validations:
-      required: true
-  - type: checkboxes
-    id: regression
-    attributes:
-      label: Regression
-      description: |
-        Check this box if this is a regression and provide a SHA if you were able to "git bisect" to a specific commit.
-      options:
-        - label: This is a regression.
-          required: false
-  - type: textarea
-    id: reproduce
-    attributes:
-      label: Steps to reproduce
-      description: |
-        Steps to reproduce the behavior.
-
-      placeholder: |
-        Steps to reproduce the behavior:
-          1. mkdir build; cd build
-          2. cmake -DBOARD=board\_xyz
-          3. make
-          4. See error
-    validations:
-      required: false
-  - type: textarea
-    id: logs
-    attributes:
-      label: Relevant log output
-      description: Please copy and paste any relevant log output. This will be automatically formatted into code, so no need for backticks.
-      render: shell
-  - type: dropdown
-    attributes:
-      label: Impact
-      description: Impact of this bug
-      multiple: false
-      options:
-        - Showstopper – Prevents release or major functionality; system unusable.
-        - Major – Severely degrades functionality; workaround is difficult or unavailable.
-        - Functional Limitation – Some features not working as expected, but system usable.
-        - Annoyance – Minor irritation; no significant impact on usability or functionality.
-        - Intermittent – Occurs occasionally; hard to reproduce.
-        - Not sure
-      default: 3
-    validations:
-      required: true
-  - type: textarea
-    id: env
-    attributes:
-      label: Environment
-      description: please complete the following information
-      placeholder: |
-       - OS: (e.g. Linux, MacOS, Windows)
-       - Toolchain (e.g Zephyr SDK, ...)
-       - Commit SHA or Version used
-  - type: textarea
-    id: context
-    attributes:
-      label: Additional Context
-      description: Provide other context that could be relevant to the bug, such as pin setting, target configuration,etc.

.github/ISSUE_TEMPLATE/002_enhancement.md

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

.github/ISSUE_TEMPLATE/002_enhancement.yml

@@ -1,42 +0,0 @@
-name: Enhancement
-description: Submit an Enhancement
-labels: ["Enhancement"]
-type: "Enhancement"
-assignees: []
-body:
-  - type: markdown
-    attributes:
-      value: |
-        Thanks for taking the time to fill out this enhancement proposal.
-  - type: textarea
-    id: description
-    attributes:
-      label: Summary
-      description: |
-        Is your enhancement proposal related to a problem? Please describe.
-      placeholder: |
-        A clear and concise description of what the problem is.
-    validations:
-      required: true
-  - type: textarea
-    id: solution
-    attributes:
-      label: Describe the solution you'd like
-      description: |
-        Describe the solution you'd like
-      placeholder: |
-        A clear and concise description of what you want to happen.
-    validations:
-      required: true
-  - type: textarea
-    id: alternatives
-    attributes:
-      label: Alternatives
-      description: Describe alternatives you've considered
-      placeholder: |
-        A clear and concise description of any alternative solutions or features you've considered.
-  - type: textarea
-    id: context
-    attributes:
-      label: Additional Context
-      description: Add any other context or graphics (drag-and-drop an image) about the enhancement here.

.github/ISSUE_TEMPLATE/003_rfc-proposal.md

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

.github/ISSUE_TEMPLATE/003_rfc-proposal.yml

@@ -1,75 +0,0 @@
-name: RFC / Proposal
-description: Submit a Proposal (RFC)
-labels: ["RFC"]
-type: RFC
-assignees: []
-body:
-  - type: markdown
-    attributes:
-      value: |
-        ## Introduction
-
-        This section targets end users, TSC members, maintainers and anyone else
-        that might need a quick explanation of your proposed change.
-
-  - type: textarea
-    id: problem-description
-    attributes:
-      label: Problem Description
-      description: Why do we want this change and what problem are we trying to address?
-      placeholder: Explain the problem or limitation this RFC is meant to resolve.
-    validations:
-      required: true
-
-  - type: textarea
-    id: proposed-change-summary
-    attributes:
-      label: Proposed Change (Summary)
-      description: A high-level summary of the proposed change.
-      placeholder: Brief summary of what will change if this RFC is implemented.
-    validations:
-      required: true
-
-  - type: markdown
-    attributes:
-      value: |
-        ## Detailed RFC
-
-        This section targets the development team. Upon reading it, each engineer
-        should understand what must be done to implement the proposed feature.
-
-  - type: textarea
-    id: detailed-change
-    attributes:
-      label: Proposed Change (Detailed)
-      description: Describe the change in as much detail as possible. Include context or background info, and reuse of existing components if applicable.
-      placeholder: Explain exactly what you’re planning to change and how.
-    validations:
-      required: true
-
-  - type: textarea
-    id: dependencies
-    attributes:
-      label: Dependencies
-      description: Highlight how this change may affect the rest of the project or other teams/components.
-      placeholder: List components, modules, or teams affected.
-    validations:
-      required: false
-
-  - type: textarea
-    id: concerns
-    attributes:
-      label: Concerns and Unresolved Questions
-      description: List any concerns, unknowns, or unresolved questions related to this proposal.
-      placeholder: Any areas of uncertainty?
-    validations:
-      required: false
-
-  - type: textarea
-    id: alternatives
-    attributes:
-      label: Alternatives Considered
-      description: What alternative solutions were considered? Why was this proposal chosen?
-      placeholder: List alternatives and explain the rationale behind your choice.
-    validations:
-      required: false

.github/ISSUE_TEMPLATE/004_feature_request.md

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

.github/ISSUE_TEMPLATE/004_feature_request.yml

@@ -1,29 +0,0 @@
-name: Feature Request
-description: Suggest a new feature or enhancement
-labels: ["Feature Request"]
-type: Feature
-assignees: []
-body:
-  - type: textarea
-    id: problem
-    attributes:
-      label: Is your feature request related to a problem? Please describe.
-      description: A clear and concise description of what the problem is.
-      placeholder: e.g., I'm frustrated when I need to do X manually because Y is missing.
-    validations:
-      required: true
-
-  - type: textarea
-    id: solution
-    attributes:
-      label: Describe the solution you'd like
-      description: A clear and concise description of what you want to happen.
-      placeholder: e.g., It would be great if the system could automatically handle X by doing Y.
-    validations:
-      required: true
-
-  - type: textarea
-    id: alternatives
-    attributes:
-      label: Describe alternatives you've considered
-      description: Include any alternative solutions or features

.github/ISSUE_TEMPLATE/006_nomination.md

@@ -0,0 +1,42 @@
+---
+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/006_nomination.yml

@@ -1,57 +0,0 @@
-name: Contributor Nomination
-description: Nominate a GitHub user for the Contributor role with triage permissions
-labels: [Role Nomination]
-assignees: ['nashif']
-body:
-  - type: markdown
-    attributes:
-      value: |
-        ## Background
-
-        The [TSC Project Roles](https://docs.zephyrproject.org/latest/project/project_roles.html) defines the main roles for the Zephyr Project, including Maintainer, Collaborator, and Contributor.
-
-        By default, anyone who contributes code or documentation is a Contributor, but with the lowest [GitHub Permission Level](https://docs.github.com/en/organizations/managing-access-to-your-organizations-repositories/repository-roles-for-an-organization) of **Read**.
-
-        Use this form to nominate a user for the **Contributor** role with **Triage** permission, which allows the user to:
-        - Add reviewers to pull requests
-        - Be added as a reviewer by others
-
-  - type: input
-    id: full-name
-    attributes:
-      label: Full Name
-      description: Full name of the nominated contributor.
-      placeholder: e.g., Jane Doe
-    validations:
-      required: true
-
-  - type: input
-    id: github-username
-    attributes:
-      label: GitHub Username
-      description: GitHub handle of the nominated contributor.
-      placeholder: e.g., @janedoe
-    validations:
-      required: true
-
-  - type: input
-    id: organization
-    attributes:
-      label: Organization
-      description: Organization the nominee is affiliated with (optional).
-      placeholder: e.g., Acme Corp
-    validations:
-      required: false
-
-  - type: textarea
-    id: supporting-documents
-    attributes:
-      label: Supporting Documents
-      description: Provide links to 3–5 pull requests authored or reviewed by the nominee that demonstrate their dedication to the Zephyr project.
-      placeholder: |
-        e.g.,
-        - https://github.com/zephyrproject-rtos/zephyr/pull/12345
-        - https://github.com/zephyrproject-rtos/zephyr/pull/23456
-        - https://github.com/zephyrproject-rtos/zephyr/pull/34567
-    validations:
-      required: true

.github/ISSUE_TEMPLATE/007_ext-source.md

@@ -0,0 +1,68 @@
+---
+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/007_ext-source.yml

@@ -1,106 +0,0 @@
-name: External Component Integration
-description: Propose integration of an external open source component
-labels: ["TSC"]
-assignees: []
-body:
-  - type: textarea
-    id: origin
-    attributes:
-      label: Origin
-      description: Name of project hosting the original open source code. Provide a link to the source.
-      placeholder: e.g., SQLite - https://sqlite.org
-    validations:
-      required: true
-
-  - type: textarea
-    id: purpose
-    attributes:
-      label: Purpose
-      description: Brief description of what this software does.
-      placeholder: |
-        e.g., A small, fast, self-contained SQL database engine.
-    validations:
-      required: true
-
-  - type: textarea
-    id: integration-mode
-    attributes:
-      label: Mode of Integration
-      description: Should this be integrated in the main tree or as a module? Explain your choice and suggest a module repo name if applicable.
-      placeholder: |
-        e.g., As a module - proposed repo name: zephyr-sqlite
-    validations:
-      required: true
-
-  - type: textarea
-    id: maintainership
-    attributes:
-      label: Maintainership
-      description: List maintainers (GitHub IDs) for this integration. Include at least one primary maintainer.
-      placeholder: |
-        e.g., @username1 (primary), @username2 (collaborator)
-    validations:
-      required: true
-
-  - type: input
-    id: pull-request
-    attributes:
-      label: Pull Request
-      description: Link to the pull request (if any) for this integration. Must be labeled "DNM" (Do Not Merge).
-      placeholder: |
-        e.g., https://github.com/zephyrproject-rtos/zephyr/pull/12345
-    validations:
-      required: false
-
-  - type: textarea
-    id: description
-    attributes:
-      label: Description
-      description: Long-form description to justify suitability of this component.
-      placeholder: |
-        - What is its primary functionality?
-        - What problem does it solve?
-        - Why is this the right component?
-    validations:
-      required: true
-
-  - type: textarea
-    id: security
-    attributes:
-      label: Security
-      description: Security-related aspects of this component, including cryptographic functions and known vulnerabilities.
-      placeholder: |
-        - Does it use cryptography?
-        - How are vulnerabilities handled?
-        - Any known CVEs?
-    validations:
-      required: false
-
-  - type: textarea
-    id: dependencies
-    attributes:
-      label: Dependencies
-      description: What does this component depend on, and how will it be integrated (directly or via abstraction)?
-      placeholder: |
-        - Other external packages?
-        - Direct or abstracted use in Zephyr?
-    validations:
-      required: false
-
-  - type: input
-    id: revision
-    attributes:
-      label: Version or SHA
-      description: Which version or specific commit should be initially integrated?
-      placeholder: e.g., v3.45.0 or 79cc94d
-    validations:
-      required: true
-
-  - type: input
-    id: license
-    attributes:
-      label: License (SPDX)
-      description: Provide the license using a valid SPDX identifier (e.g., BSD-3-Clause).
-      placeholder: e.g., MIT or BSD-3-Clause
-    validations:
-      required: true

.github/ISSUE_TEMPLATE/008_bin-blobs.md

@@ -0,0 +1,41 @@
+---
+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/config.yml

@@ -1,5 +0,0 @@
-blank_issues_enabled: false
-contact_links:
-  - name: Zephyr Community Support
-    url: https://github.com/zephyrproject-rtos/zephyr/discussions
-    about: Please ask and answer questions here.

.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 v4.3, the supported
+At this time, with the latest release of v4.0, the supported
 versions are:
 
-  - v4.3: Current release
-  - v4.2: Prior release
-  - v3.7: Current LTS
+  - v4.0: Current release
+  - v3.7: Prior release and Current LTS
+  - v2.7: Prior LTS
 
 ## Reporting process
 

.github/codeql/codeql-actions-config.yml

@@ -1,2 +0,0 @@
-paths:
-  - .github

.github/codeql/codeql-js-config.yml

@@ -1,2 +0,0 @@
-paths:
-  - doc

.github/dependabot.yml

@@ -1,12 +1,9 @@
 version: 2
-enable-beta-ecosystems: true
 updates:
   - package-ecosystem: "github-actions"
     directory: "/"
     schedule:
       interval: "weekly"
-    cooldown:
-      default-days: 7
     commit-message:
       prefix: "ci: github: "
     labels: []
@@ -14,17 +11,3 @@ updates:
       actions-deps:
         patterns:
           - "*"
-
-  - package-ecosystem: "uv"
-    directory: "/doc"
-    schedule:
-      interval: "weekly"
-    cooldown:
-      default-days: 7
-    commit-message:
-      prefix: "ci: doc: "
-    labels: []
-    groups:
-      doc-deps:
-        patterns:
-          - "*"

.github/workflows/assigner.yml

@@ -1,4 +1,4 @@
-name: Pull Request/Issue Assigner
+name: Pull Request Assigner
 
 on:
   pull_request_target:
@@ -15,74 +15,37 @@ on:
     types:
     - labeled
 
-permissions:
-  contents: read
-
 jobs:
   assignment:
-    name: Pull Request/Issue Assignment
+    name: Pull Request Assignment
     if: github.event.pull_request.draft == false
-    runs-on: ubuntu-24.04
-    permissions:
-      issues: write        # to add assignees to issues
+    runs-on: ubuntu-22.04
 
     steps:
+    - name: Install Python dependencies
+      run: |
+        pip install -U PyGithub>=1.55 west
+
     - name: Check out source code
-      uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
-      with:
-        fetch-depth: 0
-        persist-credentials: false
-
-    - name: Set up Python
-      uses: zephyrproject-rtos/action-python-env@32e53bef090c33d53aa94f1d9a9d29c93cfdc5f7 # main
-      with:
-        python-version: 3.12
-
-    - name: Fetch west.yml/Maintainer.yml from pull request
-      if: >
-        github.event_name == 'pull_request_target' && github.base_ref == 'main'
-      run: |
-        git fetch origin pull/${{ github.event.pull_request.number }}/merge
-        git show FETCH_HEAD:west.yml > pr_west.yml
-        git show FETCH_HEAD:MAINTAINERS.yml > pr_MAINTAINERS.yml
-
-    - name: west setup
-      if: >
-        github.event_name == 'pull_request_target'
-      run: |
-        git config --global user.email "you@example.com"
-        git config --global user.name "Your Name"
-        west init -l . || true
+      uses: actions/checkout@v4
 
     - name: Run assignment script
       env:
-        GITHUB_TOKEN: ${{ secrets.ZB_PR_ASSIGNER_GITHUB_TOKEN }}
+        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
-          if [ "${{ github.base_ref }}" = "main" ]; then
-            FLAGS+=" -P ${{ github.event.pull_request.number }} --updated-manifest pr_west.yml --updated-maintainer-file pr_MAINTAINERS.yml"
-          else
             FLAGS+=" -P ${{ github.event.pull_request.number }}"
-          fi
         elif [ "${{ github.event_name }}" = "issues" ]; then
-          FLAGS+=" -I ${{ github.event.issue.number }}"
+            FLAGS+=" -I ${{ github.event.issue.number }}"
         elif [ "${{ github.event_name }}" = "schedule" ]; then
-          FLAGS+=" --modules"
+            FLAGS+=" --modules"
         else
           echo "Unknown event: ${{ github.event_name }}"
           exit 1
         fi
-        python3 scripts/ci/set_assignees.py $FLAGS
 
-    - name: Check maintainer file changes
-      if: >
-        github.event_name == 'pull_request_target' && github.base_ref == 'main'
-      env:
-        GITHUB_TOKEN: ${{ secrets.ZB_PR_ASSIGNER_GITHUB_TOKEN }}
-      run: |
-        python  ./scripts/ci/check_maintainer_changes.py  \
-          --repo zephyrproject-rtos/zephyr MAINTAINERS.yml pr_MAINTAINERS.yml
+        python3 scripts/set_assignees.py $FLAGS

.github/workflows/backport.yml

@@ -7,17 +7,10 @@ on:
     branches:
       - main
 
-permissions:
-  contents: read
-
 jobs:
   backport:
     name: Backport
-    runs-on: ubuntu-24.04
-    permissions:
-      contents: write       # to create/push backport branches
-      pull-requests: write  # to create backport PRs
-      issues: write         # to add labels to issue created if backport fails
+    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: >
@@ -31,8 +24,8 @@ jobs:
       )
     steps:
       - name: Backport
-        uses: zephyrproject-rtos/action-backport@7e74f601d11eaca577742445e87775b5651a965f # v2.0.3-3
+        uses: zephyrproject-rtos/action-backport@v2.0.3-3
         with:
-          github_token: ${{ secrets.GITHUB_TOKEN }}
+          github_token: ${{ secrets.ZB_GITHUB_TOKEN }}
           issue_labels: Backport
           labels_template: '["Backport"]'

.github/workflows/backport_issue_check.yml

@@ -10,41 +10,29 @@ on:
     branches:
       - v*-branch
 
-permissions:
-  contents: read
-
 jobs:
   backport:
     name: Backport Issue Check
     concurrency:
       group: backport-issue-check-${{ github.ref }}
       cancel-in-progress: true
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-22.04
     if: github.repository == 'zephyrproject-rtos/zephyr'
-    permissions:
-      issues: read # to check if associated issue exists for backport
 
     steps:
       - name: Check out source code
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        uses: actions/checkout@v4
 
-      - name: Set up Python
-        uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v6.0.0
-        with:
-          python-version: 3.12
-          cache: pip
-          cache-dependency-path: scripts/requirements-actions.txt
-
-      - name: Install Python packages
+      - name: Install Python dependencies
         run: |
-          pip install -r scripts/requirements-actions.txt --require-hashes
+          pip install -U pygithub
 
       - name: Run backport issue checker
         env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          GITHUB_TOKEN: ${{ secrets.ZB_GITHUB_TOKEN }}
         run: |
           ./scripts/release/list_backports.py \
-          -o ${{ github.event.repository.owner.login }} \
-          -r ${{ github.event.repository.name }} \
-          -b ${{ github.event.pull_request.base.ref }} \
-          -p ${{ github.event.pull_request.number }}
+            -o ${{ github.event.repository.owner.login }} \
+            -r ${{ github.event.repository.name }} \
+            -b ${{ github.event.pull_request.base.ref }} \
+            -p ${{ github.event.pull_request.number }}

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

@@ -5,26 +5,20 @@ on:
     workflows: ["BabbleSim Tests"]
     types:
       - completed
-
-permissions:
-  contents: read
-
 jobs:
   bsim-test-results:
     name: "Publish BabbleSim Test Results"
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-22.04
     if: github.event.workflow_run.conclusion != 'skipped'
-    permissions:
-      checks: write # to create the check run entry with test results
 
     steps:
       - name: Download artifacts
-        uses: dawidd6/action-download-artifact@0bd50d53a6d7fb5cb921e607957e9cc12b4ce392 # v12
+        uses: dawidd6/action-download-artifact@v8
         with:
           run_id: ${{ github.event.workflow_run.id }}
 
       - name: Publish BabbleSim Test Results
-        uses: EnricoMi/publish-unit-test-result-action@27d65e188ec43221b20d26de30f4892fad91df2f # v2.22.0
+        uses: EnricoMi/publish-unit-test-result-action@v2
         with:
           check_name: BabbleSim Test Results
           comment_mode: off

.github/workflows/bsim-tests.yaml

@@ -10,7 +10,7 @@ on:
       - "tests/bsim/**"
       - "boards/nordic/nrf5*/*dt*"
       - "dts/*/nordic/**"
-      - "tests/bluetooth/**"
+      - "tests/bluetooth/common/testlib/**"
       - "samples/bluetooth/**"
       - "boards/native/**"
       - "soc/native/**"
@@ -27,10 +27,6 @@ on:
       - "include/zephyr/net/ieee802154*"
       - "drivers/serial/*nrfx*"
       - "tests/drivers/uart/**"
-      - '!**.rst'
-
-permissions:
-  contents: read
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.event_name }}-${{ github.head_ref || github.ref }}
@@ -42,16 +38,13 @@ jobs:
     runs-on:
       group: zephyr-runner-v2-linux-x64-4xlarge
     container:
-      image: ghcr.io/zephyrproject-rtos/ci-repo-cache:v0.28.7.20251127
+      image: ghcr.io/zephyrproject-rtos/ci-repo-cache:v0.27.4.20241026
       options: '--entrypoint /bin/bash'
     env:
       ZEPHYR_TOOLCHAIN_VARIANT: zephyr
       BSIM_OUT_PATH: /opt/bsim/
       BSIM_COMPONENTS_PATH: /opt/bsim/components
       EDTT_PATH: ../tools/edtt
-    permissions:
-      checks: write # to create the check run entry with test results
-
     steps:
       - name: Apply container owner mismatch workaround
         run: |
@@ -74,7 +67,7 @@ jobs:
           git remote set-url origin ${GITHUB_SERVER_URL}/${GITHUB_REPOSITORY}
 
       - name: Checkout
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
@@ -97,12 +90,8 @@ jobs:
 
           echo "ZEPHYR_SDK_INSTALL_DIR=/opt/toolchains/zephyr-sdk-$( cat SDK_VERSION )" >> $GITHUB_ENV
 
-      - name: Install Python packages
-        run: |
-          pip install -r scripts/requirements-actions.txt --require-hashes
-
       - name: Check common triggering files
-        uses: tj-actions/changed-files@e0021407031f5be11a464abee9a0776171c79891 # v47.0.1
+        uses: tj-actions/changed-files@v45
         id: check-common-files
         with:
           files: |
@@ -121,17 +110,16 @@ jobs:
             modules/hal_nordic/**
 
       - name: Check if Bluethooth files changed
-        uses: tj-actions/changed-files@e0021407031f5be11a464abee9a0776171c79891 # v47.0.1
+        uses: tj-actions/changed-files@v45
         id: check-bluetooth-files
         with:
           files: |
+            tests/bsim/bluetooth/
             samples/bluetooth/
             subsys/bluetooth/
-            tests/bluetooth/
-            tests/bsim/bluetooth/
 
       - name: Check if Networking files changed
-        uses: tj-actions/changed-files@e0021407031f5be11a464abee9a0776171c79891 # v47.0.1
+        uses: tj-actions/changed-files@v45
         id: check-networking-files
         with:
           files: |
@@ -144,7 +132,7 @@ jobs:
             include/zephyr/net/ieee802154*
 
       - name: Check if UART files changed
-        uses: tj-actions/changed-files@e0021407031f5be11a464abee9a0776171c79891 # v47.0.1
+        uses: tj-actions/changed-files@v45
         id: check-uart-files
         with:
           files: |
@@ -184,12 +172,13 @@ jobs:
 
       - name: Merge Test Results
         run: |
+          pip install junitparser junit2html
           junitparser merge --glob "./bsim_*/*bsim_results.*.xml" "./twister-out/twister.xml" junit.xml
           junit2html junit.xml junit.html
 
       - name: Upload Unit Test Results in HTML
         if: always()
-        uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
+        uses: actions/upload-artifact@v4
         with:
           name: HTML Unit Test Results
           if-no-files-found: ignore
@@ -197,7 +186,7 @@ jobs:
             junit.html
 
       - name: Publish Unit Test Results
-        uses: EnricoMi/publish-unit-test-result-action@27d65e188ec43221b20d26de30f4892fad91df2f # v2.22.0
+        uses: EnricoMi/publish-unit-test-result-action@v2
         with:
           check_name: Bsim Test Results
           files: "junit.xml"
@@ -205,7 +194,7 @@ jobs:
 
       - name: Upload Event Details
         if: always()
-        uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
+        uses: actions/upload-artifact@v4
         with:
           name: event
           path: |

.github/workflows/bug_snapshot.yaml

@@ -8,34 +8,24 @@ name: Bug Snapshot
 
 on:
   workflow_dispatch:
+    branches: [main]
   schedule:
-  # Run daily at 00:05
-  - cron: '5 00 * * *'
-
-permissions:
-  contents: read
+  # Run daily at 14:05
+  - cron: '5 14 * * *'
 
 jobs:
   make_bugs_pickle:
     name: Make bugs pickle
-    runs-on: ubuntu-24.04
-    if: github.repository_owner == 'zephyrproject-rtos' && github.ref == 'refs/heads/main'
+    runs-on: ubuntu-22.04
+    if: github.repository_owner == 'zephyrproject-rtos'
 
     steps:
     - name: Checkout
-      uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+      uses: actions/checkout@v4
 
-    - name: Set up Python
-      uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v6.0.0
-      with:
-        python-version: 3.12
-        cache: pip
-        cache-dependency-path: scripts/requirements-actions.txt
-
-    - name: Install Python packages
+    - name: Install Python dependencies
       run: |
-        pip install -r scripts/requirements-actions.txt --require-hashes
-
+        pip install -U pygithub
 
     - name: Snapshot bugs
       env:
@@ -51,7 +41,7 @@ jobs:
         echo "BUGS_PICKLE_PATH=${BUGS_PICKLE_PATH}" >> ${GITHUB_ENV}
 
     - name: Configure AWS Credentials
-      uses: aws-actions/configure-aws-credentials@61815dcd50bd041e203e49132bacad1fd04d2708 # v5.1.1
+      uses: aws-actions/configure-aws-credentials@v4
       with:
         aws-access-key-id: ${{ vars.AWS_BUILDS_ZEPHYR_BUG_SNAPSHOT_ACCESS_KEY_ID }}
         aws-secret-access-key: ${{ secrets.AWS_BUILDS_ZEPHYR_BUG_SNAPSHOT_SECRET_ACCESS_KEY }}

.github/workflows/clang.yaml

@@ -1,184 +0,0 @@
-name: Build with Clang/LLVM
-on:
-  push:
-    branches:
-      - main
-      - v*-branch
-      - collab-*
-permissions:
-  contents: read
-
-concurrency:
-  group: ${{ github.workflow }}-${{ github.event_name }}-${{ github.head_ref || github.ref }}
-  cancel-in-progress: true
-
-jobs:
-  clang-build:
-    if: github.repository_owner == 'zephyrproject-rtos'
-    runs-on:
-      group: zephyr-runner-v2-linux-x64-4xlarge
-    container:
-      image: ghcr.io/zephyrproject-rtos/ci-repo-cache:v0.28.7.20251127
-      options: '--entrypoint /bin/bash'
-    strategy:
-      fail-fast: false
-      matrix:
-        subset: [1, 2]
-    env:
-      CCACHE_DIR: /node-cache/ccache-zephyr
-      CCACHE_REMOTE_STORAGE: "redis://cache-*.keydb-cache.svc.cluster.local|shards=1,2,3"
-      CCACHE_REMOTE_ONLY: "true"
-      CCACHE_IGNOREOPTIONS: '-specs=* --specs=*'
-      LLVM_TOOLCHAIN_PATH: /usr/lib/llvm-20
-      BASE_REF: ${{ github.base_ref }}
-    steps:
-      - name: Apply container owner mismatch workaround
-        run: |
-          # FIXME: The owner UID of the GITHUB_WORKSPACE directory may not
-          #        match the container user UID because of the way GitHub
-          #        Actions runner is implemented. Remove this workaround when
-          #        GitHub comes up with a fundamental fix for this problem.
-          git config --global --add safe.directory ${GITHUB_WORKSPACE}
-
-      - name: Print cloud service information
-        run: |
-          echo "ZEPHYR_RUNNER_CLOUD_PROVIDER = ${ZEPHYR_RUNNER_CLOUD_PROVIDER}"
-          echo "ZEPHYR_RUNNER_CLOUD_NODE = ${ZEPHYR_RUNNER_CLOUD_NODE}"
-          echo "ZEPHYR_RUNNER_CLOUD_POD = ${ZEPHYR_RUNNER_CLOUD_POD}"
-
-      - name: Clone cached Zephyr repository
-        continue-on-error: true
-        run: |
-          git clone --shared /repo-cache/zephyrproject/zephyr .
-          git remote set-url origin ${GITHUB_SERVER_URL}/${GITHUB_REPOSITORY}
-
-      - name: Checkout
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
-        with:
-          fetch-depth: 0
-          persist-credentials: false
-
-      - name: Environment Setup
-        run: |
-          echo "$HOME/.local/bin" >> $GITHUB_PATH
-          git config --global user.email "bot@zephyrproject.org"
-          git config --global user.name "Zephyr Bot"
-          rm -fr ".git/rebase-apply"
-          rm -fr ".git/rebase-merge"
-          git clean -f -d
-          git log  --pretty=oneline | head -n 10
-          west init -l . || true
-          west config --global update.narrow true
-          west config manifest.group-filter -- +ci,+optional
-          # In some cases modules are left in a state where they can't be
-          # updated (i.e. when we cancel a job and the builder is killed),
-          # So first retry to update, if that does not work, remove all modules
-          # and start over. (Workaround until we implement more robust module
-          # west caching).
-          west update --path-cache /repo-cache/zephyrproject 2>&1 1> west.log || west update --path-cache /repo-cache/zephyrproject 2>&1 1> west2.log || ( rm -rf ../modules ../bootloader ../tools && west update --path-cache /repo-cache/zephyrproject)
-
-          echo "ZEPHYR_SDK_INSTALL_DIR=/opt/toolchains/zephyr-sdk-$( cat SDK_VERSION )" >> $GITHUB_ENV
-
-      - name: Check Environment
-        run: |
-          cmake --version
-          ${LLVM_TOOLCHAIN_PATH}/bin/clang --version
-          gcc --version
-          ls -la
-
-      - name: Install Python packages
-        run: |
-          pip install -r scripts/requirements-actions.txt --require-hashes
-
-      - name: Set up ccache
-        run: |
-          mkdir -p ${CCACHE_DIR}
-          ccache -M 10G
-          ccache -p
-          ccache -z -s -vv
-
-      - name: Update BabbleSim to manifest revision
-        run: |
-          export BSIM_VERSION=$( west list bsim -f {revision} )
-          echo "Manifest points to bsim sha $BSIM_VERSION"
-          cd /opt/bsim_west/bsim
-          git fetch -n origin ${BSIM_VERSION}
-          git -c advice.detachedHead=false checkout ${BSIM_VERSION}
-          west update
-          make everything -s -j 8
-
-      - name: Run Tests with Twister
-        id: twister
-        run: |
-          export ZEPHYR_BASE=${PWD}
-          export ZEPHYR_TOOLCHAIN_VARIANT=llvm
-
-          ./scripts/twister -p native_sim --force-color --inline-logs -M -N -v --retry-failed 2 \
-            -T tests --subset ${{matrix.subset}}/2 -j 16
-
-      - name: Print ccache stats
-        if: always()
-        run: |
-          ccache -s -vv
-
-      - name: Upload Unit Test Results
-        if: always()
-        uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
-        with:
-          name: Unit Test Results (Subset ${{ matrix.subset }})
-          path: |
-            twister-out/twister.xml
-            twister-out/twister.json
-          if-no-files-found: ignore
-
-  clang-build-results:
-    name: "Publish Unit Tests Results"
-    needs: clang-build
-    runs-on: ubuntu-24.04
-    permissions:
-      checks: write # to create GitHub annotations
-    if: (success() || failure())
-    steps:
-      - name: Checkout
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
-        with:
-          fetch-depth: 0
-          persist-credentials: false
-
-      - name: Download Artifacts
-        uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 # v7.0.0
-        with:
-          path: artifacts
-
-      - name: Set up Python
-        uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v6.0.0
-        with:
-          python-version: 3.12
-          cache: pip
-          cache-dependency-path: scripts/requirements-actions.txt
-
-      - name: Install Python packages
-        run: |
-          pip install -r scripts/requirements-actions.txt --require-hashes
-
-      - name: Merge Test Results
-        run: |
-          junitparser merge --glob 'artifacts/*/twister.xml' 'artifacts/*/*/twister.xml' junit.xml
-          junit2html junit.xml junit-clang.html
-
-      - name: Upload Unit Test Results in HTML
-        if: always()
-        uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
-        with:
-          name: HTML Unit Test Results
-          if-no-files-found: ignore
-          path: |
-            junit-clang.html
-
-      - name: Publish Unit Test Results
-        uses: EnricoMi/publish-unit-test-result-action@27d65e188ec43221b20d26de30f4892fad91df2f # v2.22.0
-        if: always()
-        with:
-          check_name: Unit Test Results
-          files: "**/twister.xml"
-          comment_mode: off

.github/workflows/codecov.yaml

@@ -1,14 +1,8 @@
 name: Code Coverage with codecov
 
 on:
-  push:
-    branches:
-      - main
-      - v*-branch
-      - collab-*
-
-permissions:
-  contents: read
+  schedule:
+    - cron: '25 06,18 * * *'
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.event_name }}-${{ github.head_ref || github.ref }}
@@ -20,7 +14,7 @@ jobs:
     runs-on:
       group: zephyr-runner-v2-linux-x64-4xlarge
     container:
-      image: ghcr.io/zephyrproject-rtos/ci-repo-cache:v0.28.7.20251127
+      image: ghcr.io/zephyrproject-rtos/ci-repo-cache:v0.27.4.20241026
       options: '--entrypoint /bin/bash'
     strategy:
       fail-fast: false
@@ -67,21 +61,10 @@ jobs:
           git remote set-url origin ${GITHUB_SERVER_URL}/${GITHUB_REPOSITORY}
 
       - name: checkout
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
-      - name: Set up Python
-        uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v6.0.0
-        with:
-          python-version: 3.12
-          cache: pip
-          cache-dependency-path: scripts/requirements-actions.txt
-
-      - name: Install Python packages
-        run: |
-          pip install -r scripts/requirements-actions.txt --require-hashes
-
       - name: west setup
         run: |
           west init -l . || true
@@ -102,37 +85,30 @@ jobs:
           ccache -p
           ccache -z -s -vv
 
+      - name: Update BabbleSim to manifest revision
+        run: |
+          export BSIM_VERSION=$( west list bsim -f {revision} )
+          echo "Manifest points to bsim sha $BSIM_VERSION"
+          cd /opt/bsim_west/bsim
+          git fetch -n origin ${BSIM_VERSION}
+          git -c advice.detachedHead=false checkout ${BSIM_VERSION}
+          west update
+          make everything -s -j 8
+
       - name: Run Tests with Twister (Push)
         continue-on-error: true
         run: |
           export ZEPHYR_BASE=${PWD}
           export ZEPHYR_TOOLCHAIN_VARIANT=zephyr
           mkdir -p coverage/reports
-          ./scripts/twister --save-tests ${{matrix.normalized}}-testplan.json
+          pip install gcovr==6.0
+          ./scripts/twister -E ${{matrix.normalized}}-testplan.json
           ls -la
           ./scripts/twister \
             -i --force-color -N -v --filter runnable -p ${{ matrix.platform }} --coverage \
             -T tests --coverage-tool gcovr -xCONFIG_TEST_EXTRA_STACK_SIZE=4096 -e nano \
             --timeout-multiplier 2
 
-      - name: Build Doxygen Coverage
-        if: matrix.platform == 'unit_testing'
-        run: |
-          pip install -r doc/requirements.txt --require-hashes
-          sudo apt-get update
-          sudo apt-get install -y graphviz # dot is needed but currently missing from the Docker image
-          cmake -B doc/_build -S doc
-          cmake --build doc/_build --target doxygen-coverage
-
-      - name: Upload Doxygen Coverage Results
-        if: matrix.platform == 'unit_testing'
-        uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
-        with:
-          name: doxygen-coverage-results
-          path: |
-            doc/_build/new.info
-            doc/_build/coverage-report
-
       - name: Print ccache stats
         if: always()
         run: |
@@ -145,7 +121,7 @@ jobs:
 
       - name: Upload Coverage Results
         if: always()
-        uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
+        uses: actions/upload-artifact@v4
         with:
           name: Coverage Data (Subset ${{ matrix.normalized }})
           path: |
@@ -155,29 +131,18 @@ jobs:
   codecov-results:
     name: "Publish Coverage Results"
     needs: codecov
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-22.04
     # the codecov job might be skipped, we don't need to run this job then
     if: success() || failure()
 
     steps:
       - name: checkout
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
-      - name: Set up Python
-        uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v6.0.0
-        with:
-          python-version: 3.12
-          cache: pip
-          cache-dependency-path: scripts/requirements-actions.txt
-
-      - name: Install Python packages
-        run: |
-          pip install -r scripts/requirements-actions.txt --require-hashes
-
       - name: Download Artifacts
-        uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 # v7.0.0
+        uses: actions/download-artifact@v4
         with:
           path: coverage/reports
 
@@ -217,6 +182,7 @@ jobs:
       - name: Merge coverage files
         run: |
           pushd ./coverage/reports
+          pip install gcovr==6.0
           gcovr ${{ steps.get-coverage-files.outputs.mergefiles }}  --merge-mode-functions=separate --json merged.json
           gcovr ${{ steps.get-coverage-files.outputs.mergefiles }} --merge-mode-functions=separate --cobertura merged.xml
           popd
@@ -232,6 +198,7 @@ jobs:
       - name: Generate Coverage Report
         if: always()
         run: |
+          pip install xlsxwriter ijson
           python3 ./scripts/ci/coverage/coverage_analysis.py \
             -t native_sim-testplan.json \
             -m MAINTAINERS.yml \
@@ -242,7 +209,7 @@ jobs:
 
       - name: Upload Merged Coverage Results and Report
         if: always()
-        uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
+        uses: actions/upload-artifact@v4
         with:
           name: Coverage Data and report
           path: |
@@ -251,25 +218,12 @@ jobs:
             coverage/reports/coverage-report-${{ steps.run_date.outputs.run_date_short }}.json
             coverage/reports/coverage-report-${{ steps.run_date.outputs.run_date_short }}.xlsx
 
-      - name: Upload test coverage to Codecov
+      - name: Upload coverage to Codecov
         if: always()
-        uses: codecov/codecov-action@671740ac38dd9b0130fbe1cec585b89eea48d3de # v5.5.2
+        uses: codecov/codecov-action@v5
         with:
           env_vars: OS,PYTHON
           fail_ci_if_error: false
           verbose: true
           token: ${{ secrets.CODECOV_TOKEN }}
           files: coverage/reports/merged.xml
-          flags: unittests-coverage
-
-      - name: Upload Doxygen coverage to Codecov
-        if: always()
-        uses: codecov/codecov-action@671740ac38dd9b0130fbe1cec585b89eea48d3de # v5.5.2
-        with:
-          env_vars: OS,PYTHON
-          fail_ci_if_error: false
-          verbose: true
-          token: ${{ secrets.CODECOV_TOKEN }}
-          files: coverage/reports/doxygen-coverage-results/new.info
-          disable_search: true
-          flags: doxygen-coverage

.github/workflows/codeql.yml

@@ -1,58 +0,0 @@
-name: "CodeQL"
-
-on:
-  push:
-    branches:
-      - main
-      - v*-branch
-      - collab-*
-  schedule:
-    - cron: '34 16 * * 6'
-  pull_request:
-    branches:
-      - main
-      - v*-branch
-      - collab-*
-
-permissions:
-  contents: read
-jobs:
-  analyze:
-    name: Analyze (${{ matrix.language }})
-    runs-on: ubuntu-24.04
-    permissions:
-      security-events: write
-    strategy:
-      fail-fast: false
-      matrix:
-        include:
-          - language: python
-            build-mode: none
-          - language: actions
-            build-mode: none
-            config: ./.github/codeql/codeql-actions-config.yml
-          - language: javascript-typescript
-            build-mode: none
-            config: ./.github/codeql/codeql-js-config.yml
-    steps:
-      - name: Checkout
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
-
-      - name: Initialize CodeQL
-        uses: github/codeql-action/init@cdefb33c0f6224e58673d9004f47f7cb3e328b89 # v4.31.10
-        with:
-          languages: ${{ matrix.language }}
-          build-mode: ${{ matrix.build-mode }}
-          queries: security-extended
-          config-file: ${{ matrix.config }}
-
-      - if: matrix.build-mode == 'manual'
-        shell: bash
-        run: |
-          echo "nothing yet"
-          exit 0
-
-      - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@cdefb33c0f6224e58673d9004f47f7cb3e328b89 # v4.31.10
-        with:
-          category: "/language:${{matrix.language}}"

.github/workflows/coding_guidelines.yml

@@ -2,30 +2,27 @@ name: Coding Guidelines
 
 on: pull_request
 
-permissions:
-  contents: read
-
 jobs:
   compliance_job:
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-22.04
     name: Run coding guidelines checks on patch series (PR)
     steps:
     - name: Checkout the code
-      uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+      uses: actions/checkout@v4
       with:
         ref: ${{ github.event.pull_request.head.sha }}
         fetch-depth: 0
 
-    - name: Set up Python
-      uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v6.0.0
+    - name: cache-pip
+      uses: actions/cache@v4
       with:
-        python-version: 3.12
-        cache: pip
-        cache-dependency-path: scripts/requirements-actions.txt
+        path: ~/.cache/pip
+        key: ${{ runner.os }}-pip-${{ hashFiles('.github/workflows/coding_guidelines.yml') }}
 
-    - name: Install Python packages
+    - name: Install python dependencies
       run: |
-        pip install -r scripts/requirements-actions.txt --require-hashes
+        pip install unidiff
+        pip install sh
 
     - name: Install Packages
       run: |

.github/workflows/compliance.yml

@@ -8,12 +8,9 @@ on:
     - reopened
     - synchronize
 
-permissions:
-  contents: read
-
 jobs:
   check_compliance:
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-22.04
     name: Run compliance checks on patch series (PR)
     steps:
     - name: Update PATH for west
@@ -21,7 +18,7 @@ jobs:
         echo "$HOME/.local/bin" >> $GITHUB_PATH
 
     - name: Checkout the code
-      uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+      uses: actions/checkout@v4
       with:
         ref: ${{ github.event.pull_request.head.sha }}
         fetch-depth: 0
@@ -44,15 +41,20 @@ jobs:
         git log  --pretty=oneline | head -n 10
 
     - name: Set up Python
-      uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v6.0.0
+      uses: actions/setup-python@v5
       with:
-        python-version: 3.12
-        cache: pip
-        cache-dependency-path: scripts/requirements-actions.txt
+        python-version: 3.11
 
-    - name: Install Python packages
+    - name: cache-pip
+      uses: actions/cache@v4
+      with:
+        path: ~/.cache/pip
+        key: ${{ runner.os }}-pip-${{ hashFiles('.github/workflows/compliance.yml') }}
+
+    - name: Install python dependencies
       run: |
-        pip install -r scripts/requirements-actions.txt --require-hashes
+        pip install -r scripts/requirements-compliance.txt
+        pip install west
 
     - name: west setup
       run: |
@@ -60,16 +62,13 @@ jobs:
         west config manifest.group-filter -- +ci,-optional
         west update -o=--depth=1 -n 2>&1 1> west.update.log || west update -o=--depth=1 -n 2>&1 1> west.update2.log
 
-    - name: Setup Node.js
-      uses: actions/setup-node@6044e13b5dc448c55e2357c09f80417699197238 # v6.2.0
-      with:
-        node-version: "lts/*"
-        cache: npm
-        check-latest: true
-        cache-dependency-path: ./scripts/ci/package-lock.json
-
-    - name: Install Node dependencies
-      run: npm --prefix ./scripts/ci ci
+    - name: Check for PR description
+      if: ${{ github.event.pull_request.body == '' }}
+      continue-on-error: true
+      id: pr_description
+      run: |
+        echo "Pull request description cannot be empty."
+        exit 1
 
     - name: Run Compliance Tests
       continue-on-error: true
@@ -83,35 +82,23 @@ jobs:
         git log  --pretty=oneline | head -n 10
         # Increase rename limit to allow for large PRs
         git config diff.renameLimit 10000
-        excludes="-e KconfigBasic -e SysbuildKconfigBasic -e ClangFormat"
-        # The signed-off-by check for dependabot should be skipped
-        if [ "${{ github.actor }}" == "dependabot[bot]" ]; then
-          excludes="$excludes -e Identity"
-        fi
-        ./scripts/ci/check_compliance.py --annotate $excludes -c origin/${BASE_REF}..
+        ./scripts/ci/check_compliance.py --annotate -e KconfigBasic -e SysbuildKconfigBasic -e ClangFormat \
+        -c origin/${BASE_REF}..
 
     - name: upload-results
-      uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
+      uses: actions/upload-artifact@v4
       continue-on-error: true
       with:
         name: compliance.xml
         path: compliance.xml
 
-    - name: Upload dts linter patch
-      uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
-      continue-on-error: true
-      if: hashFiles('dts_linter.patch') != ''
-      with:
-        name: dts_linter.patch
-        path: dts_linter.patch
-
     - name: check-warns
       run: |
         if [[ ! -s "compliance.xml" ]]; then
           exit 1;
         fi
 
-        warns=("ClangFormat" "LicenseAndCopyrightCheck")
+        warns=("ClangFormat")
         files=($(./scripts/ci/check_compliance.py -l))
 
         for file in "${files[@]}"; do
@@ -136,3 +123,8 @@ jobs:
           echo "You can run this step locally with the ./scripts/ci/check_compliance.py script."
           exit 1;
         fi
+
+        if [ "${{ steps.pr_description.outcome }}" == "failure" ]; then
+          echo "PR description cannot be empty"
+          exit 1;
+        fi

.github/workflows/daily_test_version.yml

@@ -10,38 +10,28 @@ on:
     branches:
     - refs/tags/*
 
-permissions:
-  contents: read
-
 jobs:
   get_version:
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-22.04
     if: github.repository == 'zephyrproject-rtos/zephyr'
 
     steps:
     - name: Configure AWS Credentials
-      uses: aws-actions/configure-aws-credentials@61815dcd50bd041e203e49132bacad1fd04d2708 # v5.1.1
+      uses: aws-actions/configure-aws-credentials@v4
       with:
         aws-access-key-id: ${{ vars.AWS_TESTING_ACCESS_KEY_ID }}
         aws-secret-access-key: ${{ secrets.AWS_TESTING_SECRET_ACCESS_KEY }}
         aws-region: us-east-1
 
+    - name: install-pip
+      run: |
+        pip install gitpython
+
     - name: checkout
-      uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+      uses: actions/checkout@v4
       with:
         fetch-depth: 0
 
-    - name: Set up Python
-      uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v6.0.0
-      with:
-        python-version: 3.12
-        cache: pip
-        cache-dependency-path: scripts/requirements-actions.txt
-
-    - name: Install Python packages
-      run: |
-        pip install -r scripts/requirements-actions.txt --require-hashes
-
     - name: Upload to AWS S3
       run: |
         python3 scripts/ci/version_mgr.py --update .

.github/workflows/devicetree_checks.yml

@@ -20,9 +20,6 @@ on:
     - 'scripts/dts/**'
     - '.github/workflows/devicetree_checks.yml'
 
-permissions:
-  contents: read
-
 jobs:
   devicetree-checks:
     name: Devicetree script tests
@@ -33,19 +30,39 @@ jobs:
         os: [ubuntu-22.04, macos-14, windows-2022]
     steps:
     - name: checkout
-      uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
-
+      uses: actions/checkout@v4
     - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v6.0.0
+      uses: actions/setup-python@v5
       with:
         python-version: ${{ matrix.python-version }}
-        cache: pip
-        cache-dependency-path: scripts/requirements-actions.txt
-
-    - name: Install Python packages
+    - name: cache-pip-linux
+      if: startsWith(runner.os, 'Linux')
+      uses: actions/cache@v4
+      with:
+        path: ~/.cache/pip
+        key: ${{ runner.os }}-pip-${{ matrix.python-version }}
+        restore-keys: |
+          ${{ runner.os }}-pip-${{ matrix.python-version }}
+    - name: cache-pip-mac
+      if: startsWith(runner.os, 'macOS')
+      uses: actions/cache@v4
+      with:
+        path: ~/Library/Caches/pip
+        # Trailing '-' was just to get a different cache name
+        key: ${{ runner.os }}-pip-${{ matrix.python-version }}-
+        restore-keys: |
+          ${{ runner.os }}-pip-${{ matrix.python-version }}-
+    - name: cache-pip-win
+      if: startsWith(runner.os, 'Windows')
+      uses: actions/cache@v4
+      with:
+        path: ~\AppData\Local\pip\Cache
+        key: ${{ runner.os }}-pip-${{ matrix.python-version }}
+        restore-keys: |
+          ${{ runner.os }}-pip-${{ matrix.python-version }}
+    - name: install python dependencies
       run: |
-        pip install -r scripts/requirements-actions.txt --require-hashes
-
+        pip install pytest pyyaml tox
     - name: run tox
       working-directory: scripts/dts/python-devicetree
       run: |

.github/workflows/do_not_merge.yml

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

.github/workflows/doc-build.yml

@@ -4,35 +4,32 @@
 name: Documentation Build
 
 on:
+  schedule:
+  - cron: '0 */3 * * *'
   push:
-    branches:
-    - main
     tags:
     - v*
   pull_request:
 
-permissions:
-  contents: read
-
 env:
-  DOXYGEN_VERSION: 1.15.0
-  DOXYGEN_SHA256SUM: 0ec2e5b2c3cd82b7106d19cb42d8466450730b8cb7a9e85af712be38bf4523a1
   JOB_COUNT: 8
 
 jobs:
   doc-file-check:
     name: Check for doc changes
     runs-on: ubuntu-24.04
+    if: >
+      github.repository_owner == 'zephyrproject-rtos'
     outputs:
       file_check: ${{ steps.check-doc-files.outputs.any_modified }}
     steps:
     - name: checkout
-      uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+      uses: actions/checkout@v4
       with:
         ref: ${{ github.event.pull_request.head.sha }}
         fetch-depth: 0
     - name: Check if Documentation related files changed
-      uses: tj-actions/changed-files@e0021407031f5be11a464abee9a0776171c79891 # v47.0.1
+      uses: tj-actions/changed-files@v45
       id: check-doc-files
       with:
         files: |
@@ -43,6 +40,7 @@ jobs:
           kernel/include/kernel_arch_interface.h
           lib/libc/**
           subsys/testsuite/ztest/include/**
+          tests/
           **/Kconfig*
           west.yml
           scripts/dts/
@@ -59,9 +57,9 @@ jobs:
     runs-on:
       group: zephyr-runner-v2-linux-x64-4xlarge
     container:
-      image: ghcr.io/zephyrproject-rtos/ci-repo-cache:v0.28.7.20251127
+      image: ghcr.io/zephyrproject-rtos/ci-repo-cache:v0.28.6.20251003
       options: '--entrypoint /bin/bash'
-    timeout-minutes: 60
+    timeout-minutes: 20
     concurrency:
       group: doc-build-html-${{ github.ref }}
       cancel-in-progress: true
@@ -92,7 +90,7 @@ jobs:
         git remote set-url origin ${GITHUB_SERVER_URL}/${GITHUB_REPOSITORY}
 
     - name: Checkout
-      uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+      uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
       with:
         ref: ${{ github.event.pull_request.head.sha }}
         fetch-depth: 0
@@ -112,6 +110,7 @@ jobs:
         echo "$HOME/.cargo/bin" >> $GITHUB_PATH
 
         west init -l . || true
+        west config manifest.group-filter -- +ci,+optional
         west config --global update.narrow true
         west update --path-cache /repo-cache/zephyrproject 2>&1 1> west.update.log || west update --path-cache /repo-cache/zephyrproject 2>&1 1> west.update.log || ( rm -rf ../modules ../bootloader ../tools && west update --path-cache /repo-cache/zephyrproject)
         west forall -c 'git reset --hard HEAD'
@@ -120,8 +119,8 @@ jobs:
 
     - name: Install Python packages required for documentation build
       run: |
-        pip install -r scripts/requirements-actions.txt --require-hashes
-        pip install -r doc/requirements.txt --require-hashes
+        pip install -r doc/requirements.txt
+        pip install coverxygen
 
     - name: Build HTML documentation
       shell: bash
@@ -156,13 +155,13 @@ jobs:
         tar --use-compress-program="xz -T0" -cf api-coverage.tar.xz coverage-report
 
     - name: Upload HTML output
-      uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
+      uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
       with:
         name: html-output
         path: html-output.tar.xz
 
     - name: Upload Doxygen coverage artifacts
-      uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
+      uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
       with:
         name: api-coverage
         path: api-coverage.tar.xz
@@ -183,7 +182,7 @@ jobs:
         echo "API Coverage Report will be available shortly at: ${API_COVERAGE_URL}" >> $GITHUB_STEP_SUMMARY
 
     - name: Upload PR number
-      uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
+      uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
       if: github.event_name == 'pull_request'
       with:
         name: pr_num
@@ -193,57 +192,52 @@ jobs:
     name: "Documentation Build (PDF)"
     needs: [doc-file-check]
     if: |
-      github.event_name != 'pull_request'
-    runs-on: ubuntu-24.04
+      github.event_name != 'pull_request' &&
+      github.repository_owner == 'zephyrproject-rtos'
+    runs-on: ubuntu-22.04
+    container: texlive/texlive:latest
     timeout-minutes: 120
     concurrency:
       group: doc-build-pdf-${{ github.ref }}
       cancel-in-progress: true
 
     steps:
-    - name: checkout
-      uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
-      with:
-        path: zephyr
+    - name: Apply container owner mismatch workaround
+      run: |
+        git config --global --add safe.directory ${GITHUB_WORKSPACE}
 
-    - name: Set up Python
-      uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v6.0.0
-      with:
-        python-version: 3.12
-        cache: pip
-        cache-dependency-path: doc/requirements.txt
+    - name: checkout
+      uses: actions/checkout@v4
 
     - name: install-pkgs
       run: |
-        sudo apt-get update
-        sudo apt-get install --no-install-recommends graphviz librsvg2-bin \
-          texlive-latex-base texlive-latex-extra latexmk \
-          texlive-fonts-recommended texlive-fonts-extra texlive-xetex \
-          imagemagick fonts-noto xindy
-        wget --no-verbose "https://github.com/doxygen/doxygen/releases/download/Release_${DOXYGEN_VERSION//./_}/doxygen-${DOXYGEN_VERSION}.linux.bin.tar.gz"
-        echo "${DOXYGEN_SHA256SUM}  doxygen-${DOXYGEN_VERSION}.linux.bin.tar.gz" | sha256sum -c
-        if [ $? -ne 0 ]; then
-          echo "Failed to verify doxygen tarball"
-          exit 1
-        fi
-        sudo tar xf doxygen-${DOXYGEN_VERSION}.linux.bin.tar.gz -C /opt
-        echo "/opt/doxygen-${DOXYGEN_VERSION}/bin" >> $GITHUB_PATH
+        apt-get update
+        apt-get install -y python3-pip python3-venv ninja-build doxygen graphviz librsvg2-bin imagemagick
 
-    - name: Setup Zephyr project
-      uses: zephyrproject-rtos/action-zephyr-setup@360ff9b36e58499d9eb28015cdcde7ca03a5b04d # v1.0.12
+    - name: cache-pip
+      uses: actions/cache@v4
       with:
-        app-path: zephyr
-        toolchains: 'arm-zephyr-eabi'
-        enable-ccache: false
+        path: ~/.cache/pip
+        key: pip-${{ hashFiles('doc/requirements.txt') }}
 
-    - name: install-pip-pkgs
-      working-directory: zephyr
+    - name: setup-venv
       run: |
-        pip install -r doc/requirements.txt --require-hashes
+        python3 -m venv .venv
+        . .venv/bin/activate
+        echo PATH=$PATH >> $GITHUB_ENV
+
+    - name: install-pip
+      run: |
+        pip install -r doc/requirements.txt
+        pip install west==${WEST_VERSION}
+        pip install cmake==${CMAKE_VERSION}
+
+    - name: west setup
+      run: |
+        west init -l .
 
     - name: build-docs
       shell: bash
-      working-directory: zephyr
       continue-on-error: true
       run: |
         if [[ "$GITHUB_REF" =~ "refs/tags/v" ]]; then
@@ -259,13 +253,13 @@ jobs:
 
     - name: upload-build
       if: always()
-      uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
+      uses: actions/upload-artifact@v4
       with:
         name: pdf-output
         if-no-files-found: ignore
         path: |
-          zephyr/doc/_build/latex/zephyr.pdf
-          zephyr/doc/_build/latex/zephyr.log
+          doc/_build/latex/zephyr.pdf
+          doc/_build/latex/zephyr.log
 
   doc-build-status-check:
     if: always()

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

@@ -10,13 +10,10 @@ on:
     types:
     - completed
 
-permissions:
-  contents: read
-
 jobs:
   doc-publish:
     name: Publish Documentation
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-22.04
     if: |
       github.event.workflow_run.event == 'pull_request' &&
       github.event.workflow_run.conclusion == 'success' &&
@@ -25,7 +22,7 @@ jobs:
     steps:
     - name: Download artifacts
       id: download-artifacts
-      uses: dawidd6/action-download-artifact@0bd50d53a6d7fb5cb921e607957e9cc12b4ce392 # v12
+      uses: dawidd6/action-download-artifact@v8
       with:
         workflow: doc-build.yml
         run_id: ${{ github.event.workflow_run.id }}
@@ -33,7 +30,7 @@ jobs:
 
     - name: Load PR number
       if: steps.download-artifacts.outputs.found_artifact == 'true'
-      uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
+      uses: actions/github-script@v7
       with:
         script: |
           let fs = require("fs");
@@ -43,7 +40,7 @@ jobs:
     - name: Check PR number
       if: steps.download-artifacts.outputs.found_artifact == 'true'
       id: check-pr
-      uses: carpentries/actions/check-valid-pr@083bb9952b1414bd2b9e10ecec1717c938aba4c5 # v0.17.0
+      uses: carpentries/actions/check-valid-pr@v0.14.0
       with:
         pr: ${{ env.PR_NUM }}
         sha: ${{ github.event.workflow_run.head_sha }}
@@ -66,7 +63,7 @@ jobs:
 
     - name: Configure AWS Credentials
       if: steps.download-artifacts.outputs.found_artifact == 'true'
-      uses: aws-actions/configure-aws-credentials@61815dcd50bd041e203e49132bacad1fd04d2708 # v5.1.1
+      uses: aws-actions/configure-aws-credentials@v4
       with:
         aws-access-key-id: ${{ vars.AWS_BUILDS_ZEPHYR_PR_ACCESS_KEY_ID }}
         aws-secret-access-key: ${{ secrets.AWS_BUILDS_ZEPHYR_PR_SECRET_ACCESS_KEY }}

.github/workflows/doc-publish.yml

@@ -13,13 +13,10 @@ on:
     types:
     - completed
 
-permissions:
-  contents: read
-
 jobs:
   doc-publish:
     name: Publish Documentation
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-22.04
     if: |
       github.event.workflow_run.event != 'pull_request' &&
       github.event.workflow_run.conclusion == 'success' &&
@@ -27,7 +24,7 @@ jobs:
 
     steps:
     - name: Download artifacts
-      uses: dawidd6/action-download-artifact@0bd50d53a6d7fb5cb921e607957e9cc12b4ce392 # v12
+      uses: dawidd6/action-download-artifact@v8
       with:
         workflow: doc-build.yml
         run_id: ${{ github.event.workflow_run.id }}
@@ -40,7 +37,7 @@ jobs:
         fi
 
     - name: Configure AWS Credentials
-      uses: aws-actions/configure-aws-credentials@61815dcd50bd041e203e49132bacad1fd04d2708 # v5.1.1
+      uses: aws-actions/configure-aws-credentials@v4
       with:
         aws-access-key-id: ${{ vars.AWS_DOCS_ACCESS_KEY_ID }}
         aws-secret-access-key: ${{ secrets.AWS_DOCS_SECRET_ACCESS_KEY }}

.github/workflows/errno.yml

@@ -5,32 +5,30 @@ on:
       - '.github/workflows/errno.yml'
       - 'lib/libc/minimal/include/errno.h'
       - 'scripts/ci/errno.py'
-      - 'SDK_VERSION'
-
-permissions:
-  contents: read
 
 jobs:
   check-errno:
-    runs-on: ubuntu-24.04
-    steps:
-      - name: checkout
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
-        with:
-          path: zephyr
+    runs-on: ubuntu-22.04
+    container:
+      image: ghcr.io/zephyrproject-rtos/ci:v0.27.4
 
-      - name: Setup Zephyr project
-        uses: zephyrproject-rtos/action-zephyr-setup@360ff9b36e58499d9eb28015cdcde7ca03a5b04d # v1.0.12
-        with:
-          app-path: zephyr
-          toolchains: 'arm-zephyr-eabi'
-          west-group-filter: -hal,-tools,-bootloader,-babblesim
-          west-project-filter: -nrf_hw_models
-          enable-ccache: false
+    steps:
+      - name: Apply container owner mismatch workaround
+        run: |
+          # FIXME: The owner UID of the GITHUB_WORKSPACE directory may not
+          #        match the container user UID because of the way GitHub
+          #        Actions runner is implemented. Remove this workaround when
+          #        GitHub comes up with a fundamental fix for this problem.
+          git config --global --add safe.directory ${GITHUB_WORKSPACE}
+
+      - name: checkout
+        uses: actions/checkout@v4
+
+      - name: Environment Setup
+        run: |
+          echo "ZEPHYR_SDK_INSTALL_DIR=/opt/toolchains/zephyr-sdk-$( cat SDK_VERSION )" >> $GITHUB_ENV
 
       - name: Run errno.py
-        working-directory: zephyr
         run: |
-          export ZEPHYR_SDK_INSTALL_DIR=${{ github.workspace }}/zephyr-sdk
           export ZEPHYR_BASE=${PWD}
           ./scripts/ci/errno.py

.github/workflows/footprint-tracking.yml

@@ -1,8 +1,9 @@
 name: Footprint Tracking
 
+# Run every 12 hours and on tags
 on:
   schedule:
-    - cron: '50 00 * * *'
+    - cron: '50 1/12 * * *'
   push:
     paths:
       - 'VERSION'
@@ -15,9 +16,6 @@ on:
       # same commit
       - 'v*'
 
-permissions:
-  contents: read
-
 concurrency:
   group: ${{ github.workflow }}-${{ github.event_name }}-${{ github.head_ref || github.ref }}
   cancel-in-progress: true
@@ -28,7 +26,7 @@ jobs:
       group: zephyr-runner-v2-linux-x64-4xlarge
     if: github.repository_owner == 'zephyrproject-rtos'
     container:
-      image: ghcr.io/zephyrproject-rtos/ci-repo-cache:v0.28.7.20251127
+      image: ghcr.io/zephyrproject-rtos/ci-repo-cache:v0.27.4.20241026
       options: '--entrypoint /bin/bash'
     defaults:
       run:
@@ -60,24 +58,14 @@ jobs:
         run: |
           sudo apt-get update
           sudo apt-get install -y python3-venv
+          pip install -U gitpython
 
       - name: checkout
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        uses: actions/checkout@v4
         with:
           ref: ${{ github.event.pull_request.head.sha }}
           fetch-depth: 0
 
-      - name: Set up Python
-        uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v6.0.0
-        with:
-          python-version: 3.12
-          cache: pip
-          cache-dependency-path: scripts/requirements-actions.txt
-
-      - name: Install Python packages
-        run: |
-            pip install -r scripts/requirements-actions.txt --require-hashes
-
       - name: Environment Setup
         run: |
           echo "ZEPHYR_SDK_INSTALL_DIR=/opt/toolchains/zephyr-sdk-$( cat SDK_VERSION )" >> $GITHUB_ENV
@@ -89,7 +77,7 @@ 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@61815dcd50bd041e203e49132bacad1fd04d2708 # v5.1.1
+        uses: aws-actions/configure-aws-credentials@v4
         with:
           aws-access-key-id: ${{ vars.AWS_TESTING_ACCESS_KEY_ID }}
           aws-secret-access-key: ${{ secrets.AWS_TESTING_SECRET_ACCESS_KEY }}
@@ -106,6 +94,7 @@ jobs:
         run: |
           python3 -m venv .venv
           . .venv/bin/activate
+          pip install awscli
           aws s3 sync  --quiet footprint_data/ s3://testing.zephyrproject.org/footprint_data/
 
       - name: Transform Footprint data to Twister JSON reports
@@ -124,6 +113,7 @@ jobs:
           ELASTICSEARCH_INDEX: ${{ vars.FOOTPRINT_TRACKING_INDEX }}
         run: |
           shopt -s globstar
+          pip install -U elasticsearch
           run_date=`date --iso-8601=minutes`
           python3 ./scripts/ci/upload_test_results_es.py -r ${run_date} \
             --flatten footprint \

.github/workflows/greet_first_time_contributor.yml

@@ -6,20 +6,14 @@ on:
   pull_request_target:
     types: [opened, closed]
 
-permissions:
-  contents: read
-
 jobs:
   check_for_first_interaction:
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-22.04
     if: github.repository == 'zephyrproject-rtos/zephyr'
-    permissions:
-      pull-requests: write # to comment on pull requests
-      issues: write        # to comment on issues
 
     steps:
-      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
-      - uses: zephyrproject-rtos/action-first-interaction@58853996b1ac504b8e0f6964301f369d2bb22e5c # v1.1.1+zephyr.6
+      - uses: actions/checkout@v4
+      - uses: zephyrproject-rtos/action-first-interaction@v1.1.1-zephyr-5
         with:
           repo-token: ${{ secrets.GITHUB_TOKEN }}
 
@@ -45,7 +39,7 @@ jobs:
             and update (by amending and force-pushing the commits) your pull request if necessary.
 
             If you are stuck or need help please join us on [Discord](https://chat.zephyrproject.org/)
-            and ask your question there. Additionally, you can [escalate the review](https://docs.zephyrproject.org/latest/contribute/contributor_expectations.html#pr-technical-escalation)
+            and ask your question there. Additionally, you can [escalate the review](https://docs.zephyrproject.org/latest/contribute/contributor_expectations.html#pr-review-escalation)
             when applicable. 😊
 
           pr-merged-message: >

.github/workflows/hello_world_multiplatform.yaml

@@ -16,9 +16,6 @@ on:
       - '.github/workflows/hello_world_multiplatform.yaml'
       - 'SDK_VERSION'
 
-permissions:
-  contents: read
-
 concurrency:
   group: ${{ github.workflow }}-${{ github.event_name }}-${{ github.head_ref || github.ref }}
   cancel-in-progress: true
@@ -28,11 +25,11 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-22.04, ubuntu-24.04, ubuntu-24.04-arm, macos-14, windows-2022]
+        os: [ubuntu-22.04, ubuntu-24.04, macos-13, macos-14, windows-2022]
     runs-on: ${{ matrix.os }}
     steps:
       - name: Checkout
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        uses: actions/checkout@v4
         with:
           path: zephyr
           fetch-depth: 0
@@ -54,16 +51,15 @@ jobs:
           git log --graph --oneline HEAD...${PR_HEAD}
 
       - name: Set up Python
-        uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v6.0.0
+        uses: actions/setup-python@v5
         with:
-          python-version: 3.12
+          python-version: 3.11
 
       - name: Setup Zephyr project
-        uses: zephyrproject-rtos/action-zephyr-setup@360ff9b36e58499d9eb28015cdcde7ca03a5b04d # v1.0.12
+        uses: zephyrproject-rtos/action-zephyr-setup@v1
         with:
           app-path: zephyr
-          toolchains: arm-zephyr-eabi:riscv64-zephyr-elf
-          ccache-cache-key: hw-${{ matrix.os }}
+          toolchains: all
 
       - name: Build firmware
         working-directory: zephyr
@@ -73,22 +69,12 @@ jobs:
             EXTRA_TWISTER_FLAGS="-P native_sim --build-only"
           elif [ "${{ runner.os }}" = "Windows" ]; then
             EXTRA_TWISTER_FLAGS="-P native_sim --short-build-path -O/tmp/twister-out"
-          elif [ "${{ runner.os }}-${{ runner.arch }}" == "Linux-ARM64" ]; then
-            EXTRA_TWISTER_FLAGS="--exclude-platform native_sim/native"
           fi
-          west twister \
-              -p native_sim -p qemu_cortex_m0 -p qemu_riscv32 -p qemu_riscv64 \
-              --runtime-artifact-cleanup \
-              --force-color \
-              --inline-logs \
-              -T samples/hello_world \
-              -T samples/cpp/hello_world \
-              -v \
-              $EXTRA_TWISTER_FLAGS
+          ./scripts/twister --runtime-artifact-cleanup --force-color --inline-logs -T samples/hello_world -T samples/cpp/hello_world -v $EXTRA_TWISTER_FLAGS
 
       - name: Upload artifacts
         if: failure()
-        uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
+        uses: actions/upload-artifact@v4
         with:
           if-no-files-found: ignore
           path:

.github/workflows/issue_count.yml

@@ -2,10 +2,7 @@ name: Issue Tracker
 
 on:
   schedule:
-  - cron: '10 1/4 * * *'
-
-permissions:
-  contents: read
+  - cron: '*/10 * * * *'
 
 env:
   OUTPUT_FILE_NAME: IssuesReport.md
@@ -17,7 +14,7 @@ env:
 jobs:
   track-issues:
     name: "Collect Issue Stats"
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-22.04
     if: github.repository == 'zephyrproject-rtos/zephyr'
 
     steps:
@@ -30,7 +27,7 @@ jobs:
         sudo apt-get update
         sudo apt-get install discount
 
-    - uses: brcrista/summarize-issues@54c549b7d38b7db39e5c6e06fd9617e12e5c3491 # v4
+    - uses: brcrista/summarize-issues@v4
       with:
         title: 'Issues Report for ${{ github.repository }}'
         configPath: 'issues-report-config.json'
@@ -38,14 +35,14 @@ jobs:
         token: ${{ secrets.GITHUB_TOKEN }}
 
     - name: upload-stats
-      uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
+      uses: actions/upload-artifact@v4
       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@61815dcd50bd041e203e49132bacad1fd04d2708 # v5.1.1
+      uses: aws-actions/configure-aws-credentials@v4
       with:
         aws-access-key-id: ${{ vars.AWS_TESTING_ACCESS_KEY_ID }}
         aws-secret-access-key: ${{ secrets.AWS_TESTING_SECRET_ACCESS_KEY }}

.github/workflows/license_check.yml

@@ -2,25 +2,22 @@ name: Scancode
 
 on: [pull_request]
 
-permissions:
-  contents: read
-
 jobs:
   scancode_job:
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-22.04
     name: Scan code for licenses
     steps:
     - name: Checkout the code
-      uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+      uses: actions/checkout@v4
       with:
         fetch-depth: 0
     - name: Scan the code
       id: scancode
-      uses: zephyrproject-rtos/action_scancode@23ef91ce31cd4b954366a7b71eea47520da9b380 # v4
+      uses: zephyrproject-rtos/action_scancode@v4
       with:
         directory-to-scan: 'scan/'
     - name: Artifact Upload
-      uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
+      uses: actions/upload-artifact@v4
       with:
         name: scancode
         path: ./artifacts

.github/workflows/manifest.yml

@@ -2,20 +2,16 @@ name: Manifest
 on:
   pull_request_target:
 
-permissions:
-  contents: read
-
 jobs:
   contribs:
-    runs-on: ubuntu-24.04
-    permissions:
-      pull-requests: write # to create/update pull request comments
+    runs-on: ubuntu-22.04
     name: Manifest
     steps:
       - name: Checkout the code
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        uses: actions/checkout@v4
         with:
           path: zephyrproject/zephyr
+          ref: ${{ github.event.pull_request.head.sha }}
           fetch-depth: 0
           persist-credentials: false
 
@@ -24,15 +20,15 @@ jobs:
           BASE_REF: ${{ github.base_ref }}
         working-directory: zephyrproject/zephyr
         run: |
-          pip install -r scripts/requirements-west.txt --require-hashes
+          pip 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@09983f53d3d878791aa37a7755ae44d695f4c1e5 # v2.0.0
+        uses: zephyrproject-rtos/action-manifest@v1.7.0
         with:
-          github-token: ${{ secrets.GITHUB_TOKEN }}
+          github-token: ${{ secrets.ZB_GITHUB_TOKEN }}
           manifest-path: 'west.yml'
           checkout-path: 'zephyrproject/zephyr'
           use-tree-checkout: 'true'
@@ -41,5 +37,3 @@ jobs:
           verbosity-level: '1'
           labels: 'manifest'
           dnm-labels: 'DNM (manifest)'
-          blobs-added-labels: 'Binary Blobs Added'
-          blobs-modified-labels: 'Binary Blobs Modified'

.github/workflows/pinned-gh-actions.yml

@@ -1,19 +0,0 @@
-name: Check SHA-pinned GitHub Actions
-
-on:
-  pull_request:
-    paths:
-      - '.github/workflows/**'
-
-permissions:
-  contents: read
-
-jobs:
-  check-sha-pinned-actions:
-    name: Verify GitHub Actions
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
-      - name: Ensure SHA pinned actions
-        uses: zgosalvez/github-actions-ensure-sha-pinned-actions@6124774845927d14c601359ab8138699fa5b70c3 # v4.0.1

.github/workflows/pr_metadata_check.yml

@@ -1,46 +0,0 @@
-name: PR Metadata Check
-
-on:
-  pull_request:
-    types:
-      - synchronize
-      - opened
-      - reopened
-      - labeled
-      - unlabeled
-
-permissions:
-  contents: read
-
-concurrency:
-  group: ${{ github.workflow }}-${{ github.event_name }}-${{ github.head_ref || github.ref }}
-  cancel-in-progress: true
-
-jobs:
-  do-not-merge:
-    name: Prevent Merging
-    runs-on: ubuntu-24.04
-    timeout-minutes: 30
-    steps:
-      - name: Checkout
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
-
-      - name: Set up Python
-        uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v6.0.0
-        with:
-          python-version: 3.12
-          cache: pip
-          cache-dependency-path: scripts/requirements-actions.txt
-
-      - name: Install Python dependencies
-        run: |
-          pip install -r scripts/requirements-actions.txt --require-hashes
-
-      - name: Run the check script
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: |
-          python -u scripts/ci/do_not_merge.py \
-          -p "${{ github.event.pull_request.number }}" \
-          -o "${{ github.event.repository.owner.login }}" \
-          -r "${{ github.event.repository.name }}"

.github/workflows/pylib_tests.yml

@@ -19,9 +19,6 @@ on:
     - 'scripts/pylib/build_helpers/**'
     - '.github/workflows/pylib_tests.yml'
 
-permissions:
-  contents: read
-
 jobs:
   pylib-tests:
     name: Misc. Pylib Unit Tests
@@ -29,21 +26,25 @@ jobs:
     strategy:
       matrix:
         python-version: ['3.10', '3.11', '3.12', '3.13']
-        os: [ubuntu-24.04]
+        os: [ubuntu-22.04]
     steps:
     - name: checkout
-      uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
-
+      uses: actions/checkout@v4
     - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v6.0.0
+      uses: actions/setup-python@v5
       with:
         python-version: ${{ matrix.python-version }}
-        cache: pip
-        cache-dependency-path: scripts/requirements-actions.txt
-
-    - name: Install Python packages
+    - name: cache-pip-linux
+      if: startsWith(runner.os, 'Linux')
+      uses: actions/cache@v4
+      with:
+        path: ~/.cache/pip
+        key: ${{ runner.os }}-pip-${{ matrix.python-version }}
+        restore-keys: |
+          ${{ runner.os }}-pip-${{ matrix.python-version }}
+    - name: install-packages
       run: |
-        pip install -r scripts/requirements-actions.txt --require-hashes
+        pip install -r scripts/requirements-base.txt -r scripts/requirements-build-test.txt
     - name: Run pytest for build_helpers
       env:
         ZEPHYR_BASE: ./

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

@@ -7,9 +7,6 @@ on:
         type: string
         required: true
 
-permissions:
-  contents: read
-
 jobs:
   all_jobs_passed:
     name: all jobs passed

.github/workflows/release.yml

@@ -6,16 +6,11 @@ on:
       - 'v*'
       - '!v*rc*'
 
-permissions:
-  contents: read
-
 jobs:
   release:
-    runs-on: ubuntu-24.04
-    permissions:
-      contents: write # to create GitHub release entry
+    runs-on: ubuntu-22.04
     steps:
-      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
@@ -26,12 +21,12 @@ jobs:
           echo "TRIMMED_VERSION=${GITHUB_REF#refs/tags/v}" >> $GITHUB_OUTPUT
 
       - name: REUSE Compliance Check
-        uses: fsfe/reuse-action@676e2d560c9a403aa252096d99fcab3e1132b0f5 # v6.0.0
+        uses: fsfe/reuse-action@v5
         with:
           args: spdx -o zephyr-${{ steps.get_version.outputs.VERSION }}.spdx
 
       - name: upload-results
-        uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
+        uses: actions/upload-artifact@v4
         continue-on-error: true
         with:
           name: zephyr-${{ steps.get_version.outputs.VERSION }}.spdx
@@ -43,7 +38,7 @@ jobs:
 
       - name: Create Release
         id: create_release
-        uses: actions/create-release@0cb9c9b65d5d1901c1f53e5e66eaf4afd303e70e # v1.1.4
+        uses: actions/create-release@v1
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
@@ -55,7 +50,7 @@ jobs:
 
       - name: Upload Release Assets
         id: upload-release-asset
-        uses: actions/upload-release-asset@e8f9f06c4b078e705bd2ea027f0926603fc9b4d5 # v1.0.2
+        uses: actions/upload-release-asset@v1
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:

.github/workflows/scorecards.yml

@@ -29,12 +29,12 @@ jobs:
 
     steps:
       - name: "Checkout code"
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
         with:
           persist-credentials: false
 
       - name: "Run analysis"
-        uses: ossf/scorecard-action@4eaacf0543bb3f2c246792bd56e8cdeffafb205a # v2.4.3
+        uses: ossf/scorecard-action@62b2cac7ed8198b15735ed49ab1e5cf35480ba46 # v2.4.0
         with:
           results_file: results.sarif
           results_format: sarif
@@ -47,7 +47,7 @@ jobs:
       # uploads of run results in SARIF format to the repository Actions tab.
       # https://docs.github.com/en/actions/advanced-guides/storing-workflow-data-as-artifacts
       - name: "Upload artifact"
-        uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
+        uses: actions/upload-artifact@89ef406dd8d7e03cfd12d9e0a4a378f454709029 # v4.3.5
         with:
           name: SARIF file
           path: results.sarif
@@ -56,6 +56,6 @@ jobs:
       # Upload the results to GitHub's code scanning dashboard (optional).
       # Commenting out will disable upload of results to your repo's Code Scanning dashboard
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@cdefb33c0f6224e58673d9004f47f7cb3e328b89 # v4.31.10
+        uses: github/codeql-action/upload-sarif@afb54ba388a7dca6ecae48f608c4ff05ff4cc77a # v3.25.15
         with:
           sarif_file: results.sarif

.github/workflows/scripts_tests.yml

@@ -19,9 +19,6 @@ on:
       - 'scripts/build/**'
       - '.github/workflows/scripts_tests.yml'
 
-permissions:
-  contents: read
-
 jobs:
   scripts-tests:
     name: Scripts tests
@@ -29,10 +26,10 @@ jobs:
     strategy:
       matrix:
         python-version: ['3.10', '3.11', '3.12', '3.13']
-        os: [ubuntu-24.04]
+        os: [ubuntu-20.04]
     steps:
       - name: checkout
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        uses: actions/checkout@v4
         with:
           ref: ${{ github.event.pull_request.head.sha }}
           fetch-depth: 0
@@ -52,15 +49,22 @@ jobs:
           git log --graph --oneline HEAD...${PR_HEAD}
 
       - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v6.0.0
+        uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python-version }}
-          cache: pip
-          cache-dependency-path: scripts/requirements-actions.txt
 
-      - name: Install Python packages
+      - name: cache-pip-linux
+        if: startsWith(runner.os, 'Linux')
+        uses: actions/cache@v4
+        with:
+          path: ~/.cache/pip
+          key: ${{ runner.os }}-pip-${{ matrix.python-version }}
+          restore-keys: |
+            ${{ runner.os }}-pip-${{ matrix.python-version }}
+
+      - name: install-packages
         run: |
-          pip install -r scripts/requirements-actions.txt --require-hashes
+          pip install -r scripts/requirements-base.txt -r scripts/requirements-build-test.txt
 
       - name: Run pytest
         env:

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

@@ -2,13 +2,11 @@ name: Stale Workflow Queue Cleanup
 
 on:
   workflow_dispatch:
+    branches: [main]
   schedule:
   # everyday at 15:00
   - cron: '0 15 * * *'
 
-permissions:
-  contents: read
-
 concurrency:
   group: stale-workflow-queue-cleanup
   cancel-in-progress: true
@@ -16,14 +14,11 @@ concurrency:
 jobs:
   cleanup:
     name: Cleanup
-    runs-on: ubuntu-24.04
-    if: github.ref == 'refs/heads/main'
-    permissions:
-      actions: write # to delete stale workflow runs
+    runs-on: ubuntu-22.04
 
     steps:
     - name: Delete stale queued workflow runs
-      uses: MajorScruffy/delete-old-workflow-runs@78b5af714fefaefdf74862181c467b061782719e # v0.3.0
+      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

.github/workflows/stale_issue.yml

@@ -3,20 +3,13 @@ on:
   schedule:
   - cron: "16 00 * * *"
 
-permissions:
-  contents: read
-
 jobs:
   stale:
     name: Find Stale issues and PRs
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-22.04
     if: github.repository == 'zephyrproject-rtos/zephyr'
-    permissions:
-      pull-requests: write # to comment on stale pull requests
-      issues: write        # to comment on stale issues
-
     steps:
-    - uses: actions/stale@997185467fa4f803885201cee163a9f38240193d # v10.1.1
+    - uses: actions/stale@v9
       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

.github/workflows/stats_merged_prs.yml

@@ -6,28 +6,13 @@ on:
       - main
       - v*-branch
     types: [closed]
-
-permissions:
-  contents: read
-
 jobs:
   record_merged:
     if: github.event.pull_request.merged == true && github.repository == 'zephyrproject-rtos/zephyr'
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-22.04
     steps:
       - name: checkout
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
-
-      - name: Set up Python
-        uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v6.0.0
-        with:
-          python-version: 3.12
-          cache: pip
-          cache-dependency-path: scripts/requirements-actions.txt
-      - name: Install Python packages
-        run: |
-          pip install -r scripts/requirements-actions.txt --require-hashes
-
+        uses: actions/checkout@v4
       - name: PR event
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -35,4 +20,5 @@ jobs:
           ELASTICSEARCH_SERVER: "https://elasticsearch.zephyrproject.io:443"
           PR_STAT_ES_INDEX: ${{ vars.PR_STAT_ES_INDEX }}
         run: |
+          pip install pygithub elasticsearch
           python3 ./scripts/ci/stats/merged_prs.py --pull-request ${{ github.event.pull_request.number }} --repo ${{ github.repository }}

.github/workflows/twister-prep.yaml

@@ -0,0 +1,147 @@
+name: Prepare For a Twister Run
+
+on:
+  workflow_call:
+    outputs:
+      subset:
+        description: subset
+        value: ${{ jobs.prep_push.outputs.subset != '' && jobs.prep_push.outputs.subset ||  jobs.prep_pr.outputs.subset }}
+      size:
+        description: size
+        value: ${{ jobs.prep_push.outputs.size != '' && jobs.prep_push.outputs.size || jobs.prep_pr.outputs.size }}
+      fullrun:
+        description: fullrun
+        value: ${{ jobs.prep_push.outputs.fullrun != '' && jobs.prep_push.outputs.fullrun || jobs.prep_pr.outputs.size }}
+
+jobs:
+  prep_pr:
+    if: github.repository_owner == 'zephyrproject-rtos' && github.event_name == 'pull_request_target'
+    runs-on:
+      group: zephyr-runner-v2-linux-x64-4xlarge
+    container:
+      image: ghcr.io/zephyrproject-rtos/ci-repo-cache:v0.27.4.20241026
+      options: '--entrypoint /bin/bash'
+    outputs:
+      subset: ${{ steps.output-services.outputs.subset }}
+      size: ${{ steps.output-services.outputs.size }}
+      fullrun: ${{ steps.output-services.outputs.fullrun }}
+    env:
+      MATRIX_SIZE: 10
+      PUSH_MATRIX_SIZE: 20
+      WEEKLY_MATRIX_SIZE: 200
+      BSIM_OUT_PATH: /opt/bsim/
+      BSIM_COMPONENTS_PATH: /opt/bsim/components
+      TESTS_PER_BUILDER: 900
+      COMMIT_RANGE: ${{ github.event.pull_request.base.sha }}..${{ github.event.pull_request.head.sha }}
+      BASE_REF: ${{ github.base_ref }}
+    steps:
+      - name: Apply container owner mismatch workaround
+        run: |
+          # FIXME: The owner UID of the GITHUB_WORKSPACE directory may not
+          #        match the container user UID because of the way GitHub
+          #        Actions runner is implemented. Remove this workaround when
+          #        GitHub comes up with a fundamental fix for this problem.
+          git config --global --add safe.directory ${GITHUB_WORKSPACE}
+
+      - name: Print cloud service information
+        run: |
+          echo "ZEPHYR_RUNNER_CLOUD_PROVIDER = ${ZEPHYR_RUNNER_CLOUD_PROVIDER}"
+          echo "ZEPHYR_RUNNER_CLOUD_NODE = ${ZEPHYR_RUNNER_CLOUD_NODE}"
+          echo "ZEPHYR_RUNNER_CLOUD_POD = ${ZEPHYR_RUNNER_CLOUD_POD}"
+
+      - name: Clone cached Zephyr repository
+        continue-on-error: true
+        run: |
+          git clone --shared /repo-cache/zephyrproject/zephyr .
+          git remote set-url origin ${GITHUB_SERVER_URL}/${GITHUB_REPOSITORY}
+
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          ref: ${{ github.event.pull_request.head.sha }}
+          fetch-depth: 0
+          persist-credentials: false
+
+      - name: Environment Setup
+        run: |
+          git config --global user.email "bot@zephyrproject.org"
+          git config --global user.name "Zephyr Bot"
+          rm -fr ".git/rebase-apply"
+          rm -fr ".git/rebase-merge"
+          git rebase origin/${BASE_REF}
+          git clean -f -d
+          git log  --pretty=oneline | head -n 10
+          west init -l . || true
+          west config manifest.group-filter -- +ci,+optional
+          west config --global update.narrow true
+          west update --path-cache /repo-cache/zephyrproject 2>&1 1> west.update.log || west update --path-cache /repo-cache/zephyrproject 2>&1 1> west.update.log || ( rm -rf ../modules ../bootloader ../tools && west update --path-cache /repo-cache/zephyrproject)
+          west forall -c 'git reset --hard HEAD'
+
+          echo "ZEPHYR_SDK_INSTALL_DIR=/opt/toolchains/zephyr-sdk-$( cat SDK_VERSION )" >> $GITHUB_ENV
+
+      - name: Generate Test Plan with Twister
+        id: test-plan
+        run: |
+          export ZEPHYR_BASE=${PWD}
+          export ZEPHYR_TOOLCHAIN_VARIANT=zephyr
+          python3 ./scripts/ci/test_plan.py -c origin/${BASE_REF}.. --no-detailed-test-id --pull-request -t $TESTS_PER_BUILDER
+          if [ -s .testplan ]; then
+            cat .testplan >> $GITHUB_ENV
+          else
+            echo "TWISTER_NODES=${MATRIX_SIZE}" >> $GITHUB_ENV
+          fi
+          rm -f testplan.json .testplan
+
+      - name: Determine matrix size
+        id: output-services
+        run: |
+          if [ -n "${TWISTER_NODES}" ]; then
+            subset="[$(seq -s',' 1 ${TWISTER_NODES})]"
+          else
+            subset="[$(seq -s',' 1 ${MATRIX_SIZE})]"
+          fi
+          size=${TWISTER_NODES}
+
+          echo "subset=${subset}" >> $GITHUB_OUTPUT
+          echo "size=${size}" >> $GITHUB_OUTPUT
+          echo "fullrun=${TWISTER_FULL}" >> $GITHUB_OUTPUT
+
+  prep_push:
+    if: github.repository_owner == 'zephyrproject-rtos' && (github.event_name == 'push' || github.event_name == 'schedule')
+    runs-on: ubuntu-22.04
+    outputs:
+      subset: ${{ steps.output-services.outputs.subset }}
+      size: ${{ steps.output-services.outputs.size }}
+      fullrun: ${{ steps.output-services.outputs.fullrun }}
+    env:
+      MATRIX_SIZE: 10
+      PUSH_MATRIX_SIZE: 20
+      WEEKLY_MATRIX_SIZE: 200
+      BSIM_OUT_PATH: /opt/bsim/
+      BSIM_COMPONENTS_PATH: /opt/bsim/components
+      TESTS_PER_BUILDER: 900
+      COMMIT_RANGE: ${{ github.event.pull_request.base.sha }}..${{ github.event.pull_request.head.sha }}
+      BASE_REF: ${{ github.base_ref }}
+    steps:
+      - name: Print cloud service information
+        run: |
+          echo "ZEPHYR_RUNNER_CLOUD_PROVIDER = ${ZEPHYR_RUNNER_CLOUD_PROVIDER}"
+          echo "ZEPHYR_RUNNER_CLOUD_NODE = ${ZEPHYR_RUNNER_CLOUD_NODE}"
+          echo "ZEPHYR_RUNNER_CLOUD_POD = ${ZEPHYR_RUNNER_CLOUD_POD}"
+
+      - name: Determine matrix size
+        id: output-services
+        run: |
+          if [ "${{github.event_name}}" = "push" ]; then
+            subset="[$(seq -s',' 1 ${PUSH_MATRIX_SIZE})]"
+            size=${MATRIX_SIZE}
+          elif [ "${{github.event_name}}" = "schedule" -a "${{github.repository}}" = "zephyrproject-rtos/zephyr" ]; then
+            subset="[$(seq -s',' 1 ${WEEKLY_MATRIX_SIZE})]"
+            size=${WEEKLY_MATRIX_SIZE}
+          else
+            size=0
+          fi
+
+          echo "subset=${subset}" >> $GITHUB_OUTPUT
+          echo "size=${size}" >> $GITHUB_OUTPUT
+          echo "fullrun=${TWISTER_FULL}" >> $GITHUB_OUTPUT

.github/workflows/twister-publish.yaml

@@ -8,38 +8,26 @@ on:
     types:
       - completed
 
-permissions:
-  contents: read
-
 jobs:
   upload-to-elasticsearch:
     if: |
       github.repository == 'zephyrproject-rtos/zephyr' &&
-      github.event.workflow_run.event != 'pull_request'
+      github.event.workflow_run.event != 'pull_request_target'
     env:
       ELASTICSEARCH_KEY: ${{ secrets.ELASTICSEARCH_KEY }}
       ELASTICSEARCH_SERVER: "https://elasticsearch.zephyrproject.io:443"
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-22.04
     steps:
       # Needed for elasticearch and upload script
       - name: Checkout
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
           persist-credentials: false
-      - name: Set up Python
-        uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v6.0.0
-        with:
-          python-version: 3.12
-          cache: pip
-          cache-dependency-path: scripts/requirements-actions.txt
-      - name: Install Python packages
-        run: |
-          pip install -r scripts/requirements-actions.txt --require-hashes
 
       - name: Download Artifacts
         id: download-artifacts
-        uses: dawidd6/action-download-artifact@0bd50d53a6d7fb5cb921e607957e9cc12b4ce392 # v12
+        uses: dawidd6/action-download-artifact@v8
         with:
           path: artifacts
           workflow: twister.yml
@@ -49,6 +37,7 @@ jobs:
       - name: Upload to elasticsearch
         if: steps.download-artifacts.outputs.found_artifact == 'true'
         run: |
+          pip 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.workflow_run.event}}" = "push" ]; then

.github/workflows/twister.yaml

@@ -6,17 +6,14 @@ on:
       - main
       - v*-branch
       - collab-*
-  pull_request:
+  pull_request_target:
     branches:
       - main
       - v*-branch
       - collab-*
   schedule:
-    # Run at 02:00 UTC on every Sunday
-    - cron: '0 2 * * 0'
-
-permissions:
-  contents: read
+    # Run at 17:00 UTC on every Saturday
+    - cron: '0 17 * * 6'
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.event_name }}-${{ github.head_ref || github.ref }}
@@ -24,102 +21,7 @@ concurrency:
 
 jobs:
   twister-build-prep:
-    if: github.repository_owner == 'zephyrproject-rtos'
-    runs-on: ubuntu-24.04
-    outputs:
-      subset: ${{ steps.output-services.outputs.subset }}
-      size: ${{ steps.output-services.outputs.size }}
-      fullrun: ${{ steps.output-services.outputs.fullrun }}
-    env:
-      MATRIX_SIZE: 10
-      PUSH_MATRIX_SIZE: 20
-      WEEKLY_MATRIX_SIZE: 200
-      BSIM_OUT_PATH: /opt/bsim/
-      BSIM_COMPONENTS_PATH: /opt/bsim/components
-      TESTS_PER_BUILDER: 900
-      COMMIT_RANGE: ${{ github.event.pull_request.base.sha }}..${{ github.event.pull_request.head.sha }}
-      BASE_REF: ${{ github.base_ref }}
-    steps:
-      - name: Checkout
-        if: github.event_name == 'pull_request'
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
-        with:
-          ref: ${{ github.event.pull_request.head.sha }}
-          fetch-depth: 0
-          path: zephyr
-          persist-credentials: false
-
-      - name: Set up Python
-        if: github.event_name == 'pull_request'
-        uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v6.0.0
-        with:
-          python-version: 3.12
-          cache: pip
-          cache-dependency-path: scripts/requirements-actions.txt
-
-      - name: install-packages
-        working-directory: zephyr
-        if: github.event_name == 'pull_request'
-        run: |
-          pip install -r scripts/requirements-actions.txt --require-hashes
-
-      - name: Setup Zephyr project
-        if: github.event_name == 'pull_request'
-        uses: zephyrproject-rtos/action-zephyr-setup@360ff9b36e58499d9eb28015cdcde7ca03a5b04d # v1.0.12
-        with:
-          app-path: zephyr
-          enable-ccache: false
-
-      - name: Environment Setup
-        working-directory: zephyr
-        if: github.event_name == 'pull_request'
-        run: |
-          git config --global user.email "bot@zephyrproject.org"
-          git config --global user.name "Zephyr Bot"
-          rm -fr ".git/rebase-apply"
-          rm -fr ".git/rebase-merge"
-          git rebase origin/${BASE_REF}
-          git clean -f -d
-          git log  --pretty=oneline | head -n 10
-
-      - name: Generate Test Plan with Twister
-        working-directory: zephyr
-        if: github.event_name == 'pull_request'
-        id: test-plan
-        run: |
-          export ZEPHYR_BASE=${PWD}
-          export ZEPHYR_TOOLCHAIN_VARIANT=zephyr
-          python3 ./scripts/ci/test_plan.py -c origin/${BASE_REF}.. --pull-request -t $TESTS_PER_BUILDER
-          if [ -s .testplan ]; then
-            cat .testplan >> $GITHUB_ENV
-          else
-            echo "TWISTER_NODES=${MATRIX_SIZE}" >> $GITHUB_ENV
-          fi
-          rm -f testplan.json .testplan
-
-      - name: Determine matrix size
-        id: output-services
-        run: |
-          if [ "${{github.event_name}}" = "push" ]; then
-            subset="[$(seq -s',' 1 ${PUSH_MATRIX_SIZE})]"
-            size=${MATRIX_SIZE}
-          elif [ "${{github.event_name}}" = "pull_request" ]; then
-            if [ -n "${TWISTER_NODES}" ]; then
-              subset="[$(seq -s',' 1 ${TWISTER_NODES})]"
-            else
-              subset="[$(seq -s',' 1 ${MATRIX_SIZE})]"
-            fi
-            size=${TWISTER_NODES}
-          elif [ "${{github.event_name}}" = "schedule" -a "${{github.repository}}" = "zephyrproject-rtos/zephyr" ]; then
-            subset="[$(seq -s',' 1 ${WEEKLY_MATRIX_SIZE})]"
-            size=${WEEKLY_MATRIX_SIZE}
-          else
-            size=0
-          fi
-
-          echo "subset=${subset}" >> $GITHUB_OUTPUT
-          echo "size=${size}" >> $GITHUB_OUTPUT
-          echo "fullrun=${TWISTER_FULL}" >> $GITHUB_OUTPUT
+    uses: ./.github/workflows/twister-prep.yaml
 
   twister-build:
     runs-on:
@@ -127,7 +29,7 @@ jobs:
     needs: twister-build-prep
     if: needs.twister-build-prep.outputs.size != 0
     container:
-      image: ghcr.io/zephyrproject-rtos/ci-repo-cache:v0.28.7.20251127
+      image: ghcr.io/zephyrproject-rtos/ci-repo-cache:v0.27.4.20241026
       options: '--entrypoint /bin/bash'
     strategy:
       fail-fast: false
@@ -142,13 +44,13 @@ jobs:
       CCACHE_IGNOREOPTIONS: '-specs=* --specs=*'
       BSIM_OUT_PATH: /opt/bsim/
       BSIM_COMPONENTS_PATH: /opt/bsim/components
-      TWISTER_COMMON: ' --test-config tests/test_config_ci.yaml --force-color --inline-logs -v -N -M --retry-failed 3 --timeout-multiplier 2 '
-      WEEKLY_OPTIONS: ' -M --build-only --all --show-footprint --report-filtered -j 32'
-      PR_OPTIONS: ' --clobber-output --integration -j 16'
-      PUSH_OPTIONS: ' --clobber-output -M --show-footprint --report-filtered -j 16'
+      TWISTER_COMMON: '--no-detailed-test-id --force-color --inline-logs -v -N -M --retry-failed 3 --timeout-multiplier 2 '
+      WEEKLY_OPTIONS: ' -M --build-only --all --show-footprint --report-filtered'
+      PR_OPTIONS: ' --clobber-output --integration'
+      PUSH_OPTIONS: ' --clobber-output -M --show-footprint --report-filtered'
       COMMIT_RANGE: ${{ github.event.pull_request.base.sha }}..${{ github.event.pull_request.head.sha }}
       BASE_REF: ${{ github.base_ref }}
-      LLVM_TOOLCHAIN_PATH: /usr/lib/llvm-20
+      LLVM_TOOLCHAIN_PATH: /usr/lib/llvm-16
     steps:
       - name: Print cloud service information
         run: |
@@ -171,7 +73,7 @@ jobs:
           git remote set-url origin ${GITHUB_SERVER_URL}/${GITHUB_REPOSITORY}
 
       - name: Checkout
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        uses: actions/checkout@v4
         with:
           ref: ${{ github.event.pull_request.head.sha }}
           fetch-depth: 0
@@ -179,7 +81,7 @@ jobs:
 
       - name: Environment Setup
         run: |
-          if [ "${{github.event_name}}" = "pull_request" ]; then
+          if [ "${{github.event_name}}" = "pull_request_target" ]; then
             git config --global user.email "bot@zephyrproject.org"
             git config --global user.name "Zephyr Builder"
             rm -fr ".git/rebase-apply"
@@ -192,7 +94,7 @@ jobs:
           echo "$HOME/.cargo/bin" >> $GITHUB_PATH
 
           west init -l . || true
-          west config manifest.group-filter -- +ci,+optional,+testing
+          west config manifest.group-filter -- +ci,+optional
           west config --global update.narrow true
           west update --path-cache /repo-cache/zephyrproject 2>&1 1> west.update.log || west update --path-cache /repo-cache/zephyrproject 2>&1 1> west.update.log || ( rm -rf ../modules ../bootloader ../tools && west update --path-cache /repo-cache/zephyrproject)
           west forall -c 'git reset --hard HEAD'
@@ -210,11 +112,6 @@ jobs:
           echo "github.base_ref: ${{ github.base_ref }}"
           echo "github.ref_name: ${{ github.ref_name }}"
 
-      - name: Install Python packages
-        run: |
-          pip install -r scripts/requirements-actions.txt --require-hashes
-          west packages pip --install
-
       - name: Set up ccache
         run: |
           mkdir -p ${CCACHE_DIR}
@@ -246,14 +143,14 @@ jobs:
             fi
           fi
 
-      - if: github.event_name == 'pull_request'
+      - if: github.event_name == 'pull_request_target'
         name: Run Tests with Twister (Pull Request)
         id: run_twister_pr
         run: |
           rm -f testplan.json
           export ZEPHYR_BASE=${PWD}
           export ZEPHYR_TOOLCHAIN_VARIANT=zephyr
-          python3 ./scripts/ci/test_plan.py -c origin/${BASE_REF}.. --pull-request
+          python3 ./scripts/ci/test_plan.py -c origin/${BASE_REF}.. --pull-request --no-detailed-test-id
           ./scripts/twister --subset ${{matrix.subset}}/${{ strategy.job-total }} --load-tests testplan.json ${TWISTER_COMMON} ${PR_OPTIONS}
           if [ "${{matrix.subset}}" = "1" -a ${{needs.twister-build-prep.outputs.fullrun}} = 'True' ]; then
             ./scripts/zephyr_module.py --twister-out module_tests.args
@@ -283,7 +180,7 @@ jobs:
 
       - name: Upload Unit Test Results
         if: always()
-        uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
+        uses: actions/upload-artifact@v4
         with:
           name: Unit Test Results (Subset ${{ matrix.subset }})
           if-no-files-found: ignore
@@ -305,7 +202,7 @@ jobs:
 
       - if: matrix.subset == 1 && github.event_name == 'push'
         name: Upload the list of Python packages
-        uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
+        uses: actions/upload-artifact@v4
         with:
           name: Frozen PIP package set
           path: |
@@ -315,44 +212,33 @@ jobs:
     name: "Publish Unit Tests Results"
     needs:
       - twister-build
-    runs-on: ubuntu-24.04
-    permissions:
-      checks: write # to create the check run entry with Twister test results
+    runs-on: ubuntu-22.04
     # the build-and-test job might be skipped, we don't need to run this job then
     if: success() || failure()
 
     steps:
       - name: Check out source code
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        if: needs.twister-build.result == 'failure'
+        uses: actions/checkout@v4
         with:
           ref: ${{ github.event.pull_request.head.sha }}
           fetch-depth: 0
           persist-credentials: false
 
-      - name: Set up Python
-        uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v6.0.0
-        with:
-          python-version: 3.12
-          cache: pip
-          cache-dependency-path: scripts/requirements-actions.txt
-
-      - name: Install Python packages
-        run: |
-          pip install -r scripts/requirements-actions.txt --require-hashes
-
       - name: Download Artifacts
-        uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 # v7.0.0
+        uses: actions/download-artifact@v4
         with:
           path: artifacts
 
       - name: Merge Test Results
         run: |
-          junitparser merge --glob 'artifacts/*/twister.xml' 'artifacts/*/*/twister.xml' junit.xml
+          pip install junitparser junit2html
+          junitparser merge artifacts/*/*/twister.xml junit.xml
           junit2html junit.xml junit.html
 
       - name: Upload Unit Test Results
         if: always()
-        uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
+        uses: actions/upload-artifact@v4
         with:
           name: Unit Test Results
           if-no-files-found: ignore
@@ -360,14 +246,8 @@ jobs:
             junit.html
             junit.xml
 
-      - name: Upload test results to Codecov
-        if: ${{ !cancelled() && (github.event_name == 'push') }}
-        uses: codecov/test-results-action@0fa95f0e1eeaafde2c782583b36b28ad0d8c77d3 # v1.2.1
-        with:
-          token: ${{ secrets.CODECOV_TOKEN }}
-
       - name: Publish Unit Test Results
-        uses: EnricoMi/publish-unit-test-result-action@27d65e188ec43221b20d26de30f4892fad91df2f # v2.22.0
+        uses: EnricoMi/publish-unit-test-result-action@v2
         with:
           check_name: Unit Test Results
           files: "**/twister.xml"
@@ -384,7 +264,7 @@ jobs:
 
       - name: Upload Twister Analysis Results
         if: needs.twister-build.result == 'failure'
-        uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
+        uses: actions/upload-artifact@v4
         with:
           name: Twister Analysis Results
           if-no-files-found: ignore

.github/workflows/twister_tests.yml

@@ -26,9 +26,6 @@ on:
     - '.github/workflows/twister_tests.yml'
     - 'scripts/schemas/twister/'
 
-permissions:
-  contents: read
-
 jobs:
   twister-tests:
     name: Twister Unit Tests
@@ -36,22 +33,25 @@ jobs:
     strategy:
       matrix:
         python-version: ['3.10', '3.11', '3.12', '3.13']
-        os: [ubuntu-24.04]
+        os: [ubuntu-22.04]
     steps:
     - name: checkout
-      uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
-
+      uses: actions/checkout@v4
     - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v6.0.0
+      uses: actions/setup-python@v5
       with:
         python-version: ${{ matrix.python-version }}
-        cache: pip
-        cache-dependency-path: scripts/requirements-actions.txt
-
-    - name: Install Python packages
+    - name: cache-pip-linux
+      if: startsWith(runner.os, 'Linux')
+      uses: actions/cache@v4
+      with:
+        path: ~/.cache/pip
+        key: ${{ runner.os }}-pip-${{ matrix.python-version }}
+        restore-keys: |
+          ${{ runner.os }}-pip-${{ matrix.python-version }}
+    - name: install-packages
       run: |
-        pip install -r scripts/requirements-actions.txt --require-hashes
-
+        pip install -r scripts/requirements-base.txt -r scripts/requirements-build-test.txt -r scripts/requirements-run-test.txt
     - name: Run pytest for twisterlib
       env:
         ZEPHYR_BASE: ./

.github/workflows/twister_tests_blackbox.yml

@@ -15,52 +15,66 @@ on:
     - 'scripts/tests/twister_blackbox/**'
     - '.github/workflows/twister_tests_blackbox.yml'
 
-permissions:
-  contents: read
-
-env:
-  PYTHONIOENCODING: utf-8
-
 jobs:
   twister-tests:
     name: Twister Black Box Tests
+    runs-on: ${{ matrix.os }}
     strategy:
       matrix:
         python-version: ['3.10', '3.11', '3.12', '3.13']
-      fail-fast: false
-    runs-on: ubuntu-24.04
+        os: [ubuntu-22.04]
+    container:
+      image: ghcr.io/zephyrproject-rtos/ci:v0.27.4
+
     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@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
-      with:
-        path: zephyr
-        fetch-depth: 0
+      uses: actions/checkout@v4
+
+    - name: Environment Setup
+      run: |
+        echo "$HOME/.local/bin" >> $GITHUB_PATH
+
+        west init -l . || true
+        # we do not depend on any hals, tools or bootloader, save some time and space...
+        west config manifest.group-filter -- -hal,-tools,-bootloader,-babblesim
+        west config manifest.project-filter -- -nrf_hw_models
+        west config --global update.narrow true
+        west update --path-cache /github/cache/zephyrproject 2>&1 1> west.update.log || west update --path-cache /github/cache/zephyrproject 2>&1 1> west.update.log || ( rm -rf ../modules ../bootloader ../tools && west update --path-cache /github/cache/zephyrproject)
+        west forall -c 'git reset --hard HEAD'
+
+        echo "ZEPHYR_SDK_INSTALL_DIR=/opt/toolchains/zephyr-sdk-$( cat SDK_VERSION )" >> $GITHUB_ENV
 
     - name: Set Up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v6.0.0
+      uses: actions/setup-python@v5
       with:
         python-version: ${{ matrix.python-version }}
-        cache: pip
-        cache-dependency-path: scripts/requirements-actions.txt
 
-    - name: Setup Zephyr project
-      uses: zephyrproject-rtos/action-zephyr-setup@360ff9b36e58499d9eb28015cdcde7ca03a5b04d # v1.0.12
-      with:
-        app-path: zephyr
-        toolchains: 'arm-zephyr-eabi:riscv64-zephyr-elf:x86_64-zephyr-elf'
-        enable-ccache: false
-        west-group-filter: -tools,-bootloader,-babblesim,-hal
-        west-project-filter: -nrf_hw_models,+cmsis,+hal_xtensa,+cmsis_6
+    - 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
-      working-directory: zephyr
       shell: bash
       env:
         ZEPHYR_BASE: ./
         ZEPHYR_TOOLCHAIN_VARIANT: zephyr
       run: |
-        export ZEPHYR_SDK_INSTALL_DIR=${{ github.workspace }}/zephyr-sdk
-        sudo apt-get install -y lcov
         echo "Run twister tests"
         source zephyr-env.sh
-        PYTHONPATH="./scripts/tests" pytest ./scripts/tests/twister_blackbox/
+        PYTHONPATH="./scripts/tests" pytest ./scripts/tests/twister_blackbox

.github/workflows/west_cmds.yml

@@ -23,11 +23,8 @@ on:
     - 'scripts/west_commands/**'
     - '.github/workflows/west_cmds.yml'
 
-permissions:
-  contents: read
-
 jobs:
-  west-commands:
+  west-commnads:
     name: West Command Tests
     runs-on: ${{ matrix.os }}
     strategy:
@@ -36,24 +33,43 @@ jobs:
         os: [ubuntu-22.04, macos-14, windows-2022]
     steps:
     - name: checkout
-      uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
-
+      uses: actions/checkout@v4
     - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v6.0.0
+      uses: actions/setup-python@v5
       with:
         python-version: ${{ matrix.python-version }}
-        cache: pip
-        cache-dependency-path: scripts/requirements-actions.txt
-
-    - name: Install Python packages
+    - name: cache-pip-linux
+      if: startsWith(runner.os, 'Linux')
+      uses: actions/cache@v4
+      with:
+        path: ~/.cache/pip
+        key: ${{ runner.os }}-pip-${{ matrix.python-version }}
+        restore-keys: |
+          ${{ runner.os }}-pip-${{ matrix.python-version }}
+    - name: cache-pip-mac
+      if: startsWith(runner.os, 'macOS')
+      uses: actions/cache@v4
+      with:
+        path: ~/Library/Caches/pip
+        # Trailing '-' was just to get a different cache name
+        key: ${{ runner.os }}-pip-${{ matrix.python-version }}-
+        restore-keys: |
+          ${{ runner.os }}-pip-${{ matrix.python-version }}-
+    - name: cache-pip-win
+      if: startsWith(runner.os, 'Windows')
+      uses: actions/cache@v4
+      with:
+        path: ~\AppData\Local\pip\Cache
+        key: ${{ runner.os }}-pip-${{ matrix.python-version }}
+        restore-keys: |
+          ${{ runner.os }}-pip-${{ matrix.python-version }}
+    - name: install pytest
       run: |
-        pip install -r scripts/requirements-actions.txt --require-hashes
-
+        pip install pytest west pyelftools canopen natsort progress mypy intelhex psutil ply pyserial anytree junitparser
     - name: run pytest-win
       if: runner.os == 'Windows'
       run: |
         python ./scripts/west_commands/run_tests.py
-
     - name: run pytest-mac-linux
       if: runner.os != 'Windows'
       run: |

.gitignore

@@ -1,6 +1,3 @@
-# SPDX-License-Identifier: Apache-2.0
-# SPDX-FileCopyrightText: Copyright The Zephyr Project Contributors
-
 *.o
 *.a
 *.d
@@ -17,7 +14,6 @@
 build*/
 !doc/build/
 !scripts/build
-!share/sysbuild/build
 !tests/drivers/build_all
 !scripts/pylib/build_helpers
 cscope.*
@@ -59,7 +55,6 @@ doc/doc.warnings
 hide-defaults-note
 venv
 .venv
-.envrc
 .DS_Store
 .clangd
 new.info
@@ -77,7 +72,6 @@ target/
 
 # CI output
 compliance.xml
-dts_linter.patch
 _error.types
 
 # Tag files
@@ -90,13 +84,11 @@ tags
 .idea
 
 # from check_compliance.py
-# zephyr-keep-sorted-start
 BinaryFiles.txt
 BoardYml.txt
 Checkpatch.txt
 ClangFormat.txt
 DevicetreeBindings.txt
-DevicetreeLinting.txt
 GitDiffCheck.txt
 Gitlint.txt
 Identity.txt
@@ -106,12 +98,10 @@ KconfigBasic.txt
 KconfigBasicNoModules.txt
 KconfigHWMv2.txt
 KeepSorted.txt
-LicenseAndCopyrightCheck.txt
 MaintainersFormat.txt
 ModulesMaintainers.txt
 Nits.txt
 Pylint.txt
-PythonCompat.txt
 Ruff.txt
 SphinxLint.txt
 SysbuildKconfig.txt
@@ -119,8 +109,3 @@ SysbuildKconfigBasic.txt
 SysbuildKconfigBasicNoModules.txt
 TextEncoding.txt
 YAMLLint.txt
-ZephyrModuleFile.txt
-# zephyr-keep-sorted-stop
-
-# Node dependecies
-node_modules

.gitlint

@@ -1,7 +1,6 @@
 # All these sections are optional, edit this file as you like.
 # Zephyr-specific defaults are located in scripts/gitlint/zephyr_commit_rules.py
 [general]
-regex-style-search=true
 ignore=title-trailing-punctuation, T3, title-max-length, T1, body-hard-tab, B3, B1
 # verbosity should be a value between 1 and 3, the commandline -v flags take precedence over this
 verbosity = 3
@@ -60,7 +59,3 @@ ignore-merge-commits=false
 # By specifying this rule, developers can only change the file when they explicitly reference
 # it in the commit message.
 #files=gitlint/rules.py,README.md
-
-[ignore-by-author-name]
-regex=^dependabot\[bot\]$
-ignore=all

CMakeLists.txt

@@ -71,15 +71,6 @@ set(ZEPHYR_CURRENT_LINKER_PASS 0)
 set(ZEPHYR_CURRENT_LINKER_CMD    linker_zephyr_pre${ZEPHYR_CURRENT_LINKER_PASS}.cmd)
 set(ZEPHYR_LINK_STAGE_EXECUTABLE zephyr_pre${ZEPHYR_CURRENT_LINKER_PASS})
 
-# Make kconfig variables available to the linker script generator
-zephyr_linker_include_generated(KCONFIG ${CMAKE_CURRENT_BINARY_DIR}/.config)
-
-# The linker generator also needs sections.h to be able to access e.g. _APP_SMEM_SECTION_NAME
-# for linkerscripts that do not support c-preprocessing.
-zephyr_linker_include_generated(HEADER ${ZEPHYR_BASE}/include/zephyr/linker/sections.h)
-
-zephyr_linker_include_var(VAR CMAKE_VERBOSE_MAKEFILE VALUE ${CMAKE_VERBOSE_MAKEFILE})
-
 # ZEPHYR_PREBUILT_EXECUTABLE is used outside of this file, therefore keep the
 # existing variable to allow slowly cleanup of linking stage handling.
 # Three stage linking active: pre0 -> pre1 -> final, this will correspond to `pre1`
@@ -96,6 +87,7 @@ set(OFFSETS_H_TARGET           offsets_h)
 set(SYSCALL_LIST_H_TARGET      syscall_list_h_target)
 set(DRIVER_VALIDATION_H_TARGET driver_validation_h_target)
 set(KOBJ_TYPES_H_TARGET        kobj_types_h_target)
+set(PARSE_SYSCALLS_TARGET      parse_syscalls_target)
 set(DEVICE_API_LD_TARGET       device_api_ld_target)
 
 define_property(GLOBAL PROPERTY PROPERTY_OUTPUT_FORMAT BRIEF_DOCS " " FULL_DOCS " ")
@@ -159,19 +151,13 @@ zephyr_compile_options($<$<COMPILE_LANGUAGE:C>:$<TARGET_PROPERTY:compiler,no_str
 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)
+if (CONFIG_COMPILER_WARNINGS_AS_ERRORS)
   zephyr_compile_options($<$<COMPILE_LANGUAGE:C>:$<TARGET_PROPERTY:compiler,warnings_as_errors>>)
   zephyr_compile_options($<$<COMPILE_LANGUAGE:CXX>:$<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()
 
-if(CONFIG_DEPRECATION_TEST OR NOT CONFIG_WARN_DEPRECATED)
-  zephyr_compile_options($<$<COMPILE_LANGUAGE:C>:$<TARGET_PROPERTY:compiler,no_deprecation_warning>>)
-  zephyr_compile_options($<$<COMPILE_LANGUAGE:CXX>:$<TARGET_PROPERTY:compiler,no_deprecation_warning>>)
-  zephyr_compile_options($<$<COMPILE_LANGUAGE:ASM>:$<TARGET_PROPERTY:asm,no_deprecation_warning>>)
-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,
@@ -198,7 +184,7 @@ elseif(CONFIG_STACK_CANARIES_ALL)
   zephyr_compile_options("$<$<COMPILE_LANGUAGE:CXX>:$<TARGET_PROPERTY:compiler,security_canaries_all>>")
 elseif(CONFIG_STACK_CANARIES_EXPLICIT)
   zephyr_compile_options("$<$<COMPILE_LANGUAGE:C>:$<TARGET_PROPERTY:compiler,security_canaries_explicit>>")
-  zephyr_compile_options("$<$<COMPILE_LANGUAGE:CXX>:$<TARGET_PROPERTY:compiler,security_canaries_explicit>>")
+  zephyr_compile_options("$<$<COMPILE_LANGUAGE:CXX>:$<TARGET_PROPERTY:compiler,security_canaries_explitic>>")
 endif()
 
 # @Intent: Obtain compiler optimizations flags and store in variables
@@ -214,82 +200,24 @@ endif()
 #    1) Using EXTRA_CFLAGS which is applied regardless of kconfig choice, or
 #    2) Rely on override support being implemented by your toolchain_cc_optimize_*()
 #
-get_property(COMPILER_OPTIMIZE_FOR_NO_OPTIMIZATIONS_FLAG TARGET compiler PROPERTY no_optimization)
-get_property(COMPILER_OPTIMIZE_FOR_DEBUG_FLAG TARGET compiler PROPERTY optimization_debug)
-get_property(COMPILER_OPTIMIZE_FOR_SPEED_FLAG TARGET compiler PROPERTY optimization_speed)
-get_property(COMPILER_OPTIMIZE_FOR_SIZE_FLAG  TARGET compiler PROPERTY optimization_size)
-get_property(COMPILER_OPTIMIZE_FOR_SIZE_AGGRESSIVE_FLAG TARGET compiler PROPERTY optimization_size_aggressive)
-
-get_property(ASM_OPTIMIZE_FOR_NO_OPTIMIZATIONS_FLAG TARGET asm PROPERTY no_optimization)
-get_property(ASM_OPTIMIZE_FOR_DEBUG_FLAG TARGET asm PROPERTY optimization_debug)
-get_property(ASM_OPTIMIZE_FOR_SPEED_FLAG TARGET asm PROPERTY optimization_speed)
-get_property(ASM_OPTIMIZE_FOR_SIZE_FLAG  TARGET asm PROPERTY optimization_size)
-get_property(ASM_OPTIMIZE_FOR_SIZE_AGGRESSIVE_FLAG TARGET asm PROPERTY optimization_size_aggressive)
-
-get_property(LINKER_OPTIMIZE_FOR_NO_OPTIMIZATIONS_FLAG TARGET linker PROPERTY no_optimization)
-get_property(LINKER_OPTIMIZE_FOR_DEBUG_FLAG TARGET linker PROPERTY optimization_debug)
-get_property(LINKER_OPTIMIZE_FOR_SPEED_FLAG TARGET linker PROPERTY optimization_speed)
-get_property(LINKER_OPTIMIZE_FOR_SIZE_FLAG  TARGET linker PROPERTY optimization_size)
-get_property(LINKER_OPTIMIZE_FOR_SIZE_AGGRESSIVE_FLAG TARGET linker PROPERTY optimization_size_aggressive)
-
-# Let the assembler inherit the optimization flags of the compiler if it is
-# not set explicitly.
-if(NOT ASM_OPTIMIZE_FOR_NO_OPTIMIZATIONS_FLAG)
-  set(ASM_OPTIMIZE_FOR_NO_OPTIMIZATIONS_FLAG ${COMPILER_OPTIMIZE_FOR_NO_OPTIMIZATIONS_FLAG})
-endif()
-if(NOT ASM_OPTIMIZE_FOR_DEBUG_FLAG)
-  set(ASM_OPTIMIZE_FOR_DEBUG_FLAG ${COMPILER_OPTIMIZE_FOR_DEBUG_FLAG})
-endif()
-if(NOT ASM_OPTIMIZE_FOR_SPEED_FLAG)
-  set(ASM_OPTIMIZE_FOR_SPEED_FLAG ${COMPILER_OPTIMIZE_FOR_SPEED_FLAG})
-endif()
-if(NOT ASM_OPTIMIZE_FOR_SIZE_FLAG)
-  set(ASM_OPTIMIZE_FOR_SIZE_FLAG ${COMPILER_OPTIMIZE_FOR_SIZE_FLAG})
-endif()
-if(NOT ASM_OPTIMIZE_FOR_SIZE_AGGRESSIVE_FLAG)
-  set(ASM_OPTIMIZE_FOR_SIZE_AGGRESSIVE_FLAG ${COMPILER_OPTIMIZE_FOR_SIZE_AGGRESSIVE_FLAG})
-endif()
-
-# Let the linker inherit the optimization flags of the compiler if it is
-# not set explicitly.
-if(NOT LINKER_OPTIMIZE_FOR_NO_OPTIMIZATIONS_FLAG)
-  set(LINKER_OPTIMIZE_FOR_NO_OPTIMIZATIONS_FLAG ${COMPILER_OPTIMIZE_FOR_NO_OPTIMIZATIONS_FLAG})
-endif()
-if(NOT LINKER_OPTIMIZE_FOR_DEBUG_FLAG)
-  set(LINKER_OPTIMIZE_FOR_DEBUG_FLAG ${COMPILER_OPTIMIZE_FOR_DEBUG_FLAG})
-endif()
-if(NOT LINKER_OPTIMIZE_FOR_SPEED_FLAG)
-  set(LINKER_OPTIMIZE_FOR_SPEED_FLAG ${COMPILER_OPTIMIZE_FOR_SPEED_FLAG})
-endif()
-if(NOT LINKER_OPTIMIZE_FOR_SIZE_FLAG)
-  set(LINKER_OPTIMIZE_FOR_SIZE_FLAG ${COMPILER_OPTIMIZE_FOR_SIZE_FLAG})
-endif()
-if(NOT LINKER_OPTIMIZE_FOR_SIZE_AGGRESSIVE_FLAG)
-  set(LINKER_OPTIMIZE_FOR_SIZE_AGGRESSIVE_FLAG ${COMPILER_OPTIMIZE_FOR_SIZE_AGGRESSIVE_FLAG})
-endif()
+get_property(OPTIMIZE_FOR_NO_OPTIMIZATIONS_FLAG TARGET compiler PROPERTY no_optimization)
+get_property(OPTIMIZE_FOR_DEBUG_FLAG TARGET compiler PROPERTY optimization_debug)
+get_property(OPTIMIZE_FOR_SPEED_FLAG TARGET compiler PROPERTY optimization_speed)
+get_property(OPTIMIZE_FOR_SIZE_FLAG  TARGET compiler PROPERTY optimization_size)
+get_property(OPTIMIZE_FOR_SIZE_AGGRESSIVE_FLAG TARGET compiler PROPERTY optimization_size_aggressive)
 
 # From kconfig choice, pick the actual OPTIMIZATION_FLAG to use.
 # Kconfig choice ensures only one of these CONFIG_*_OPTIMIZATIONS is set.
 if(CONFIG_NO_OPTIMIZATIONS)
-  set(COMPILER_OPTIMIZATION_FLAG ${COMPILER_OPTIMIZE_FOR_NO_OPTIMIZATIONS_FLAG})
-  set(ASM_OPTIMIZATION_FLAG ${ASM_OPTIMIZE_FOR_NO_OPTIMIZATIONS_FLAG})
-  set(LINKER_OPTIMIZATION_FLAG ${LINKER_OPTIMIZE_FOR_NO_OPTIMIZATIONS_FLAG})
+  set(OPTIMIZATION_FLAG ${OPTIMIZE_FOR_NO_OPTIMIZATIONS_FLAG})
 elseif(CONFIG_DEBUG_OPTIMIZATIONS)
-  set(COMPILER_OPTIMIZATION_FLAG ${COMPILER_OPTIMIZE_FOR_DEBUG_FLAG})
-  set(ASM_OPTIMIZATION_FLAG ${ASM_OPTIMIZE_FOR_DEBUG_FLAG})
-  set(LINKER_OPTIMIZATION_FLAG ${LINKER_OPTIMIZE_FOR_DEBUG_FLAG})
+  set(OPTIMIZATION_FLAG ${OPTIMIZE_FOR_DEBUG_FLAG})
 elseif(CONFIG_SPEED_OPTIMIZATIONS)
-  set(COMPILER_OPTIMIZATION_FLAG ${COMPILER_OPTIMIZE_FOR_SPEED_FLAG})
-  set(ASM_OPTIMIZATION_FLAG ${ASM_OPTIMIZE_FOR_SPEED_FLAG})
-  set(LINKER_OPTIMIZATION_FLAG ${LINKER_OPTIMIZE_FOR_SPEED_FLAG})
+  set(OPTIMIZATION_FLAG ${OPTIMIZE_FOR_SPEED_FLAG})
 elseif(CONFIG_SIZE_OPTIMIZATIONS)
-  set(COMPILER_OPTIMIZATION_FLAG ${COMPILER_OPTIMIZE_FOR_SIZE_FLAG}) # Default in kconfig
-  set(ASM_OPTIMIZATION_FLAG ${ASM_OPTIMIZE_FOR_SIZE_FLAG})
-  set(LINKER_OPTIMIZATION_FLAG ${LINKER_OPTIMIZE_FOR_SIZE_FLAG})
+  set(OPTIMIZATION_FLAG ${OPTIMIZE_FOR_SIZE_FLAG}) # Default in kconfig
 elseif(CONFIG_SIZE_OPTIMIZATIONS_AGGRESSIVE)
-  set(COMPILER_OPTIMIZATION_FLAG ${COMPILER_OPTIMIZE_FOR_SIZE_AGGRESSIVE_FLAG})
-  set(ASM_OPTIMIZATION_FLAG ${ASM_OPTIMIZE_FOR_SIZE_AGGRESSIVE_FLAG})
-  set(LINKER_OPTIMIZATION_FLAG ${LINKER_OPTIMIZE_FOR_SIZE_AGGRESSIVE_FLAG})
+  set(OPTIMIZATION_FLAG ${OPTIMIZE_FOR_SIZE_AGGRESSIVE_FLAG})
 else()
   message(FATAL_ERROR
     "Unreachable code. Expected optimization level to have been chosen. See Kconfig.zephyr")
@@ -303,23 +231,12 @@ SOC_* symbol.")
 endif()
 
 # Apply the final optimization flag(s)
-zephyr_compile_options($<$<COMPILE_LANGUAGE:ASM>:${ASM_OPTIMIZATION_FLAG}>)
-zephyr_compile_options($<$<COMPILE_LANGUAGE:C>:${COMPILER_OPTIMIZATION_FLAG}>)
-zephyr_compile_options($<$<COMPILE_LANGUAGE:CXX>:${COMPILER_OPTIMIZATION_FLAG}>)
-add_link_options(${LINKER_OPTIMIZATION_FLAG})
-compiler_simple_options(simple_options)
-toolchain_linker_add_compiler_options(${simple_options})
+zephyr_compile_options($<$<COMPILE_LANGUAGE:C>:${OPTIMIZATION_FLAG}>)
+zephyr_compile_options($<$<COMPILE_LANGUAGE:CXX>:${OPTIMIZATION_FLAG}>)
 
 if(CONFIG_LTO)
-  if(CONFIG_LTO_SINGLE_THREADED)
-    zephyr_compile_options($<TARGET_PROPERTY:compiler,optimization_lto_st>)
-    add_link_options($<TARGET_PROPERTY:linker,lto_arguments_st>)
-  else()
-    set(genex_tgt_lto "$<TARGET_PROPERTY:LTO>")
-    set(genex_lto "$<TARGET_PROPERTY:compiler,optimization_lto>")
-    zephyr_compile_options("$<$<OR:$<STREQUAL:${genex_tgt_lto},>,${genex_tgt_lto}>:${genex_lto}>")
-    add_link_options($<TARGET_PROPERTY:linker,lto_arguments>)
-  endif()
+  zephyr_compile_options($<TARGET_PROPERTY:compiler,optimization_lto>)
+  add_link_options($<TARGET_PROPERTY:linker,lto_arguments>)
 endif()
 
 if(CONFIG_STD_C23)
@@ -370,9 +287,6 @@ if(CONFIG_CPP)
   elseif(CONFIG_STD_CPP2B)
     set(STD_CPP_DIALECT_FLAGS $<TARGET_PROPERTY:compiler-cpp,dialect_cpp2b>)
     list(APPEND CMAKE_CXX_COMPILE_FEATURES ${compile_features_cpp20})
-  elseif(CONFIG_STD_CPP23)
-    set(STD_CPP_DIALECT_FLAGS $<TARGET_PROPERTY:compiler-cpp,dialect_cpp23>)
-    list(APPEND CMAKE_CXX_COMPILE_FEATURES ${compile_features_cpp23})
   else()
     message(FATAL_ERROR
       "Unreachable code. Expected C++ standard to have been chosen. See Kconfig.zephyr.")
@@ -416,23 +330,11 @@ if(CONFIG_COMPILER_FREESTANDING)
   zephyr_compile_options($<$<COMPILE_LANGUAGE:ASM>:$<TARGET_PROPERTY:compiler,freestanding>>)
 endif()
 
-if(CONFIG_PICOLIBC AND NOT CONFIG_PICOLIBC_IO_FLOAT)
+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()
 
-if(CONFIG_UBSAN)
-  zephyr_compile_options($<$<COMPILE_LANGUAGE:C>:$<TARGET_PROPERTY:compiler,sanitizer_undefined>>)
-  zephyr_link_libraries($<TARGET_PROPERTY:linker,sanitizer_undefined>)
-  if(CONFIG_UBSAN_LIBRARY)
-    zephyr_compile_options($<$<COMPILE_LANGUAGE:C>:$<TARGET_PROPERTY:compiler,sanitizer_undefined_library>>)
-    zephyr_link_libraries($<TARGET_PROPERTY:linker,sanitizer_undefined_library>)
-  elseif(CONFIG_UBSAN_TRAP)
-    zephyr_compile_options($<$<COMPILE_LANGUAGE:C>:$<TARGET_PROPERTY:compiler,sanitizer_undefined_trap>>)
-    zephyr_link_libraries($<TARGET_PROPERTY:linker,sanitizer_undefined_trap>)
-  endif()
-endif()
-
 # @Intent: Set compiler specific flag for tentative definitions, no-common
 zephyr_compile_options($<TARGET_PROPERTY:compiler,no_common>)
 
@@ -475,20 +377,12 @@ zephyr_compile_options(
   $<$<COMPILE_LANGUAGE:ASM>:-D_ASMLANGUAGE>
 )
 
+find_package(Deprecated COMPONENTS toolchain_ld_base)
+
 if(DEFINED TOOLCHAIN_LD_FLAGS)
   zephyr_ld_options(${TOOLCHAIN_LD_FLAGS})
 endif()
 
-foreach(GROUPED_FLAGS IN LISTS TOOLCHAIN_GROUPED_LD_FLAGS)
-  if(DEFINED ${GROUPED_FLAGS})
-    zephyr_ld_options(NO_SPLIT ${${GROUPED_FLAGS}})
-  else()
-    message(FATAL_ERROR "Variable '${GROUPED_FLAGS}' is not defined, "
-      "please ensure the variable is defined and points to valid linker flags. "
-      "If '${GROUPED_FLAGS}' is a linker flags itself, then it must be placed in a list")
-  endif()
-endforeach()
-
 zephyr_link_libraries(PROPERTY base)
 
 zephyr_link_libraries_ifndef(CONFIG_LINKER_USE_RELAX PROPERTY no_relax)
@@ -505,6 +399,8 @@ toolchain_ld_force_undefined_symbols(
 )
 
 if(NOT CONFIG_NATIVE_BUILD)
+  find_package(Deprecated COMPONENTS toolchain_ld_baremetal)
+
   zephyr_link_libraries(PROPERTY baremetal)
 
   # Note that some architectures will skip this flag if set to error, even
@@ -529,6 +425,10 @@ if(NOT CONFIG_NATIVE_BUILD)
 endif()
 
 if(CONFIG_CPP)
+  if(NOT CONFIG_MINIMAL_LIBCPP AND NOT CONFIG_NATIVE_LIBRARY)
+    find_package(Deprecated COMPONENTS toolchain_ld_cpp)
+  endif()
+
   zephyr_link_libraries(PROPERTY cpp_base)
 endif()
 
@@ -577,24 +477,6 @@ zephyr_compile_options($<$<COMPILE_LANGUAGE:CXX>:$<TARGET_PROPERTY:compiler,no_p
 zephyr_link_libraries_ifndef(CONFIG_NATIVE_LIBRARY
                              $<TARGET_PROPERTY:linker,no_position_independent>)
 
-if(CONFIG_INSTRUMENTATION)
-  # @Intent: Enable function instrumentation injection at compile time
-  zephyr_compile_options($<$<COMPILE_LANGUAGE:C>:$<TARGET_PROPERTY:compiler,func_instrumentation>>)
-  zephyr_compile_options($<$<COMPILE_LANGUAGE:CXX>:$<TARGET_PROPERTY:compiler,func_instrumentation>>)
-
-  # @Intent: Enable function blocklist for the instrumentation subsystem
-  if(CONFIG_INSTRUMENTATION_EXCLUDE_FUNCTION_LIST)
-    zephyr_compile_options($<$<COMPILE_LANGUAGE:C>:$<TARGET_PROPERTY:compiler,func_instrumentation_exclude_function_list>>)
-    zephyr_compile_options($<$<COMPILE_LANGUAGE:CXX>:$<TARGET_PROPERTY:compiler,func_instrumentation_exclude_function_list>>)
-  endif()
-
-  # @Intent: Enable file blocklist for the instrumentation subsystem
-  if(CONFIG_INSTRUMENTATION_EXCLUDE_FILE_LIST)
-    zephyr_compile_options($<$<COMPILE_LANGUAGE:C>:$<TARGET_PROPERTY:compiler,func_instrumentation_exclude_file_list>>)
-    zephyr_compile_options($<$<COMPILE_LANGUAGE:CXX>:$<TARGET_PROPERTY:compiler,func_instrumentation_exclude_file_list>>)
-  endif()
-endif()
-
 # Allow the user to inject options when calling cmake, e.g.
 # 'cmake -DEXTRA_CFLAGS="-Werror -Wno-deprecated-declarations" ..'
 include(cmake/extra_flags.cmake)
@@ -736,10 +618,6 @@ zephyr_get(KERNEL_VERSION_CUSTOMIZATION SYSBUILD LOCAL)
 set_property(TARGET version_h PROPERTY KERNEL_VERSION_CUSTOMIZATION ${KERNEL_VERSION_CUSTOMIZATION})
 
 if(EXISTS ${APPLICATION_SOURCE_DIR}/VERSION)
-  # A generator expression is used to allow applications to add their own dependencies for the
-  # file version, this might typically be the git index file if the application is in a git
-  # repository. To add a dependency to the application version file, this can be used:
-  # set_property(TARGET app_version_h PROPERTY APP_VERSION_DEPENDS <FILE>)
   add_custom_command(
     OUTPUT ${PROJECT_BINARY_DIR}/include/generated/zephyr/app_version.h
     COMMAND ${CMAKE_COMMAND} -DZEPHYR_BASE=${ZEPHYR_BASE}
@@ -750,7 +628,6 @@ if(EXISTS ${APPLICATION_SOURCE_DIR}/VERSION)
       ${build_version_argument}
       -P ${ZEPHYR_BASE}/cmake/gen_version_h.cmake
     DEPENDS ${APPLICATION_SOURCE_DIR}/VERSION ${git_dependency}
-      $<TARGET_PROPERTY:app_version_h,APP_VERSION_DEPENDS>
     COMMAND_EXPAND_LISTS
   )
   add_custom_target(
@@ -820,12 +697,12 @@ set(struct_tags_json ${CMAKE_CURRENT_BINARY_DIR}/misc/generated/struct_tags.json
 # The syscalls subdirs txt file is constructed by python containing a list of folders to use for
 # dependency handling, including empty folders.
 # Windows:  The list is used to specify DIRECTORY list with CMAKE_CONFIGURE_DEPENDS attribute.
-# Other OS: The list file is updated whenever a directory is added or removed.
+# Other OS: The list will update whenever a file is added/removed/modified and ensure a re-build.
 set(syscalls_subdirs_txt ${CMAKE_CURRENT_BINARY_DIR}/misc/generated/syscalls_subdirs.txt)
 
-# As syscalls_subdirs_txt is updated only on directory add or remove, this file can not be used for
-# monitoring of syscall changes. A trigger file is thus used for correct dependency handling. The
-# trigger file will update when syscalls change.
+# As syscalls_subdirs_txt is updated whenever a file is modified, this file can not be used for
+# monitoring of added / removed folders. A trigger file is thus used for correct dependency
+# handling. The trigger file will update when a folder is added / removed.
 set(syscalls_subdirs_trigger ${CMAKE_CURRENT_BINARY_DIR}/misc/generated/syscalls_subdirs.trigger)
 
 if(NOT (${CMAKE_HOST_SYSTEM_NAME} STREQUAL Windows))
@@ -844,13 +721,14 @@ execute_process(
 )
 file(STRINGS ${syscalls_subdirs_txt} PARSE_SYSCALLS_PATHS_DEPENDS ENCODING UTF-8)
 
-# Each header file must be monitored as file modifications are not reflected on directory level.
-file(GLOB_RECURSE PARSE_SYSCALLS_HEADER_DEPENDS ${ZEPHYR_BASE}/include/*.h)
-
 if(${CMAKE_HOST_SYSTEM_NAME} STREQUAL Windows)
   # On windows only adding/removing files or folders will be reflected in depends.
   # Hence adding a file requires CMake to re-run to add this file to the file list.
   set_property(DIRECTORY APPEND PROPERTY CMAKE_CONFIGURE_DEPENDS ${PARSE_SYSCALLS_PATHS_DEPENDS})
+
+  # Also On Windows each header file must be monitored as file modifications are not reflected
+  # on directory level.
+  file(GLOB_RECURSE PARSE_SYSCALLS_HEADER_DEPENDS ${ZEPHYR_BASE}/include/*.h)
 else()
   # The syscall parsing depends on the folders in order to detect add/removed/modified files.
   # When a folder is removed, CMake will try to find a target that creates that dependency.
@@ -881,10 +759,10 @@ else()
     file(WRITE ${syscalls_subdirs_txt} "")
   endif()
 
-  # On other OS'es, using git checkout is reflected on the folder timestamp and hence detected
+  # On other OS'es, modifying a file is reflected on the folder timestamp and hence detected
   # when using depend on directory level.
   # Thus CMake only needs to re-run when sub-directories are added / removed, which is indicated
-  # by syscalls_subdirs_txt being updated.
+  # using a trigger file.
   set_property(DIRECTORY APPEND PROPERTY CMAKE_CONFIGURE_DEPENDS ${syscalls_subdirs_txt})
 endif()
 
@@ -935,7 +813,7 @@ add_custom_command(
   --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
+          ${syscalls_file_list_output} ${syscalls_interface}
   )
 
 # Make sure Picolibc is built before the rest of the system; there's no explicit
@@ -953,6 +831,12 @@ set_property(TARGET ${SYSCALL_LIST_H_TARGET}
              ${CMAKE_CURRENT_BINARY_DIR}/include/generated/zephyr/syscalls
 )
 
+add_custom_target(${PARSE_SYSCALLS_TARGET}
+  DEPENDS
+  ${syscalls_json}
+  ${struct_tags_json}
+  )
+
 # 64-bit systems do not require special handling of 64-bit system call
 # parameters or return values, indicate this to the system call boilerplate
 # generation script.
@@ -995,24 +879,30 @@ add_custom_command(
   COMMAND
   ${LEGACY_SYSCALL_LIST_H_ARGS}
   WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
-  DEPENDS ${syscalls_json}
+  DEPENDS ${PARSE_SYSCALLS_TARGET}
   )
 
-include(${ZEPHYR_BASE}/cmake/kobj.cmake)
+# 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(DRV_VALIDATION ${PROJECT_BINARY_DIR}/include/generated/zephyr/driver-validation.h)
-gen_kobject_list(
-  TARGET ${DRIVER_VALIDATION_H_TARGET}
-  OUTPUTS ${DRV_VALIDATION}
-  SCRIPT_ARGS --validation-output ${DRV_VALIDATION}
-  INCLUDES ${struct_tags_json}
-  DEPENDS ${struct_tags_json}
+add_custom_command(
+  OUTPUT ${DRV_VALIDATION}
+  COMMAND
+  ${PYTHON_EXECUTABLE}
+  ${ZEPHYR_BASE}/scripts/build/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
+  ${PARSE_SYSCALLS_TARGET}
+  WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
   )
+add_custom_target(${DRIVER_VALIDATION_H_TARGET} DEPENDS ${DRV_VALIDATION})
 
-gen_kobject_list_headers(
-  INCLUDES ${struct_tags_json}
-  DEPENDS ${struct_tags_json}
-  )
+include(${ZEPHYR_BASE}/cmake/kobj.cmake)
+gen_kobj(KOBJ_INCLUDE_PATH)
 
 # Generate sections for kernel device subsystems
 set(
@@ -1045,16 +935,10 @@ add_custom_target(${DEVICE_API_LD_TARGET}
                           ${DEVICE_API_LINKER_SECTIONS_CMAKE}
 )
 
-zephyr_linker_include_generated(CMAKE ${DEVICE_API_LINKER_SECTIONS_CMAKE})
+# Add a pseudo-target that is up-to-date when all generated headers
+# are up-to-date.
 
-# Create an interface library which collects the dependencies to Zephyr
-# generated headers. Libraries containing files that include these headers can
-# use add_dependencies or target_link_libraries against this target to ensure
-# that generated headers are up-to-date before the libraries are built. This
-# ordering dependency can be propagated to these libraries' dependenents via
-# the PUBLIC or INTERFACE option of target_link_libraries.
-
-add_library(zephyr_generated_headers INTERFACE)
+add_custom_target(zephyr_generated_headers)
 add_dependencies(zephyr_generated_headers
   offsets_h version_h
   )
@@ -1151,16 +1035,14 @@ if(CONFIG_LLEXT)
   # Weak definitions for these must be added at the end of the link order
   # to avoid shadowing actual implementations.
   add_library(syscall_weakdefs syscall_weakdefs_llext.c)
-  target_link_libraries(syscall_weakdefs
-    zephyr_generated_headers
-    zephyr_interface
-  )
+  add_dependencies(syscall_weakdefs zephyr_generated_headers)
+  target_link_libraries(syscall_weakdefs zephyr_interface)
   list(APPEND NO_WHOLE_ARCHIVE_LIBS syscall_weakdefs)
 endif()
 
 get_property(OUTPUT_FORMAT        GLOBAL PROPERTY PROPERTY_OUTPUT_FORMAT)
 
-if(CONFIG_CODE_DATA_RELOCATION)
+if (CONFIG_CODE_DATA_RELOCATION)
   set(CODE_RELOCATION_DEP code_relocation_source_lib)
 endif() # CONFIG_CODE_DATA_RELOCATION
 
@@ -1212,20 +1094,12 @@ if(CONFIG_CODE_DATA_RELOCATION)
 endif()
 
 if(CONFIG_USERSPACE)
-  # Go for raw properties here since zephyr_get_compile_options_for_lang()
-  # processes the list of options, and wraps it in a $<JOIN thing. When
-  # generating the build systems this leads to some interesting command lines,
-  # with SHELL: not being present and other "random" list-join related issues
-  # (e.g. for IAR toolchains the lists were joined with "gnu" postfixed on a
-  # bunch of entries).
-  get_property(compiler_flags_priv TARGET zephyr_interface PROPERTY INTERFACE_COMPILE_OPTIONS)
+  zephyr_get_compile_options_for_lang_as_string(C compiler_flags_priv)
   string(REPLACE "$<TARGET_PROPERTY:compiler,coverage>" ""
-    KOBJECT_HASH_COMPILE_OPTIONS "${compiler_flags_priv}")
-
-  list(APPEND KOBJECT_HASH_COMPILE_OPTIONS
-                  $<TARGET_PROPERTY:compiler,no_function_sections>
-                  $<TARGET_PROPERTY:compiler,no_data_sections>)
+         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)
 endif()
 
@@ -1253,6 +1127,8 @@ elseif(DEFINED BOARD_LINKER_SCRIPT)
   set(LINKER_SCRIPT ${BOARD_LINKER_SCRIPT})
 elseif(DEFINED SOC_LINKER_SCRIPT)
   set(LINKER_SCRIPT ${SOC_LINKER_SCRIPT})
+else()
+  find_package(Deprecated COMPONENTS SEARCHED_LINKER_SCRIPT)
 endif()
 
 if(NOT EXISTS ${LINKER_SCRIPT})
@@ -1260,20 +1136,14 @@ if(NOT EXISTS ${LINKER_SCRIPT})
 endif()
 
 if(CONFIG_USERSPACE)
-  if(CONFIG_CMAKE_LINKER_GENERATOR)
-    set(APP_SMEM_LD_EXT "cmake")
-  else()
-    set(APP_SMEM_LD_EXT "ld")
-  endif()
-
-  set(APP_SMEM_ALIGNED_LD "${PROJECT_BINARY_DIR}/include/generated/app_smem_aligned.${APP_SMEM_LD_EXT}")
-  set(APP_SMEM_UNALIGNED_LD "${PROJECT_BINARY_DIR}/include/generated/app_smem_unaligned.${APP_SMEM_LD_EXT}")
+  set(APP_SMEM_ALIGNED_LD "${PROJECT_BINARY_DIR}/include/generated/app_smem_aligned.ld")
+  set(APP_SMEM_UNALIGNED_LD "${PROJECT_BINARY_DIR}/include/generated/app_smem_unaligned.ld")
 
   if(CONFIG_LINKER_USE_PINNED_SECTION)
     set(APP_SMEM_PINNED_ALIGNED_LD
-        "${PROJECT_BINARY_DIR}/include/generated/app_smem_pinned_aligned.${APP_SMEM_LD_EXT}")
+        "${PROJECT_BINARY_DIR}/include/generated/app_smem_pinned_aligned.ld")
     set(APP_SMEM_PINNED_UNALIGNED_LD
-        "${PROJECT_BINARY_DIR}/include/generated/app_smem_pinned_unaligned.${APP_SMEM_LD_EXT}")
+        "${PROJECT_BINARY_DIR}/include/generated/app_smem_pinned_unaligned.ld")
 
     if(NOT CONFIG_LINKER_GENERIC_SECTIONS_PRESENT_AT_BOOT)
       # The libc partition may hold symbols that are required during boot process,
@@ -1338,11 +1208,9 @@ if(CONFIG_USERSPACE)
 
   set(APP_SMEM_UNALIGNED_LIB app_smem_unaligned_output_obj_renamed_lib)
   list(APPEND LINKER_PASS_${ZEPHYR_CURRENT_LINKER_PASS}_DEFINE "LINKER_APP_SMEM_UNALIGNED")
+endif()
 
-  foreach(dep ${APP_SMEM_UNALIGNED_LD} ${APP_SMEM_PINNED_UNALIGNED_LD})
-    zephyr_linker_include_generated(CMAKE ${dep} PASS LINKER_APP_SMEM_UNALIGNED)
-  endforeach()
-
+if (CONFIG_USERSPACE)
   add_custom_command(
     OUTPUT ${APP_SMEM_ALIGNED_LD} ${APP_SMEM_PINNED_ALIGNED_LD}
     COMMAND ${PYTHON_EXECUTABLE}
@@ -1362,9 +1230,6 @@ if(CONFIG_USERSPACE)
     COMMAND_EXPAND_LISTS
     COMMENT "Generating app_smem_aligned linker section"
     )
-    foreach(dep ${APP_SMEM_ALIGNED_LD} ${APP_SMEM_PINNED_ALIGNED_LD})
-      zephyr_linker_include_generated(CMAKE ${dep} PASS NOT LINKER_APP_SMEM_UNALIGNED)
-    endforeach()
 endif()
 
 if(CONFIG_USERSPACE)
@@ -1379,13 +1244,23 @@ if(CONFIG_USERSPACE)
   set(KOBJECT_PREBUILT_HASH_OUTPUT_SRC_PRE kobject_prebuilt_hash_preprocessed.c)
   set(KOBJECT_PREBUILT_HASH_OUTPUT_SRC     kobject_prebuilt_hash.c)
 
-  gen_kobject_list_gperf(
-    TARGET kobj_prebuilt_hash_list
+  add_custom_command(
     OUTPUT ${KOBJECT_PREBUILT_HASH_LIST}
-    KERNEL_TARGET ${ZEPHYR_LINK_STAGE_EXECUTABLE}
-    INCLUDES ${struct_tags_json}
-    DEPENDS ${struct_tags_json}
+    COMMAND
+    ${PYTHON_EXECUTABLE}
+    ${GEN_KOBJ_LIST}
+    --kernel $<TARGET_FILE:${ZEPHYR_LINK_STAGE_EXECUTABLE}>
+    --gperf-output ${KOBJECT_PREBUILT_HASH_LIST}
+    ${gen_kobject_list_include_args}
+    $<$<BOOL:${CMAKE_VERBOSE_MAKEFILE}>:--verbose>
+    DEPENDS
+    ${ZEPHYR_LINK_STAGE_EXECUTABLE}
+    WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
     )
+  add_custom_target(
+    kobj_prebuilt_hash_list
+    DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${KOBJECT_PREBUILT_HASH_LIST}
+  )
 
   add_custom_command(
     OUTPUT ${KOBJECT_PREBUILT_HASH_OUTPUT_SRC_PRE}
@@ -1422,13 +1297,11 @@ if(CONFIG_USERSPACE)
   add_library(
     kobj_prebuilt_hash_output_lib
     OBJECT ${CMAKE_CURRENT_BINARY_DIR}/${KOBJECT_PREBUILT_HASH_OUTPUT_SRC}
-  )
+    )
 
-  # set_target_properties sets ALL properties, target_compile_options() adds
-  # and KOBJECT_HASH_COMPILE_OPTIONS contains all the options.
-  set_target_properties(kobj_prebuilt_hash_output_lib PROPERTIES
-    COMPILE_OPTIONS "${KOBJECT_HASH_COMPILE_OPTIONS}"
-  )
+  set_source_files_properties(${KOBJECT_PREBUILT_HASH_OUTPUT_SRC}
+    PROPERTIES COMPILE_FLAGS
+    "${NO_COVERAGE_FLAGS} -fno-function-sections -fno-data-sections")
 
   target_compile_definitions(kobj_prebuilt_hash_output_lib
     PRIVATE $<TARGET_PROPERTY:zephyr_interface,INTERFACE_COMPILE_DEFINITIONS>
@@ -1464,13 +1337,6 @@ if(CONFIG_USERSPACE)
     DEPENDS
     ${KOBJECT_LINKER_HEADER_DATA}
   )
-
-  # gen_kobject_placeholders.py generates linker-kobject-prebuild-data.h,
-  # linker-kobject-prebuild-priv-stacks.h and linker-kobject-prebuild-rodata.h
-  foreach(ext "-data.h" "-priv-stacks.h" "-rodata.h")
-    string(REGEX REPLACE "-data.h$" ${ext} file ${KOBJECT_LINKER_HEADER_DATA})
-    zephyr_linker_include_generated(HEADER ${file} PASS LINKER_ZEPHYR_PREBUILT LINKER_ZEPHYR_FINAL)
-  endforeach()
 endif()
 
 if(CONFIG_USERSPACE OR CONFIG_DEVICE_DEPS)
@@ -1578,13 +1444,23 @@ if(CONFIG_USERSPACE)
   # Use the script GEN_KOBJ_LIST to scan the kernel binary's
   # (${ZEPHYR_LINK_STAGE_EXECUTABLE}) DWARF information to produce a table of kernel
   # objects (KOBJECT_HASH_LIST) which we will then pass to gperf
-  gen_kobject_list_gperf(
-    TARGET kobj_hash_list
+  add_custom_command(
     OUTPUT ${KOBJECT_HASH_LIST}
-    KERNEL_TARGET ${ZEPHYR_LINK_STAGE_EXECUTABLE}
-    INCLUDES ${struct_tags_json}
-    DEPENDS ${struct_tags_json}
+    COMMAND
+    ${PYTHON_EXECUTABLE}
+    ${GEN_KOBJ_LIST}
+    --kernel $<TARGET_FILE:${ZEPHYR_LINK_STAGE_EXECUTABLE}>
+    --gperf-output ${KOBJECT_HASH_LIST}
+    ${gen_kobject_list_include_args}
+    $<$<BOOL:${CMAKE_VERBOSE_MAKEFILE}>:--verbose>
+    DEPENDS
+    ${ZEPHYR_LINK_STAGE_EXECUTABLE}
+    WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
     )
+  add_custom_target(
+    kobj_hash_list
+    DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${KOBJECT_HASH_LIST}
+  )
 
   # Use gperf to generate C code (KOBJECT_HASH_OUTPUT_SRC_PRE) which implements a
   # perfect hashtable based on KOBJECT_HASH_LIST
@@ -1633,9 +1509,9 @@ if(CONFIG_USERSPACE)
     OBJECT ${CMAKE_CURRENT_BINARY_DIR}/${KOBJECT_HASH_OUTPUT_SRC}
     )
 
-  set_target_properties(kobj_hash_output_lib PROPERTIES
-    COMPILE_OPTIONS "${KOBJECT_HASH_COMPILE_OPTIONS}"
-  )
+  set_source_files_properties(${KOBJECT_HASH_OUTPUT_SRC}
+    PROPERTIES COMPILE_FLAGS
+    "${NO_COVERAGE_FLAGS} -fno-function-sections -fno-data-sections")
 
   target_compile_definitions(kobj_hash_output_lib
     PRIVATE $<TARGET_PROPERTY:zephyr_interface,INTERFACE_COMPILE_DEFINITIONS>
@@ -1803,12 +1679,8 @@ list(APPEND
 list(APPEND post_build_byproducts ${KERNEL_MAP_NAME})
 
 # Use ';' as separator to get proper space in resulting command.
-# Ignore gapfill for RX target as some RX toolchains generate wrong output image when running
-# gapfill for binary format.
-if(NOT CONFIG_RX)
-  set(gap_fill_prop "$<TARGET_PROPERTY:bintools,elfconvert_flag_gapfill>")
-  set(gap_fill "$<$<BOOL:${gap_fill_prop}>:${gap_fill_prop}${CONFIG_BUILD_GAP_FILL_PATTERN}>")
-endif()
+set(gap_fill_prop "$<TARGET_PROPERTY:bintools,elfconvert_flag_gapfill>")
+set(gap_fill "$<$<BOOL:${gap_fill_prop}>:${gap_fill_prop}${CONFIG_BUILD_GAP_FILL_PATTERN}>")
 
 if(CONFIG_OUTPUT_PRINT_MEMORY_USAGE)
   target_link_libraries(${logical_target_for_zephyr_elf} $<TARGET_PROPERTY:linker,memusage>)
@@ -1851,8 +1723,13 @@ if(CONFIG_BUILD_OUTPUT_ADJUST_LMA)
     )
 endif()
 
+if(NOT CONFIG_CPP_EXCEPTIONS)
+  set(eh_frame_section ".eh_frame")
+else()
+  set(eh_frame_section "")
+endif()
 set(remove_sections_argument_list "")
-foreach(section .comment COMMON)
+foreach(section .comment COMMON ${eh_frame_section})
   list(APPEND remove_sections_argument_list
     $<TARGET_PROPERTY:bintools,elfconvert_flag_section_remove>${section})
 endforeach()
@@ -1903,39 +1780,26 @@ endif()
 
 if(CONFIG_BUILD_OUTPUT_BIN AND CONFIG_BUILD_OUTPUT_UF2)
   if(CONFIG_BUILD_OUTPUT_UF2_USE_FLASH_BASE)
-    set(code_address "${CONFIG_FLASH_BASE_ADDRESS}")
+    set(flash_addr "${CONFIG_FLASH_BASE_ADDRESS}")
   else()
-    set(code_address "${CONFIG_FLASH_LOAD_OFFSET}")
+    set(flash_addr "${CONFIG_FLASH_LOAD_OFFSET}")
   endif()
 
   if(CONFIG_BUILD_OUTPUT_UF2_USE_FLASH_OFFSET)
     # Note, the `+ 0` in formula below avoids errors in cases where a Kconfig
     #       variable is undefined and thus expands to nothing.
-    math(EXPR code_address
-        "${code_address} + ${CONFIG_FLASH_LOAD_OFFSET} + 0"
+    math(EXPR flash_addr
+        "${flash_addr} + ${CONFIG_FLASH_LOAD_OFFSET} + 0"
          OUTPUT_FORMAT HEXADECIMAL
     )
   endif()
 
-  # No-XIP images (such as ones for RP2350 with CONFIG_XIP=n)
-  # are typically loaded to RAM
-  if(NOT CONFIG_XIP)
-    if(CONFIG_BUILD_OUTPUT_ADJUST_LMA)
-      math(EXPR code_address
-          "${CONFIG_SRAM_BASE_ADDRESS} + ${CONFIG_BUILD_OUTPUT_ADJUST_LMA} + 0"
-          OUTPUT_FORMAT HEXADECIMAL
-      )
-    else()
-      set(code_address "${CONFIG_SRAM_BASE_ADDRESS}")
-    endif()
-  endif()
-
   list(APPEND
     post_build_commands
     COMMAND ${PYTHON_EXECUTABLE} ${ZEPHYR_BASE}/scripts/build/uf2conv.py
             -c
             -f ${CONFIG_BUILD_OUTPUT_UF2_FAMILY_ID}
-            -b ${code_address}
+            -b ${flash_addr}
             -o ${KERNEL_UF2_NAME}
             ${KERNEL_BIN_NAME}
   )
@@ -1946,28 +1810,6 @@ if(CONFIG_BUILD_OUTPUT_BIN AND CONFIG_BUILD_OUTPUT_UF2)
   set(BYPRODUCT_KERNEL_UF2_NAME "${PROJECT_BINARY_DIR}/${KERNEL_UF2_NAME}" CACHE FILEPATH "Kernel uf2 file" FORCE)
 endif()
 
-if(CONFIG_BUILD_OUTPUT_MOT)
-  get_property(elfconvert_formats TARGET bintools PROPERTY elfconvert_formats)
-  if(srec IN_LIST elfconvert_formats)
-    list(APPEND
-      post_build_commands
-      COMMAND $<TARGET_PROPERTY:bintools,elfconvert_command>
-              $<TARGET_PROPERTY:bintools,elfconvert_flag>
-              ${GAP_FILL}
-              $<TARGET_PROPERTY:bintools,elfconvert_flag_outtarget>srec
-              $<TARGET_PROPERTY:bintools,elfconvert_flag_intarget>${OUTPUT_FORMAT}
-              $<TARGET_PROPERTY:bintools,elfconvert_flag_infile>${KERNEL_ELF_NAME}
-              $<TARGET_PROPERTY:bintools,elfconvert_flag_outfile>${KERNEL_MOT_NAME}
-              $<TARGET_PROPERTY:bintools,elfconvert_flag_final>
-      )
-    list(APPEND
-      post_build_byproducts
-      ${KERNEL_MOT_NAME}
-      )
-    set(BYPRODUCT_KERNEL_MOT_NAME "${PROJECT_BINARY_DIR}/${KERNEL_MOT_NAME}" CACHE FILEPATH "Kernel mot file" FORCE)
-  endif()
-endif()
-
 set(KERNEL_META_PATH  ${PROJECT_BINARY_DIR}/${KERNEL_META_NAME} CACHE INTERNAL "")
 if(CONFIG_BUILD_OUTPUT_META)
   list(APPEND
@@ -2024,14 +1866,11 @@ if(CONFIG_BUILD_OUTPUT_S19)
 endif()
 
 if(CONFIG_OUTPUT_DISASSEMBLY)
-  if(CONFIG_OUTPUT_DISASSEMBLE_ALL)
+if(CONFIG_OUTPUT_DISASSEMBLE_ALL)
     set(disassembly_type "$<TARGET_PROPERTY:bintools,disassembly_flag_all>")
-  elseif(CONFIG_OUTPUT_DISASSEMBLY_WITH_SOURCE)
+  elseif (CONFIG_OUTPUT_DISASSEMBLY_WITH_SOURCE)
     set(disassembly_type "$<TARGET_PROPERTY:bintools,disassembly_flag_inline_source>")
   endif()
-  if(CONFIG_OUTPUT_DISASSEMBLY_NO_ALIASES)
-    list(APPEND disassembly_type "$<TARGET_PROPERTY:bintools,disassembly_flag_no_aliases>")
-  endif()
   list(APPEND
     post_build_commands
     COMMAND $<TARGET_PROPERTY:bintools,disassembly_command>
@@ -2106,20 +1945,32 @@ if(CONFIG_BUILD_OUTPUT_COMPRESS_DEBUG_SECTIONS)
 endif()
 
 if(CONFIG_BUILD_OUTPUT_EXE)
-  if(CMAKE_GENERATOR STREQUAL "Unix Makefiles")
-    set(MAKE "${CMAKE_MAKE_PROGRAM}" CACHE FILEPATH "cmake defined make")
+  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}
+      )
+  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=${APPLICATION_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}
+    )
   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=${APPLICATION_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}
-  )
   set(BYPRODUCT_KERNEL_EXE_NAME "${PROJECT_BINARY_DIR}/${KERNEL_EXE_NAME}" CACHE FILEPATH "Kernel exe file" FORCE)
 endif()
 
@@ -2137,7 +1988,7 @@ if(CONFIG_BUILD_OUTPUT_INFO_HEADER)
     )
 endif()
 
-if(CONFIG_LLEXT AND CONFIG_LLEXT_EXPORT_BUILTINS_BY_SLID)
+if (CONFIG_LLEXT AND CONFIG_LLEXT_EXPORT_BUILTINS_BY_SLID)
   #slidgen must be the first post-build command to be executed
   #on the Zephyr ELF to ensure that all other commands, such as
   #binary file generation, are operating on a preparated ELF.
@@ -2203,20 +2054,10 @@ if(signing_script)
 endif()
 
 # Generate USB-C VIF policies in XML format
-if(CONFIG_BUILD_OUTPUT_VIF)
+if (CONFIG_BUILD_OUTPUT_VIF)
   include(${CMAKE_CURRENT_LIST_DIR}/cmake/vif.cmake)
 endif()
 
-get_property(post_build_patch_elf_commands
-  GLOBAL PROPERTY
-  post_build_patch_elf_commands
-  )
-
-list(PREPEND
-  post_build_commands
-  ${post_build_patch_elf_commands}
-  )
-
 get_property(extra_post_build_commands
   GLOBAL PROPERTY
   extra_post_build_commands
@@ -2254,7 +2095,7 @@ if(LOG_DICT_DB_NAME_ARG)
       --build-header ${PROJECT_BINARY_DIR}/include/generated/zephyr/version.h
   )
 
-  if(NOT CONFIG_LOG_DICTIONARY_DB_TARGET)
+  if (NOT CONFIG_LOG_DICTIONARY_DB_TARGET)
     # If not using a separate target for generating logging dictionary
     # database, add the generation to post build command to make sure
     # the database is actually being generated.
@@ -2287,7 +2128,7 @@ endif()
 add_custom_command(
   TARGET ${logical_target_for_zephyr_elf}
   POST_BUILD
-  COMMAND ${CMAKE_COMMAND} -E echo "Generating files from ${PROJECT_BINARY_DIR}/${KERNEL_ELF_NAME} for board: ${BOARD}${BOARD_QUALIFIERS}"
+  COMMAND ${CMAKE_COMMAND} -E echo "Generating files from ${PROJECT_BINARY_DIR}/${KERNEL_ELF_NAME} for board: ${BOARD}"
   ${post_build_commands}
   BYPRODUCTS
   ${post_build_byproducts}
@@ -2434,7 +2275,7 @@ if(CONFIG_LLEXT_EDK)
       ${SYSCALL_SPLIT_TIMEOUT_ARG}
     COMMAND ${CMAKE_COMMAND}
         -P ${ZEPHYR_BASE}/cmake/llext-edk.cmake
-    DEPENDS ${logical_target_for_zephyr_elf} ${syscalls_json} build_info_yaml_saved
+    DEPENDS ${logical_target_for_zephyr_elf} build_info_yaml_saved
     COMMAND_EXPAND_LISTS
   )
   add_custom_target(llext-edk DEPENDS ${llext_edk_file})
@@ -2457,9 +2298,6 @@ add_subdirectory_ifdef(
   cmake/makefile_exports
   )
 
-# Ask the compiler to set the lib_include_dir and rt_library properties
-compiler_set_linker_properties()
-
 toolchain_linker_finalize()
 
 # export build information

CODEOWNERS

@@ -1,4 +0,0 @@
-# Instead of the CODEOWNERS file, The Zephyr Project uses a custom format.
-# See MAINTAINERS.yml for details.
-#
-# DO NOT EDIT THIS FILE.

CODE_OF_CONDUCT.md

@@ -1,4 +1,4 @@
-# Zephyr Project Code of Conduct
+# Contributor Covenant Code of Conduct
 
 ## Our Pledge
 

Kconfig.zephyr

@@ -7,11 +7,7 @@
 
 source "Kconfig.constants"
 
-osource "$(APPLICATION_SOURCE_DIR)/VERSION"
-
-# This should be sourced early since the autogen Kconfig.dts options
-# and macros may get used by shields/boards/SoC defconfig or modules.
-source "dts/Kconfig"
+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.
@@ -37,6 +33,10 @@ 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"
 
 source "modules/Kconfig"
@@ -215,6 +215,12 @@ config LINKER_SORT_BY_ALIGNMENT
 	  in decreasing size of symbols. This helps to minimize
 	  padding between symbols.
 
+config SRAM_VECTOR_TABLE
+	bool "Place the vector table in SRAM instead of flash"
+	help
+	  The option specifies that the vector table should be placed at the
+	  start of SRAM instead of the start of flash.
+
 config HAS_SRAM_OFFSET
 	bool
 	help
@@ -357,19 +363,18 @@ menu "Compiler Options"
 
 config REQUIRES_STD_C99
 	bool
-	select DEPRECATED
 	help
 	  Hidden option to select compiler support C99 standard or higher.
 
 config REQUIRES_STD_C11
 	bool
-	select DEPRECATED
 	select REQUIRES_STD_C99
 	help
 	  Hidden option to select compiler support C11 standard or higher.
 
 config REQUIRES_STD_C17
 	bool
+	select REQUIRES_STD_C11
 	help
 	  Hidden option to select compiler support C17 standard or higher.
 
@@ -382,28 +387,27 @@ config REQUIRES_STD_C23
 choice STD_C
 	prompt "C Standard"
 	default STD_C23 if REQUIRES_STD_C23
-	default STD_C17
+	default STD_C17 if REQUIRES_STD_C17
+	default STD_C11 if REQUIRES_STD_C11
+	default STD_C99
 	help
 	  C Standards.
 
 config STD_C90
-	bool "C90 [DEPRECATED]"
-	select DEPRECATED
+	bool "C90"
 	depends on !REQUIRES_STD_C99
 	help
 	  1989 C standard as completed in 1989 and ratified by ISO/IEC
 	  as ISO/IEC 9899:1990. This version is known as "ANSI C".
 
 config STD_C99
-	bool "C99 [DEPRECATED]"
-	select DEPRECATED
+	bool "C99"
 	depends on !REQUIRES_STD_C11
 	help
 	  1999 C standard.
 
 config STD_C11
-	bool "C11 [DEPRECATED]"
-	select DEPRECATED
+	bool "C11"
 	depends on !REQUIRES_STD_C17
 	help
 	  2011 C standard.
@@ -462,6 +466,17 @@ config NATIVE_BUILD
 	  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
+	select DEPRECATED
+	help
+	  Build as a native application that can run on the host and using
+	  resources and libraries provided by the host. This option is deprecated
+	  and will be removed in Zephyr v4.3
+
 config NATIVE_LIBRARY
 	bool
 	select NATIVE_BUILD
@@ -498,7 +513,7 @@ config SIZE_OPTIMIZATIONS
 config SIZE_OPTIMIZATIONS_AGGRESSIVE
 	bool "Aggressively optimize for size"
 	help
-	  Compiler optimizations will be set to -Oz independently of other
+	  Compiler optimizations wil be set to -Oz independently of other
 	  options.
 
 config SPEED_OPTIMIZATIONS
@@ -531,27 +546,11 @@ config LTO
 	help
 	  This option enables Link Time Optimization.
 
-config LTO_SINGLE_THREADED
-	bool "Single-threaded LTO"
-	depends on LTO
-	help
-	  This option instructs the linker to use a single thread to process
-	  LTO. See the following issue for more info:
-	  https://github.com/zephyrproject-rtos/sdk-ng/issues/1038
-
 config COMPILER_WARNINGS_AS_ERRORS
 	bool "Treat warnings as errors"
 	help
 	  Turn on "warning as error" toolchain flags
 
-config DEPRECATION_TEST
-	bool "Indicate test for deprecated feature"
-	help
-	  This option is selected by tests which check functionality of
-	  deprecated features. It ensures that COMPILER_WARNINGS_AS_ERRORS
-	  is not selected as that would generate errors when the deprecated
-	  features are used.
-
 config COMPILER_SAVE_TEMPS
 	bool "Save temporary object files"
 	help
@@ -622,13 +621,6 @@ config MISRA_SANE
 	  standard for safety reasons.  Specifically variable length
 	  arrays are not permitted (and gcc will enforce this).
 
-config TOOLCHAIN_SUPPORTS_VLA_IN_STATEMENTS
-	bool
-	default y
-	help
-	  Hidden symbol to state if the toolchain can handle vla in
-	  statements.
-
 endmenu
 
 choice
@@ -696,13 +688,6 @@ config OUTPUT_DISASSEMBLY_WITH_SOURCE
 	  the .lst file that can vary across platforms because
 	  of reasons such as having ".." include paths.
 
-config OUTPUT_DISASSEMBLY_NO_ALIASES
-	bool "Disassemble with raw instruction mnemonics"
-	depends on OUTPUT_DISASSEMBLY
-	help
-	  The .lst file will contain raw instruction mnemonic instead of
-	  pseudo instructions.
-
 config OUTPUT_PRINT_MEMORY_USAGE
 	bool "Print memory usage to stdout"
 	default y
@@ -799,12 +784,6 @@ config BUILD_OUTPUT_UF2
 	  Build a UF2 binary zephyr/zephyr.uf2 in the build directory.
 	  The name of this file can be customized with CONFIG_KERNEL_BIN_NAME.
 
-config BUILD_OUTPUT_MOT
-	bool "Build a binary in MOT format"
-	help
-	  Build a MOT binary zephyr/zephyr.mot in the build directory.
-	  The name of this file can be customized with CONFIG_KERNEL_BIN_NAME.
-
 if BUILD_OUTPUT_UF2
 
 config BUILD_OUTPUT_UF2_FAMILY_ID
@@ -973,7 +952,7 @@ 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
+	  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.
@@ -1021,8 +1000,7 @@ config WARN_DEPRECATED
 	prompt "Warn on deprecated usage"
 	help
 	  Print a warning when the Kconfig tree is parsed if any deprecated
-	  features are enabled, or at compile time, when deprecated macros or
-	  symbols are used.
+	  features are enabled.
 
 config EXPERIMENTAL
 	bool
@@ -1037,12 +1015,6 @@ config WARN_EXPERIMENTAL
 	  Print a warning when the Kconfig tree is parsed if any experimental
 	  features are enabled.
 
-config NOT_SECURE
-	bool
-	help
-	  Symbol to be selected by a feature to indicate that feature is
-	  not secure.
-
 config TAINT
 	bool
 	help
@@ -1072,6 +1044,8 @@ menu "Boot Options"
 
 config IS_BOOTLOADER
 	bool "Act as a bootloader"
+	depends on XIP
+	depends on ARM
 	help
 	  This option indicates that Zephyr will act as a bootloader to execute
 	  a separate Zephyr image payload.

LICENSES/Apache-2.0.txt

@@ -1,202 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.

LICENSES/README.md

@@ -1,10 +0,0 @@
-> [!IMPORTANT]
-> The license files in this directory are maintained as per the recommendation
-> of the REUSE specification (https://reuse.software/spec-3.3).
-> These are licenses that may apply to some components hosted in the source tree
-> but that do not end up in built binaries
-> (see https://docs.zephyrproject.org/latest/LICENSING.html#zephyr-licensing).
->
-> These files do _not_ define the license of the Zephyr project itself.
-> Zephyr is licensed under the Apache 2.0 license, as specified in
-> the [LICENSE](/LICENSE) file at the root of the repository.

README.rst

@@ -24,7 +24,7 @@ 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, Tensilica Xtensa, and RISC-V,
+Cortex-R, Cortex-M), Intel x86, ARC, Nios II, Tensilica Xtensa, and RISC-V,
 SPARC, MIPS, and a large number of `supported boards`_.
 
 .. below included in doc/introduction/introduction.rst

REUSE.toml

@@ -1,26 +0,0 @@
-version = 1
-
-# Declare default license and copyright text for files that typically do not or cannot include them.
-[[annotations]]
-path = [
-    # zephyr-keep-sorted-start
-    "**/*.cfg",
-    "**/*.cmake",
-    "**/*.conf",
-    "**/*.ecl",
-    "**/*.html",
-    "**/*.json",
-    "**/*.rst",
-    "**/*.yaml",
-    "**/*.yml",
-    "**/*_defconfig",
-    "**/CMakeLists.txt",
-    "**/Kconfig*",
-    "doc/requirements.in",
-    "doc/requirements.txt",
-    "scripts/requirements-*.in",
-    "scripts/requirements-*.txt",
-    # zephyr-keep-sorted-stop
-]
-SPDX-License-Identifier = "Apache-2.0"
-SPDX-FileCopyrightText = "Copyright The Zephyr Project Contributors"

SDK_VERSION

@@ -1 +1 @@
-0.17.4
+0.17.0

VERSION

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

arch/Kconfig

@@ -8,7 +8,7 @@
 # Include these first so that any properties (e.g. defaults) below can be
 # overridden (by defining symbols in multiple locations)
 
-source "$(KCONFIG_BINARY_DIR)/arch/Kconfig"
+source "$(ARCH_DIR)/Kconfig.$(HWM_SCHEME)"
 
 # ToDo: Generate a Kconfig.arch for loading of additional arch in HWMv2.
 osource "$(KCONFIG_BINARY_DIR)/Kconfig.arch"
@@ -33,7 +33,6 @@ config ARM
 	select ARCH_IS_SET
 	select ARCH_SUPPORTS_COREDUMP if CPU_CORTEX_M
 	select ARCH_SUPPORTS_COREDUMP_THREADS if CPU_CORTEX_M
-	select ARCH_SUPPORTS_COREDUMP_STACK_PTR if CPU_CORTEX_M
 	# 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
@@ -57,7 +56,6 @@ config ARM64
 	select ARCH_HAS_DEMAND_MAPPING
 	select ARCH_SUPPORTS_EVICTION_TRACKING
 	select EVICTION_TRACKING if DEMAND_PAGING
-	select MEM_DOMAIN_HAS_THREAD_LIST if ARM_MPU
 	help
 	  ARM64 (AArch64) architecture
 
@@ -105,11 +103,18 @@ config X86
 	help
 	  x86 architecture
 
+config NIOS2
+	bool
+	select ARCH_IS_SET
+	select ATOMIC_OPERATIONS_C
+	imply XIP
+	select ARCH_HAS_TIMING_FUNCTIONS
+	help
+	  Nios II Gen 2 architecture
+
 config RISCV
 	bool
 	select ARCH_IS_SET
-	select ATOMIC_OPERATIONS_C if !RISCV_ISA_EXT_A
-	select ATOMIC_OPERATIONS_BUILTIN if RISCV_ISA_EXT_A
 	select ARCH_SUPPORTS_COREDUMP
 	select ARCH_SUPPORTS_COREDUMP_PRIV_STACKS
 	select ARCH_SUPPORTS_ROM_START if !SOC_FAMILY_ESPRESSIF_ESP32
@@ -136,9 +141,6 @@ config XTENSA
 	select ARCH_HAS_DIRECTED_IPIS
 	select THREAD_STACK_INFO
 	select ARCH_HAS_THREAD_PRIV_STACK_SPACE_GET if USERSPACE
-	select ARCH_SUPPORTS_COREDUMP_STACK_PTR if !SMP
-	select ARCH_HAS_USERSPACE if XTENSA_MMU || XTENSA_MPU
-	imply ARCH_HAS_RESERVED_PAGE_FRAMES if XTENSA_MMU
 	help
 	  Xtensa architecture
 
@@ -155,18 +157,15 @@ config ARCH_POSIX
 	select BARRIER_OPERATIONS_BUILTIN
 	# POSIX arch based targets get their memory cleared on entry by the host OS
 	select SKIP_BSS_CLEAR
+	# Override the C standard used for compilation to C 2011
+	# This is due to some tests using _Static_assert which is a 2011 feature, but
+	# otherwise relying on compilers supporting it also when set to C99.
+	# This was in general ok, but with some host compilers and C library versions
+	# it led to problems. So we override it to 2011 for the native targets.
+	select REQUIRES_STD_C11
 	help
 	  POSIX (native) architecture
 
-config RX
-	bool
-	select ARCH_IS_SET
-	select ATOMIC_OPERATIONS_C
-	select USE_SWITCH
-	select USE_SWITCH_SUPPORTED
-	help
-	  Renesas RX architecture
-
 config ARCH_IS_SET
 	bool
 	help
@@ -228,17 +227,7 @@ config SRAM_BASE_ADDRESS
 	  /chosen/zephyr,sram in devicetree. The user should generally avoid
 	  changing it via menuconfig or in configuration files.
 
-config XIP
-	bool "Execute in place"
-	help
-	  This option allows zephyr to operate with its text and read-only
-	  sections residing in ROM (or similar read-only memory). Not all boards
-	  support this option so it must be used with care; you must also
-	  supply a linker command file when building your image. Enabling this
-	  option increases both the code and data footprint of the image.
-
-
-if ARC || ARM || ARM64 || X86 || RISCV || RX || ARCH_POSIX
+if ARC || ARM || ARM64 || NIOS2 || X86 || RISCV
 
 # Workaround for not being able to have commas in macro arguments
 DT_CHOSEN_Z_FLASH := zephyr,flash
@@ -261,7 +250,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 || X86 || RISCV || RX || ARCH_POSIX
+endif # ARM || ARM64 || ARC || NIOS2 || X86 || RISCV
 
 if ARCH_HAS_TRUSTED_EXECUTION
 
@@ -324,21 +313,11 @@ config USERSPACE
 	  privileged mode or handling a system call; to ensure these are always
 	  caught, enable CONFIG_HW_STACK_PROTECTION.
 
-config NOINIT_SNIPPET_FIRST
-	bool "Place the no-init linker script snippet first"
-	help
-	  By default the include/zephyr/linker/common-noinit.ld file inserts the
-	  snippets-noinit.ld file at the end of the section.  There are times when
-	  the directives in the snippets-noinit.ld file apply to the other directives
-	  in this file.  And in that case the include statement for the snippets-noinit.ld
-	  file needs to come at the start of the section.  This configuration option
-	  allows that to happen.
-
 config PRIVILEGED_STACK_SIZE
 	int "Size of privileged stack"
 	default 2048 if EMUL
 	default 1024
-	depends on USERSPACE
+	depends on ARCH_HAS_USERSPACE
 	help
 	  This option sets the privileged stack region size that will be used
 	  in addition to the user mode thread stack.  During normal execution,
@@ -348,19 +327,18 @@ config PRIVILEGED_STACK_SIZE
 
 config KOBJECT_TEXT_AREA
 	int "Size of kobject text area"
-	default 1024 if UBSAN
 	default 512 if COVERAGE_GCOV
 	default 512 if NO_OPTIMIZATIONS
 	default 512 if STACK_CANARIES && RISCV
 	default 256
-	depends on USERSPACE
+	depends on ARCH_HAS_USERSPACE
 	help
 	  Size of kernel object text area. Used in linker script.
 
 config KOBJECT_DATA_AREA_RESERVE_EXTRA_PERCENT
 	int "Reserve extra kobject data area (in percentage)"
 	default 100
-	depends on USERSPACE
+	depends on ARCH_HAS_USERSPACE
 	help
 	  Multiplication factor used to calculate the size of placeholder to
 	  reserve space for kobject metadata hash table. The hash table is
@@ -374,7 +352,7 @@ config KOBJECT_DATA_AREA_RESERVE_EXTRA_PERCENT
 config KOBJECT_RODATA_AREA_EXTRA_BYTES
 	int "Reserve extra bytes for kobject rodata area"
 	default 16
-	depends on USERSPACE
+	depends on ARCH_HAS_USERSPACE
 	help
 	  Reserve a few more bytes for the RODATA region for kobject metadata.
 	  This is to account for the uncertainty of tables generated by gperf.
@@ -460,21 +438,15 @@ config ARCH_STACKWALK_MAX_FRAMES
 
 menu "Interrupt Configuration"
 
-config TOOLCHAIN_SUPPORTS_ISR_TABLES_LOCAL_DECLARATION
-	bool
-	help
-	  Hidden option to signal that toolchain supports local declaration of
-	  interrupt tables.
-
 config ISR_TABLES_LOCAL_DECLARATION_SUPPORTED
 	bool
 	default y
 	# Userspace is currently not supported
 	depends on !USERSPACE
 	# List of currently supported architectures
-	depends on ARM || ARM64 || RISCV
+	depends on ARM || ARM64
 	# List of currently supported toolchains
-	depends on "$(ZEPHYR_TOOLCHAIN_VARIANT)" = "zephyr" || "$(ZEPHYR_TOOLCHAIN_VARIANT)" = "gnuarmemb" || "$(ZEPHYR_TOOLCHAIN_VARIANT)" = "llvm" || TOOLCHAIN_SUPPORTS_ISR_TABLES_LOCAL_DECLARATION
+	depends on "$(ZEPHYR_TOOLCHAIN_VARIANT)" = "zephyr" || "$(ZEPHYR_TOOLCHAIN_VARIANT)" = "gnuarmemb"
 
 config ISR_TABLES_LOCAL_DECLARATION
 	bool "ISR tables created locally and placed by linker"
@@ -490,7 +462,6 @@ config ISR_TABLES_LOCAL_DECLARATION
 
 config DYNAMIC_INTERRUPTS
 	bool "Installation of IRQs at runtime"
-	select SRAM_SW_ISR_TABLE
 	help
 	  Enable installation of interrupts at runtime, which will move some
 	  interrupt-related data structures to RAM instead of ROM, and
@@ -542,12 +513,6 @@ config ARCH_IRQ_VECTOR_TABLE_ALIGN
 	  to be aligned to architecture specific size.  The default
 	  size is 0 for no alignment.
 
-config ARCH_DEVICE_STATE_ALIGN
-	int "Alignment size of device state"
-	default 4
-	help
-	  This option controls alignment size of device state.
-
 choice IRQ_VECTOR_TABLE_TYPE
 	prompt "IRQ vector table type"
 	depends on GEN_IRQ_VECTOR_TABLE
@@ -608,21 +573,6 @@ config IRQ_OFFLOAD
 	  run in interrupt context. Only useful for test cases that need
 	  to validate the correctness of kernel objects in IRQ context.
 
-config SRAM_VECTOR_TABLE
-	bool "Place the vector table in SRAM instead of flash"
-	depends on ARCH_HAS_VECTOR_TABLE_RELOCATION
-	depends on XIP
-	depends on !ROMSTART_RELOCATION_ROM
-	help
-	  When XiP is enabled, this option will result in the vector table being
-	  relocated from Flash to SRAM.
-
-config SRAM_SW_ISR_TABLE
-	bool "Place the software ISR table in SRAM instead of flash"
-	help
-	  The option specifies that the software interrupts vector table will be
-	  placed inside SRAM instead of the flash.
-
 config IRQ_OFFLOAD_NESTED
 	bool "irq_offload() supports nested IRQs"
 	depends on IRQ_OFFLOAD
@@ -721,9 +671,6 @@ config ARCH_HAS_NOCACHE_MEMORY_SUPPORT
 config ARCH_HAS_RAMFUNC_SUPPORT
 	bool
 
-config ARCH_HAS_VECTOR_TABLE_RELOCATION
-	bool
-
 config ARCH_HAS_NESTED_EXCEPTION_DETECTION
 	bool
 
@@ -736,9 +683,6 @@ config ARCH_SUPPORTS_COREDUMP_THREADS
 config ARCH_SUPPORTS_COREDUMP_PRIV_STACKS
 	bool
 
-config ARCH_SUPPORTS_COREDUMP_STACK_PTR
-	bool
-
 config ARCH_SUPPORTS_ARCH_HW_INIT
 	bool
 
@@ -760,6 +704,13 @@ config ARCH_HAS_EXTRA_EXCEPTION_INFO
 config ARCH_HAS_GDBSTUB
 	bool
 
+config ARCH_HAS_COHERENCE
+	bool
+	help
+	  When selected, the architecture supports the
+	  arch_mem_coherent() API and can link into incoherent/cached
+	  memory using the ".cached" linker section.
+
 config ARCH_HAS_THREAD_LOCAL_STORAGE
 	bool
 
@@ -781,9 +732,6 @@ config ARCH_HAS_THREAD_PRIV_STACK_SPACE_GET
 	help
 	  Select when the architecture implements arch_thread_priv_stack_space_get().
 
-config ARCH_HAS_HW_SHADOW_STACK
-	bool
-
 #
 # Other architecture related options
 #
@@ -1078,22 +1026,10 @@ config ICACHE
 	help
 	  This option enables the support for the instruction cache (i-cache).
 
-config CACHE_HAS_MIRRORED_MEMORY_REGIONS
-	bool "Mirrored memory region(s) for both cached and uncached access"
-	depends on CPU_CACHE_INCOHERENT
-	help
-	  Enable this if hardware has mirrored memory regions at different
-	  addressed when accessing one would go through cache, but accessing
-	  the other would go to memory directly. A pointer can be cheaply
-	  converted to cached or uncached access.
-
-	  This applies to intra-CPU multiprocessing incoherence and makes only
-	  sense when MP_MAX_NUM_CPUS > 1.
-
 config CACHE_DOUBLEMAP
 	bool "Cache double-mapping support"
-	select CACHE_HAS_MIRRORED_MEMORY_REGIONS
-	select DEPRECATED
+	depends on CPU_CACHE_INCOHERENT
+	default y
 	help
 	  Double-mapping behavior where a pointer can be cheaply converted to
 	  point to the same cached/uncached memory at different locations.
@@ -1108,12 +1044,9 @@ config CACHE_MANAGEMENT
 	  This option enables the cache management functions backed by arch or
 	  driver code.
 
-if CACHE_MANAGEMENT
-
-if DCACHE
-
 config DCACHE_LINE_SIZE_DETECT
 	bool "Detect d-cache line size at runtime"
+	depends on CACHE_MANAGEMENT && DCACHE
 	help
 	  This option enables querying some architecture-specific hardware for
 	  finding the d-cache line size at the expense of taking more memory and
@@ -1125,21 +1058,18 @@ config DCACHE_LINE_SIZE_DETECT
 
 config DCACHE_LINE_SIZE
 	int "d-cache line size"
-	depends on !DCACHE_LINE_SIZE_DETECT
-	default $(dt_node_int_prop_int,/cpus/cpu@0,d-cache-line-size) \
-		  if $(dt_node_has_prop,/cpus/cpu@0,d-cache-line-size)
+	depends on CACHE_MANAGEMENT && DCACHE && !DCACHE_LINE_SIZE_DETECT
 	default 0
 	help
-	  Size in bytes of a CPU d-cache line.
+	  Size in bytes of a CPU d-cache line. If this is set to 0 the value is
+	  obtained from the 'd-cache-line-size' DT property instead if present.
+
 
 	  Detect automatically at runtime by selecting DCACHE_LINE_SIZE_DETECT.
 
-endif # DCACHE
-
-if ICACHE
-
 config ICACHE_LINE_SIZE_DETECT
 	bool "Detect i-cache line size at runtime"
+	depends on CACHE_MANAGEMENT && ICACHE
 	help
 	  This option enables querying some architecture-specific hardware for
 	  finding the i-cache line size at the expense of taking more memory and
@@ -1151,19 +1081,17 @@ config ICACHE_LINE_SIZE_DETECT
 
 config ICACHE_LINE_SIZE
 	int "i-cache line size"
-	depends on !ICACHE_LINE_SIZE_DETECT
-	default $(dt_node_int_prop_int,/cpus/cpu@0,i-cache-line-size) \
-		  if $(dt_node_has_prop,/cpus/cpu@0,i-cache-line-size)
+	depends on CACHE_MANAGEMENT && ICACHE && !ICACHE_LINE_SIZE_DETECT
 	default 0
 	help
-	  Size in bytes of a CPU i-cache line.
+	  Size in bytes of a CPU i-cache line. If this is set to 0 the value is
+	  obtained from the 'i-cache-line-size' DT property instead if present.
 
 	  Detect automatically at runtime by selecting ICACHE_LINE_SIZE_DETECT.
 
-endif # ICACHE
-
 choice CACHE_TYPE
 	prompt "Cache type"
+	depends on CACHE_MANAGEMENT
 	default ARCH_CACHE
 
 config ARCH_CACHE
@@ -1171,14 +1099,6 @@ config ARCH_CACHE
 	help
 	  Integrated on-core cache controller
 
-config SOC_CACHE
-	bool "SoC specific cache controller"
-	depends on SOC_HAS_CACHE_FUNCTIONS
-	help
-	  SoC specific cache controller.
-
-	  This requires soc_cache.h file to exist in search path.
-
 config EXTERNAL_CACHE
 	bool "External cache controller"
 	help
@@ -1186,16 +1106,6 @@ config EXTERNAL_CACHE
 
 endchoice
 
-config CACHE_CAN_SAY_MEM_COHERENCE
-	bool
-	help
-	  sys_cache_is_mem_coherent() is defined when enabled. This function can be
-	  used to determine if a pointer lies inside "coherence regions" and can be
-	  safely used in multiprocessor code without explicit flush or invalidate
-	  operations.
-
-endif # CACHE_MANAGEMENT
-
 endmenu
 
 config ARCH
@@ -1224,9 +1134,9 @@ config ARCH_HAS_CUSTOM_CPU_ATOMIC_IDLE
 config ARCH_HAS_CUSTOM_SWAP_TO_MAIN
 	bool
 	help
-	  It's possible that an architecture port cannot use z_swap_unlocked()
-	  to swap to the main thread (bg_thread_main), but instead must do
-	  something custom. It must enable this option in that case.
+	  It's possible that an architecture port cannot use _Swap() to swap to
+	  the _main() thread, but instead must do something custom. It must
+	  enable this option in that case.
 
 config ARCH_HAS_CUSTOM_BUSY_WAIT
 	bool
@@ -1240,9 +1150,3 @@ config ARCH_HAS_CUSTOM_CURRENT_IMPL
 	help
 	  Select when architecture implements arch_current_thread() &
 	  arch_current_thread_set().
-
-config ARCH_IPI_LAZY_COPROCESSORS_SAVE
-	bool
-	help
-	  Select when the architecture has multi-CPU lazy context switching
-	  of coprocessor registers.

arch/Kconfig.v1

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

arch/Kconfig.v2

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

arch/arc/Kconfig

@@ -258,10 +258,10 @@ config ARC_CURRENT_THREAD_USE_NO_TLS
 	select CURRENT_THREAD_USE_NO_TLS
 	default y if (RGF_NUM_BANKS > 1) || ("$(ZEPHYR_TOOLCHAIN_VARIANT)" = "arcmwdt")
 	help
-	  Disable current Thread Local Storage for ARC. For cores with more than one
-	  RGF_NUM_BANKS the parameter is disabled by-default because banks synchronization
+	  Disable current Thread Local Storage for ARC. For cores with more then one
+	  RGF_NUM_BANKS the parameter is disabled by-default because banks syncronization
 	  requires significant time, and it slows down performance.
-	  ARCMWDT works with TLS pointer in different way then GCC. Optimized access to
+	  ARCMWDT works with tls pointer in different way then GCC. Optimized access to
 	  TLS pointer via the _current symbol does not provide significant advantages
 	  in case of MetaWare.
 
@@ -274,7 +274,7 @@ config GEN_IRQ_START_VECTOR
 config HARVARD
 	bool "Harvard Architecture"
 	help
-	  The ARC CPU can be configured to have two buses;
+	  The ARC CPU can be configured to have two busses;
 	  one for instruction fetching and another that serves as a data bus.
 
 config CODE_DENSITY
@@ -370,28 +370,6 @@ endmenu
 config DCACHE_LINE_SIZE
 	default 32
 
-config ARC_DCACHE_REGION_OPERATIONS
-	bool "DCACHE region operations"
-	depends on CACHE_MANAGEMENT && DCACHE
-	default n
-	help
-	  Perform L1 data cache management operations by regions rather than line by line in a loop,
-	  improves performance of cache management operations.
-
-config ARC_SLC
-	bool "System level cache"
-	depends on CACHE_MANAGEMENT && DCACHE && (CPU_HS4X || CPU_HS3X)
-	default n
-	help
-	  This option enables System Level Cache, and adds SLC support to the data cache management operations.
-
-config ARC_SLC_LINE_SIZE
-	int "SLC line size"
-	depends on ARC_SLC
-	default 128
-	help
-	  Size in bytes of a CPU system level cache line.
-
 config ARC_EXCEPTION_STACK_SIZE
 	int "ARC exception handling stack size"
 	default 768 if !64BIT
@@ -411,11 +389,6 @@ config ARC_EARLY_SOC_INIT
 	  (before C runtime initialization). Setup code is called in form of
 	  soc_early_asm_init_percpu assembler macro.
 
-# ARC vector table must be aligned to 1KiB boundary, and will be at the
-# start of the ROM region.
-config ROM_START_OFFSET
-	default 0x400 if BOOTLOADER_MCUBOOT
-
 config MAIN_STACK_SIZE
 	default 4096 if 64BIT
 

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

@@ -8,6 +8,14 @@
 
 __weak void *__dso_handle;
 
+int __cxa_atexit(void (*destructor)(void *), void *objptr, void *dso)
+{
+	ARG_UNUSED(destructor);
+	ARG_UNUSED(objptr);
+	ARG_UNUSED(dso);
+	return 0;
+}
+
 int atexit(void (*function)(void))
 {
 	return 0;

arch/arc/core/cache.c

@@ -2,7 +2,6 @@
 
 /*
  * Copyright (c) 2016 Synopsys, Inc. All rights reserved.
- * Copyright (c) 2025 GSI Technology, All rights reserved.
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -30,34 +29,16 @@
 size_t sys_cache_line_size;
 #endif
 
-#define DC_CTRL_DC_ENABLE            0x0   /* enable d-cache */
-#define DC_CTRL_DC_DISABLE           0x1   /* disable d-cache */
-#define DC_CTRL_INVALID_ONLY         0x0   /* invalid d-cache only */
-#define DC_CTRL_INVALID_FLUSH        0x40  /* invalid and flush d-cache */
-#define DC_CTRL_ENABLE_FLUSH_LOCKED  0x80  /* locked d-cache can be flushed */
-#define DC_CTRL_DISABLE_FLUSH_LOCKED 0x0   /* locked d-cache cannot be flushed */
-#define DC_CTRL_FLUSH_STATUS         0x100 /* flush status */
-#define DC_CTRL_DIRECT_ACCESS        0x0   /* direct access mode  */
-#define DC_CTRL_INDIRECT_ACCESS      0x20  /* indirect access mode */
-#define DC_CTRL_OP_SUCCEEDED         0x4   /* d-cache operation succeeded */
-#define DC_CTRL_INVALIDATE_MODE      0x40  /* d-cache invalidate mode bit */
-#define DC_CTRL_REGION_OP            0xe00 /* d-cache region operation */
-
-#define MMU_BUILD_PHYSICAL_ADDR_EXTENSION 0x1000 /* physical address extension enable mask */
-
-#define SLC_CTRL_DISABLE         0x1   /* SLC disable */
-#define SLC_CTRL_INVALIDATE_MODE 0x40  /* SLC invalidate mode  */
-#define SLC_CTRL_BUSY_STATUS     0x100 /* SLC busy status */
-#define SLC_CTRL_REGION_OP       0xe00 /* SLC region operation */
-
-#if defined(CONFIG_ARC_SLC)
-/*
- * spinlock is used for SLC access because depending on HW configuration, the SLC might be shared
- * between the cores, and in this case, only one core is allowed to access the SLC register
- * interface at a time.
- */
-static struct k_spinlock slc_lock;
-#endif
+#define DC_CTRL_DC_ENABLE            0x0  /* enable d-cache */
+#define DC_CTRL_DC_DISABLE           0x1  /* disable d-cache */
+#define DC_CTRL_INVALID_ONLY         0x0  /* invalid d-cache only */
+#define DC_CTRL_INVALID_FLUSH        0x40 /* invalid and flush d-cache */
+#define DC_CTRL_ENABLE_FLUSH_LOCKED  0x80 /* locked d-cache can be flushed */
+#define DC_CTRL_DISABLE_FLUSH_LOCKED 0x0  /* locked d-cache cannot be flushed */
+#define DC_CTRL_FLUSH_STATUS         0x100/* flush status */
+#define DC_CTRL_DIRECT_ACCESS        0x0  /* direct access mode  */
+#define DC_CTRL_INDIRECT_ACCESS      0x20 /* indirect access mode */
+#define DC_CTRL_OP_SUCCEEDED         0x4  /* d-cache operation succeeded */
 
 static bool dcache_available(void)
 {
@@ -74,189 +55,9 @@ static void dcache_dc_ctrl(uint32_t dcache_en_mask)
 	}
 }
 
-static bool pae_exists(void)
-{
-	uint32_t bcr = z_arc_v2_aux_reg_read(_ARC_V2_MMU_BUILD);
-
-	return 1 == FIELD_GET(MMU_BUILD_PHYSICAL_ADDR_EXTENSION, bcr);
-}
-
-#if defined(CONFIG_ARC_SLC)
-static void slc_enable(void)
-{
-	uint32_t val = z_arc_v2_aux_reg_read(_ARC_V2_SLC_CTRL);
-
-	val &= ~SLC_CTRL_DISABLE;
-	z_arc_v2_aux_reg_write(_ARC_V2_SLC_CTRL, val);
-}
-
-static void slc_high_addr_init(void)
-{
-	z_arc_v2_aux_reg_write(_ARC_V2_SLC_RGN_END1, 0);
-	z_arc_v2_aux_reg_write(_ARC_V2_SLC_RGN_START1, 0);
-}
-
-static void slc_flush_region(void *start_addr_ptr, size_t size)
-{
-	uintptr_t start_addr = (uintptr_t)start_addr_ptr;
-	uintptr_t end_addr;
-	uint32_t ctrl;
-
-	K_SPINLOCK(&slc_lock) {
-		ctrl = z_arc_v2_aux_reg_read(_ARC_V2_SLC_CTRL);
-
-		ctrl &= ~SLC_CTRL_REGION_OP;
-
-		z_arc_v2_aux_reg_write(_ARC_V2_SLC_CTRL, ctrl);
-
-		/*
-		 * END needs to be setup before START (latter triggers the operation)
-		 * END can't be same as START, so add (l2_line_sz - 1) to sz
-		 */
-		end_addr = start_addr + size + CONFIG_ARC_SLC_LINE_SIZE - 1;
-
-		z_arc_v2_aux_reg_write(_ARC_V2_SLC_RGN_END, end_addr);
-		/* Align start address to cache line size, see STAR 5103816 */
-		z_arc_v2_aux_reg_write(_ARC_V2_SLC_RGN_START,
-				       start_addr & ~(CONFIG_ARC_SLC_LINE_SIZE - 1));
-
-		/* Make sure "busy" bit reports correct status, see STAR 9001165532 */
-		z_arc_v2_aux_reg_read(_ARC_V2_SLC_CTRL);
-		while (z_arc_v2_aux_reg_read(_ARC_V2_SLC_CTRL) & SLC_CTRL_BUSY_STATUS) {
-			/* Do Nothing */
-		}
-	}
-}
-
-static void slc_invalidate_region(void *start_addr_ptr, size_t size)
-{
-	uintptr_t start_addr = (uintptr_t)start_addr_ptr;
-	uintptr_t end_addr;
-	uint32_t ctrl;
-
-	K_SPINLOCK(&slc_lock) {
-		ctrl = z_arc_v2_aux_reg_read(_ARC_V2_SLC_CTRL);
-
-		ctrl &= ~SLC_CTRL_INVALIDATE_MODE;
-
-		ctrl &= ~SLC_CTRL_REGION_OP;
-		ctrl |= FIELD_PREP(SLC_CTRL_REGION_OP, 0x1);
-
-		z_arc_v2_aux_reg_write(_ARC_V2_SLC_CTRL, ctrl);
-
-		/*
-		 * END needs to be setup before START (latter triggers the operation)
-		 * END can't be same as START, so add (l2_line_sz - 1) to sz
-		 */
-		end_addr = start_addr + size + CONFIG_ARC_SLC_LINE_SIZE - 1;
-
-		z_arc_v2_aux_reg_write(_ARC_V2_SLC_RGN_END, end_addr);
-		/* Align start address to cache line size, see STAR 5103816 */
-		z_arc_v2_aux_reg_write(_ARC_V2_SLC_RGN_START,
-				       start_addr & ~(CONFIG_ARC_SLC_LINE_SIZE - 1));
-
-		/* Make sure "busy" bit reports correct status, see STAR 9001165532 */
-		z_arc_v2_aux_reg_read(_ARC_V2_SLC_CTRL);
-		while (z_arc_v2_aux_reg_read(_ARC_V2_SLC_CTRL) & SLC_CTRL_BUSY_STATUS) {
-			/* Do Nothing */
-		}
-	}
-}
-
-static void slc_flush_and_invalidate_region(void *start_addr_ptr, size_t size)
-{
-	uintptr_t start_addr = (uintptr_t)start_addr_ptr;
-	uintptr_t end_addr;
-	uint32_t ctrl;
-
-	K_SPINLOCK(&slc_lock) {
-		ctrl = z_arc_v2_aux_reg_read(_ARC_V2_SLC_CTRL);
-
-		ctrl |= SLC_CTRL_INVALIDATE_MODE;
-
-		ctrl &= ~SLC_CTRL_REGION_OP;
-		ctrl |= FIELD_PREP(SLC_CTRL_REGION_OP, 0x1);
-
-		z_arc_v2_aux_reg_write(_ARC_V2_SLC_CTRL, ctrl);
-
-		/*
-		 * END needs to be setup before START (latter triggers the operation)
-		 * END can't be same as START, so add (l2_line_sz - 1) to sz
-		 */
-		end_addr = start_addr + size + CONFIG_ARC_SLC_LINE_SIZE - 1;
-
-		z_arc_v2_aux_reg_write(_ARC_V2_SLC_RGN_END, end_addr);
-		/* Align start address to cache line size, see STAR 5103816 */
-		z_arc_v2_aux_reg_write(_ARC_V2_SLC_RGN_START,
-				       start_addr & ~(CONFIG_ARC_SLC_LINE_SIZE - 1));
-
-		/* Make sure "busy" bit reports correct status, see STAR 9001165532 */
-		z_arc_v2_aux_reg_read(_ARC_V2_SLC_CTRL);
-		while (z_arc_v2_aux_reg_read(_ARC_V2_SLC_CTRL) & SLC_CTRL_BUSY_STATUS) {
-			/* Do Nothing */
-		}
-	}
-}
-
-static void slc_flush_all(void)
-{
-	K_SPINLOCK(&slc_lock) {
-		z_arc_v2_aux_reg_write(_ARC_V2_SLC_FLUSH, 0x1);
-
-		/* Make sure "busy" bit reports correct status, see STAR 9001165532 */
-		z_arc_v2_aux_reg_read(_ARC_V2_SLC_CTRL);
-		while (z_arc_v2_aux_reg_read(_ARC_V2_SLC_CTRL) & SLC_CTRL_BUSY_STATUS) {
-			/* Do Nothing */
-		}
-	}
-}
-
-static void slc_invalidate_all(void)
-{
-	uint32_t ctrl;
-
-	K_SPINLOCK(&slc_lock) {
-		ctrl = z_arc_v2_aux_reg_read(_ARC_V2_SLC_CTRL);
-		ctrl &= ~SLC_CTRL_INVALIDATE_MODE;
-		z_arc_v2_aux_reg_write(_ARC_V2_SLC_CTRL, ctrl);
-
-		z_arc_v2_aux_reg_write(_ARC_V2_SLC_INVALIDATE, 0x1);
-
-		/* Make sure "busy" bit reports correct status, see STAR 9001165532 */
-		z_arc_v2_aux_reg_read(_ARC_V2_SLC_CTRL);
-		while (z_arc_v2_aux_reg_read(_ARC_V2_SLC_CTRL) & SLC_CTRL_BUSY_STATUS) {
-			/* Do Nothing */
-		}
-	}
-}
-
-static void slc_flush_and_invalidate_all(void)
-{
-	uint32_t ctrl;
-
-	K_SPINLOCK(&slc_lock) {
-		ctrl = z_arc_v2_aux_reg_read(_ARC_V2_SLC_CTRL);
-		ctrl |= SLC_CTRL_INVALIDATE_MODE;
-		z_arc_v2_aux_reg_write(_ARC_V2_SLC_CTRL, ctrl);
-
-		z_arc_v2_aux_reg_write(_ARC_V2_SLC_INVALIDATE, 0x1);
-
-		/* Make sure "busy" bit reports correct status, see STAR 9001165532 */
-		z_arc_v2_aux_reg_read(_ARC_V2_SLC_CTRL);
-		while (z_arc_v2_aux_reg_read(_ARC_V2_SLC_CTRL) & SLC_CTRL_BUSY_STATUS) {
-			/* Do Nothing */
-		}
-	}
-}
-#endif /* CONFIG_ARC_SLC */
-
 void arch_dcache_enable(void)
 {
 	dcache_dc_ctrl(DC_CTRL_DC_ENABLE);
-
-#if defined(CONFIG_ARC_SLC)
-	slc_enable();
-#endif
 }
 
 void arch_dcache_disable(void)
@@ -264,107 +65,17 @@ void arch_dcache_disable(void)
 	/* nothing */
 }
 
-#if defined(CONFIG_ARC_DCACHE_REGION_OPERATIONS)
-static void dcache_high_addr_init(void)
-{
-	z_arc_v2_aux_reg_write(_ARC_V2_DC_PTAG_HI, 0);
-}
-
-static void dcache_flush_region(void *start_addr_ptr, size_t size)
+int arch_dcache_flush_range(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;
 	uintptr_t end_addr;
-	uint32_t ctrl;
 	unsigned int key;
 
-	key = arch_irq_lock(); /* --enter critical section-- */
-
-	ctrl = z_arc_v2_aux_reg_read(_ARC_V2_DC_CTRL);
-
-	ctrl &= ~DC_CTRL_REGION_OP;
-
-	z_arc_v2_aux_reg_write(_ARC_V2_DC_CTRL, ctrl);
-
-	end_addr = start_addr + size + line_size - 1;
-
-	z_arc_v2_aux_reg_write(_ARC_V2_DC_ENDR, end_addr);
-	z_arc_v2_aux_reg_write(_ARC_V2_DC_STARTR, start_addr);
-
-	while (z_arc_v2_aux_reg_read(_ARC_V2_DC_CTRL) & DC_CTRL_FLUSH_STATUS) {
-		/* Do nothing */
+	if (!dcache_available() || (size == 0U) || line_size == 0U) {
+		return -ENOTSUP;
 	}
 
-	arch_irq_unlock(key); /* --exit critical section-- */
-}
-
-static void dcache_invalidate_region(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;
-	uintptr_t end_addr;
-	uint32_t ctrl;
-	unsigned int key;
-
-	key = arch_irq_lock(); /* --enter critical section-- */
-
-	ctrl = z_arc_v2_aux_reg_read(_ARC_V2_DC_CTRL);
-
-	ctrl &= ~DC_CTRL_INVALIDATE_MODE;
-
-	ctrl &= ~DC_CTRL_REGION_OP;
-	ctrl |= FIELD_PREP(DC_CTRL_REGION_OP, 0x1);
-
-	z_arc_v2_aux_reg_write(_ARC_V2_DC_CTRL, ctrl);
-
-	end_addr = start_addr + size + line_size - 1;
-
-	z_arc_v2_aux_reg_write(_ARC_V2_DC_ENDR, end_addr);
-	z_arc_v2_aux_reg_write(_ARC_V2_DC_STARTR, start_addr);
-
-	arch_irq_unlock(key); /* --exit critical section-- */
-}
-
-static void dcache_flush_and_invalidate_region(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;
-	uintptr_t end_addr;
-	uint32_t ctrl;
-	unsigned int key;
-
-	key = arch_irq_lock(); /* --enter critical section-- */
-
-	ctrl = z_arc_v2_aux_reg_read(_ARC_V2_DC_CTRL);
-
-	ctrl |= DC_CTRL_INVALIDATE_MODE;
-
-	ctrl &= ~DC_CTRL_REGION_OP;
-	ctrl |= FIELD_PREP(DC_CTRL_REGION_OP, 0x1);
-
-	z_arc_v2_aux_reg_write(_ARC_V2_DC_CTRL, ctrl);
-
-	end_addr = start_addr + size + line_size - 1;
-
-	z_arc_v2_aux_reg_write(_ARC_V2_DC_ENDR, end_addr);
-	z_arc_v2_aux_reg_write(_ARC_V2_DC_STARTR, start_addr);
-
-	while (z_arc_v2_aux_reg_read(_ARC_V2_DC_CTRL) & DC_CTRL_FLUSH_STATUS) {
-		/* Do nothing */
-	}
-
-	arch_irq_unlock(key); /* --exit critical section-- */
-}
-
-#else /* CONFIG_ARC_DCACHE_REGION_OPERATIONS */
-
-static void dcache_flush_lines(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;
-	uintptr_t end_addr;
-	unsigned int key;
-
 	end_addr = start_addr + size;
 
 	start_addr = ROUND_DOWN(start_addr, line_size);
@@ -387,81 +98,6 @@ static void dcache_flush_lines(void *start_addr_ptr, size_t size)
 	} while (start_addr < end_addr);
 
 	arch_irq_unlock(key); /* --exit critical section-- */
-}
-
-static void dcache_invalidate_lines(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;
-	uintptr_t end_addr;
-	unsigned int key;
-	uint32_t ctrl;
-
-	end_addr = start_addr + size;
-	start_addr = ROUND_DOWN(start_addr, line_size);
-
-	key = arch_irq_lock(); /* -enter critical section- */
-
-	ctrl = z_arc_v2_aux_reg_read(_ARC_V2_DC_CTRL);
-	ctrl &= ~DC_CTRL_INVALIDATE_MODE;
-	z_arc_v2_aux_reg_write(_ARC_V2_DC_CTRL, ctrl);
-
-	do {
-		z_arc_v2_aux_reg_write(_ARC_V2_DC_IVDL, start_addr);
-		__builtin_arc_nop();
-		__builtin_arc_nop();
-		__builtin_arc_nop();
-		start_addr += line_size;
-	} while (start_addr < end_addr);
-	irq_unlock(key); /* -exit critical section- */
-}
-
-static void dcache_flush_and_invalidate_lines(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;
-	uintptr_t end_addr;
-	unsigned int key;
-	uint32_t ctrl;
-
-	end_addr = start_addr + size;
-	start_addr = ROUND_DOWN(start_addr, line_size);
-
-	key = arch_irq_lock(); /* -enter critical section- */
-
-	ctrl = z_arc_v2_aux_reg_read(_ARC_V2_DC_CTRL);
-	ctrl |= DC_CTRL_INVALIDATE_MODE;
-	z_arc_v2_aux_reg_write(_ARC_V2_DC_CTRL, ctrl);
-
-	do {
-		z_arc_v2_aux_reg_write(_ARC_V2_DC_IVDL, start_addr);
-		__builtin_arc_nop();
-		__builtin_arc_nop();
-		__builtin_arc_nop();
-		start_addr += line_size;
-	} while (start_addr < end_addr);
-	irq_unlock(key); /* -exit critical section- */
-}
-
-#endif /* CONFIG_ARC_DCACHE_REGION_OPERATIONS */
-
-int arch_dcache_flush_range(void *start_addr_ptr, size_t size)
-{
-	size_t line_size = sys_cache_data_line_size_get();
-
-	if (!dcache_available() || (size == 0U) || line_size == 0U) {
-		return -ENOTSUP;
-	}
-
-#if defined(CONFIG_ARC_DCACHE_REGION_OPERATIONS)
-	dcache_flush_region(start_addr_ptr, size);
-#else
-	dcache_flush_lines(start_addr_ptr, size);
-#endif
-
-#if defined(CONFIG_ARC_SLC)
-	slc_flush_region(start_addr_ptr, size);
-#endif
 
 	return 0;
 }
@@ -469,127 +105,48 @@ int arch_dcache_flush_range(void *start_addr_ptr, size_t size)
 int arch_dcache_invd_range(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;
+	uintptr_t end_addr;
+	unsigned int key;
 
 	if (!dcache_available() || (size == 0U) || line_size == 0U) {
 		return -ENOTSUP;
 	}
+	end_addr = start_addr + size;
+	start_addr = ROUND_DOWN(start_addr, line_size);
 
-#if defined(CONFIG_ARC_DCACHE_REGION_OPERATIONS)
-	dcache_invalidate_region(start_addr_ptr, size);
-#else
-	dcache_invalidate_lines(start_addr_ptr, size);
-#endif
+	key = arch_irq_lock(); /* -enter critical section- */
 
-#if defined(CONFIG_ARC_SLC)
-	slc_invalidate_region(start_addr_ptr, size);
-#endif
+	do {
+		z_arc_v2_aux_reg_write(_ARC_V2_DC_IVDL, start_addr);
+		__builtin_arc_nop();
+		__builtin_arc_nop();
+		__builtin_arc_nop();
+		start_addr += line_size;
+	} while (start_addr < end_addr);
+	irq_unlock(key); /* -exit critical section- */
 
 	return 0;
 }
 
 int arch_dcache_flush_and_invd_range(void *start_addr_ptr, size_t size)
 {
-	size_t line_size = sys_cache_data_line_size_get();
-
-	if (!dcache_available() || (size == 0U) || line_size == 0U) {
-		return -ENOTSUP;
-	}
-
-#if defined(CONFIG_ARC_DCACHE_REGION_OPERATIONS)
-	dcache_flush_and_invalidate_region(start_addr_ptr, size);
-#else
-	dcache_flush_and_invalidate_lines(start_addr_ptr, size);
-#endif
-
-#if defined(CONFIG_ARC_SLC)
-	slc_flush_and_invalidate_region(start_addr_ptr, size);
-#endif
-
-	return 0;
+	return -ENOTSUP;
 }
 
 int arch_dcache_flush_all(void)
 {
-	size_t line_size = sys_cache_data_line_size_get();
-	unsigned int key;
-
-	if (!dcache_available() || line_size == 0U) {
-		return -ENOTSUP;
-	}
-
-	key = irq_lock();
-
-	z_arc_v2_aux_reg_write(_ARC_V2_DC_FLSH, 0x1);
-
-	while (z_arc_v2_aux_reg_read(_ARC_V2_DC_CTRL) & DC_CTRL_FLUSH_STATUS) {
-		/* Do nothing */
-	}
-
-	irq_unlock(key);
-
-#if defined(CONFIG_ARC_SLC)
-	slc_flush_all();
-#endif
-
-	return 0;
+	return -ENOTSUP;
 }
 
 int arch_dcache_invd_all(void)
 {
-	size_t line_size = sys_cache_data_line_size_get();
-	unsigned int key;
-	uint32_t ctrl;
-
-	if (!dcache_available() || line_size == 0U) {
-		return -ENOTSUP;
-	}
-
-	key = irq_lock();
-
-	ctrl = z_arc_v2_aux_reg_read(_ARC_V2_DC_CTRL);
-	ctrl &= ~DC_CTRL_INVALIDATE_MODE;
-	z_arc_v2_aux_reg_write(_ARC_V2_DC_CTRL, ctrl);
-
-	z_arc_v2_aux_reg_write(_ARC_V2_DC_IVDC, 0x1);
-
-	irq_unlock(key);
-
-#if defined(CONFIG_ARC_SLC)
-	slc_invalidate_all();
-#endif
-
-	return 0;
+	return -ENOTSUP;
 }
 
 int arch_dcache_flush_and_invd_all(void)
 {
-	size_t line_size = sys_cache_data_line_size_get();
-	unsigned int key;
-	uint32_t ctrl;
-
-	if (!dcache_available() || line_size == 0U) {
-		return -ENOTSUP;
-	}
-
-	key = irq_lock();
-
-	ctrl = z_arc_v2_aux_reg_read(_ARC_V2_DC_CTRL);
-	ctrl |= DC_CTRL_INVALIDATE_MODE;
-	z_arc_v2_aux_reg_write(_ARC_V2_DC_CTRL, ctrl);
-
-	z_arc_v2_aux_reg_write(_ARC_V2_DC_IVDC, 0x1);
-
-	while (z_arc_v2_aux_reg_read(_ARC_V2_DC_CTRL) & DC_CTRL_FLUSH_STATUS) {
-		/* Do nothing */
-	}
-
-	irq_unlock(key);
-
-#if defined(CONFIG_ARC_SLC)
-	slc_flush_and_invalidate_all();
-#endif
-
-	return 0;
+	return -ENOTSUP;
 }
 
 #if defined(CONFIG_DCACHE_LINE_SIZE_DETECT)
@@ -667,19 +224,6 @@ static int init_dcache(void)
 	init_dcache_line_size();
 #endif
 
-	/*
-	 * Init high address registers to 0 if PAE exists, cache operations for 40 bit addresses not
-	 * implemented
-	 */
-	if (pae_exists()) {
-#if defined(CONFIG_ARC_DCACHE_REGION_OPERATIONS)
-		dcache_high_addr_init();
-#endif
-#if defined(CONFIG_ARC_SLC)
-		slc_high_addr_init();
-#endif
-	}
-
 	return 0;
 }
 

arch/arc/core/dsp/Kconfig

@@ -39,7 +39,7 @@ 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 instructions.
+	  option to accelerate DSP instrctions.
 
 config ARC_AGU_SHARING
 	bool "ARC address generation unit register sharing"

arch/arc/core/elf.c

@@ -6,7 +6,6 @@
 
 #include <zephyr/llext/elf.h>
 #include <zephyr/llext/llext.h>
-#include <zephyr/llext/llext_internal.h>
 #include <zephyr/llext/loader.h>
 #include <zephyr/logging/log.h>
 #include <zephyr/sys/util.h>
@@ -15,7 +14,6 @@ LOG_MODULE_REGISTER(elf, CONFIG_LLEXT_LOG_LEVEL);
 
 #define R_ARC_32            4
 #define R_ARC_B26           5 /* AKA R_ARC_64 */
-#define R_ARC_S25H_PCREL    16
 #define R_ARC_S25W_PCREL    17
 #define R_ARC_32_ME         27
 
@@ -33,32 +31,12 @@ LOG_MODULE_REGISTER(elf, CONFIG_LLEXT_LOG_LEVEL);
  * https://github.com/foss-for-synopsys-dwc-arc-processors/arc-ABI-manual/blob/master/ARCv2_ABI.pdf
  * https://github.com/zephyrproject-rtos/binutils-gdb
  */
-int arch_elf_relocate(struct llext_loader *ldr, struct llext *ext, elf_rela_t *rel,
-		      const elf_shdr_t *shdr)
+int arch_elf_relocate(elf_rela_t *rel, uintptr_t loc, uintptr_t sym_base_addr, const char *sym_name,
+		      uintptr_t load_bias)
 {
 	int ret = 0;
-	uint32_t value;
-	const uintptr_t loc = llext_get_reloc_instruction_location(ldr, ext, shdr->sh_info, rel);
 	uint32_t insn = UNALIGNED_GET((uint32_t *)loc);
-	elf_sym_t sym;
-	uintptr_t sym_base_addr;
-	const char *sym_name;
-
-	ret = llext_read_symbol(ldr, ext, rel, &sym);
-
-	if (ret != 0) {
-		LOG_ERR("Could not read symbol from binary!");
-		return ret;
-	}
-
-	sym_name = llext_symbol_name(ldr, ext, &sym);
-
-	ret = llext_lookup_symbol(ldr, ext, &sym_base_addr, rel, &sym, sym_name, shdr);
-
-	if (ret != 0) {
-		LOG_ERR("Could not find symbol %s!", sym_name);
-		return ret;
-	}
+	uint32_t value;
 
 	sym_base_addr += rel->r_addend;
 
@@ -69,28 +47,12 @@ int arch_elf_relocate(struct llext_loader *ldr, struct llext *ext, elf_rela_t *r
 	case R_ARC_B26:
 		UNALIGNED_PUT(sym_base_addr, (uint32_t *)loc);
 		break;
-	case R_ARC_S25H_PCREL:
-		/* ((S + A) - P) >> 1
+	case R_ARC_S25W_PCREL:
+		/* ((S + A) - P) >> 2
 		 * S = symbol address
 		 * A = addend
 		 * P = relative offset to PCL
 		 */
-		value = (sym_base_addr + rel->r_addend - (loc & ~0x3)) >> 1;
-
-		insn = ME(insn);
-
-		/* disp25h */
-		insn = insn & ~0x7feffcf;
-		insn |= ((value >> 0) & 0x03ff) << 17;
-		insn |= ((value >> 10) & 0x03ff) << 6;
-		insn |= ((value >> 20) & 0x000f) << 0;
-
-		insn = ME(insn);
-
-		UNALIGNED_PUT(insn, (uint32_t *)loc);
-		break;
-	case R_ARC_S25W_PCREL:
-		/* ((S + A) - P) >> 2 */
 		value = (sym_base_addr + rel->r_addend - (loc & ~0x3)) >> 2;
 
 		insn = ME(insn);

arch/arc/core/fatal.c

@@ -17,25 +17,26 @@
 #include <zephyr/arch/cpu.h>
 #include <zephyr/logging/log.h>
 #include <kernel_arch_data.h>
-#include <zephyr/arch/exception.h>
+#include <zephyr/arch/arc/v2/exception.h>
+#include <err_dump_handling.h>
 
 LOG_MODULE_DECLARE(os, CONFIG_KERNEL_LOG_LEVEL);
 
 #ifdef CONFIG_EXCEPTION_DEBUG
 static void dump_arc_esf(const struct arch_esf *esf)
 {
-	EXCEPTION_DUMP(" r0: 0x%" PRIxPTR "  r1: 0x%" PRIxPTR "  r2: 0x%" PRIxPTR
+	ARC_EXCEPTION_DUMP(" r0: 0x%" PRIxPTR "  r1: 0x%" PRIxPTR "  r2: 0x%" PRIxPTR
 		"  r3: 0x%" PRIxPTR "", esf->r0, esf->r1, esf->r2, esf->r3);
-	EXCEPTION_DUMP(" r4: 0x%" PRIxPTR "  r5: 0x%" PRIxPTR "  r6: 0x%" PRIxPTR
+	ARC_EXCEPTION_DUMP(" r4: 0x%" PRIxPTR "  r5: 0x%" PRIxPTR "  r6: 0x%" PRIxPTR
 		"  r7: 0x%" PRIxPTR "", esf->r4, esf->r5, esf->r6, esf->r7);
-	EXCEPTION_DUMP(" r8: 0x%" PRIxPTR "  r9: 0x%" PRIxPTR " r10: 0x%" PRIxPTR
+	ARC_EXCEPTION_DUMP(" r8: 0x%" PRIxPTR "  r9: 0x%" PRIxPTR " r10: 0x%" PRIxPTR
 		" r11: 0x%" PRIxPTR "", esf->r8, esf->r9, esf->r10, esf->r11);
-	EXCEPTION_DUMP("r12: 0x%" PRIxPTR " r13: 0x%" PRIxPTR "  pc: 0x%" PRIxPTR "",
+	ARC_EXCEPTION_DUMP("r12: 0x%" PRIxPTR " r13: 0x%" PRIxPTR "  pc: 0x%" PRIxPTR "",
 		esf->r12, esf->r13, esf->pc);
-	EXCEPTION_DUMP(" blink: 0x%" PRIxPTR " status32: 0x%" PRIxPTR "",
+	ARC_EXCEPTION_DUMP(" blink: 0x%" PRIxPTR " status32: 0x%" PRIxPTR "",
 		esf->blink, esf->status32);
 #ifdef CONFIG_ARC_HAS_ZOL
-	EXCEPTION_DUMP("lp_end: 0x%" PRIxPTR " lp_start: 0x%" PRIxPTR
+	ARC_EXCEPTION_DUMP("lp_end: 0x%" PRIxPTR " lp_start: 0x%" PRIxPTR
 			" lp_count: 0x%" PRIxPTR "", esf->lp_end, esf->lp_start, esf->lp_count);
 #endif /* CONFIG_ARC_HAS_ZOL */
 }

arch/arc/core/fault.c

@@ -20,6 +20,7 @@
 #include <zephyr/kernel_structs.h>
 #include <zephyr/arch/common/exc_handle.h>
 #include <zephyr/logging/log.h>
+#include <err_dump_handling.h>
 
 LOG_MODULE_DECLARE(os, CONFIG_KERNEL_LOG_LEVEL);
 
@@ -137,32 +138,32 @@ static void dump_protv_exception(uint32_t cause, uint32_t parameter)
 {
 	switch (cause) {
 	case 0x0:
-		EXCEPTION_DUMP("Instruction fetch violation (%s)",
+		ARC_EXCEPTION_DUMP("Instruction fetch violation (%s)",
 			get_protv_access_err(parameter));
 		break;
 	case 0x1:
-		EXCEPTION_DUMP("Memory read protection violation (%s)",
+		ARC_EXCEPTION_DUMP("Memory read protection violation (%s)",
 			get_protv_access_err(parameter));
 		break;
 	case 0x2:
-		EXCEPTION_DUMP("Memory write protection violation (%s)",
+		ARC_EXCEPTION_DUMP("Memory write protection violation (%s)",
 			get_protv_access_err(parameter));
 		break;
 	case 0x3:
-		EXCEPTION_DUMP("Memory read-modify-write violation (%s)",
+		ARC_EXCEPTION_DUMP("Memory read-modify-write violation (%s)",
 			get_protv_access_err(parameter));
 		break;
 	case 0x10:
-		EXCEPTION_DUMP("Normal vector table in secure memory");
+		ARC_EXCEPTION_DUMP("Normal vector table in secure memory");
 		break;
 	case 0x11:
-		EXCEPTION_DUMP("NS handler code located in S memory");
+		ARC_EXCEPTION_DUMP("NS handler code located in S memory");
 		break;
 	case 0x12:
-		EXCEPTION_DUMP("NSC Table Range Violation");
+		ARC_EXCEPTION_DUMP("NSC Table Range Violation");
 		break;
 	default:
-		EXCEPTION_DUMP("unknown");
+		ARC_EXCEPTION_DUMP("unknown");
 		break;
 	}
 }
@@ -171,46 +172,46 @@ static void dump_machine_check_exception(uint32_t cause, uint32_t parameter)
 {
 	switch (cause) {
 	case 0x0:
-		EXCEPTION_DUMP("double fault");
+		ARC_EXCEPTION_DUMP("double fault");
 		break;
 	case 0x1:
-		EXCEPTION_DUMP("overlapping TLB entries");
+		ARC_EXCEPTION_DUMP("overlapping TLB entries");
 		break;
 	case 0x2:
-		EXCEPTION_DUMP("fatal TLB error");
+		ARC_EXCEPTION_DUMP("fatal TLB error");
 		break;
 	case 0x3:
-		EXCEPTION_DUMP("fatal cache error");
+		ARC_EXCEPTION_DUMP("fatal cache error");
 		break;
 	case 0x4:
-		EXCEPTION_DUMP("internal memory error on instruction fetch");
+		ARC_EXCEPTION_DUMP("internal memory error on instruction fetch");
 		break;
 	case 0x5:
-		EXCEPTION_DUMP("internal memory error on data fetch");
+		ARC_EXCEPTION_DUMP("internal memory error on data fetch");
 		break;
 	case 0x6:
-		EXCEPTION_DUMP("illegal overlapping MPU entries");
+		ARC_EXCEPTION_DUMP("illegal overlapping MPU entries");
 		if (parameter == 0x1) {
-			EXCEPTION_DUMP(" - jump and branch target");
+			ARC_EXCEPTION_DUMP(" - jump and branch target");
 		}
 		break;
 	case 0x10:
-		EXCEPTION_DUMP("secure vector table not located in secure memory");
+		ARC_EXCEPTION_DUMP("secure vector table not located in secure memory");
 		break;
 	case 0x11:
-		EXCEPTION_DUMP("NSC jump table not located in secure memory");
+		ARC_EXCEPTION_DUMP("NSC jump table not located in secure memory");
 		break;
 	case 0x12:
-		EXCEPTION_DUMP("secure handler code not located in secure memory");
+		ARC_EXCEPTION_DUMP("secure handler code not located in secure memory");
 		break;
 	case 0x13:
-		EXCEPTION_DUMP("NSC target address not located in secure memory");
+		ARC_EXCEPTION_DUMP("NSC target address not located in secure memory");
 		break;
 	case 0x80:
-		EXCEPTION_DUMP("uncorrectable ECC or parity error in vector memory");
+		ARC_EXCEPTION_DUMP("uncorrectable ECC or parity error in vector memory");
 		break;
 	default:
-		EXCEPTION_DUMP("unknown");
+		ARC_EXCEPTION_DUMP("unknown");
 		break;
 	}
 }
@@ -219,54 +220,54 @@ static void dump_privilege_exception(uint32_t cause, uint32_t parameter)
 {
 	switch (cause) {
 	case 0x0:
-		EXCEPTION_DUMP("Privilege violation");
+		ARC_EXCEPTION_DUMP("Privilege violation");
 		break;
 	case 0x1:
-		EXCEPTION_DUMP("disabled extension");
+		ARC_EXCEPTION_DUMP("disabled extension");
 		break;
 	case 0x2:
-		EXCEPTION_DUMP("action point hit");
+		ARC_EXCEPTION_DUMP("action point hit");
 		break;
 	case 0x10:
 		switch (parameter) {
 		case 0x1:
-			EXCEPTION_DUMP("N to S return using incorrect return mechanism");
+			ARC_EXCEPTION_DUMP("N to S return using incorrect return mechanism");
 			break;
 		case 0x2:
-			EXCEPTION_DUMP("N to S return with incorrect operating mode");
+			ARC_EXCEPTION_DUMP("N to S return with incorrect operating mode");
 			break;
 		case 0x3:
-			EXCEPTION_DUMP("IRQ/exception return fetch from wrong mode");
+			ARC_EXCEPTION_DUMP("IRQ/exception return fetch from wrong mode");
 			break;
 		case 0x4:
-			EXCEPTION_DUMP("attempt to halt secure processor in NS mode");
+			ARC_EXCEPTION_DUMP("attempt to halt secure processor in NS mode");
 			break;
 		case 0x20:
-			EXCEPTION_DUMP("attempt to access secure resource from normal mode");
+			ARC_EXCEPTION_DUMP("attempt to access secure resource from normal mode");
 			break;
 		case 0x40:
-			EXCEPTION_DUMP("SID violation on resource access (APEX/UAUX/key NVM)");
+			ARC_EXCEPTION_DUMP("SID violation on resource access (APEX/UAUX/key NVM)");
 			break;
 		default:
-			EXCEPTION_DUMP("unknown");
+			ARC_EXCEPTION_DUMP("unknown");
 			break;
 		}
 		break;
 	case 0x13:
 		switch (parameter) {
 		case 0x20:
-			EXCEPTION_DUMP("attempt to access secure APEX feature from NS mode");
+			ARC_EXCEPTION_DUMP("attempt to access secure APEX feature from NS mode");
 			break;
 		case 0x40:
-			EXCEPTION_DUMP("SID violation on access to APEX feature");
+			ARC_EXCEPTION_DUMP("SID violation on access to APEX feature");
 			break;
 		default:
-			EXCEPTION_DUMP("unknown");
+			ARC_EXCEPTION_DUMP("unknown");
 			break;
 		}
 		break;
 	default:
-		EXCEPTION_DUMP("unknown");
+		ARC_EXCEPTION_DUMP("unknown");
 		break;
 	}
 }
@@ -274,7 +275,7 @@ static void dump_privilege_exception(uint32_t cause, uint32_t parameter)
 static void dump_exception_info(uint32_t vector, uint32_t cause, uint32_t parameter)
 {
 	if (vector >= 0x10 && vector <= 0xFF) {
-		EXCEPTION_DUMP("interrupt %u", vector);
+		ARC_EXCEPTION_DUMP("interrupt %u", vector);
 		return;
 	}
 
@@ -283,55 +284,55 @@ static void dump_exception_info(uint32_t vector, uint32_t cause, uint32_t parame
 	 */
 	switch (vector) {
 	case ARC_EV_RESET:
-		EXCEPTION_DUMP("Reset");
+		ARC_EXCEPTION_DUMP("Reset");
 		break;
 	case ARC_EV_MEM_ERROR:
-		EXCEPTION_DUMP("Memory Error");
+		ARC_EXCEPTION_DUMP("Memory Error");
 		break;
 	case ARC_EV_INS_ERROR:
-		EXCEPTION_DUMP("Instruction Error");
+		ARC_EXCEPTION_DUMP("Instruction Error");
 		break;
 	case ARC_EV_MACHINE_CHECK:
-		EXCEPTION_DUMP("EV_MachineCheck");
+		ARC_EXCEPTION_DUMP("EV_MachineCheck");
 		dump_machine_check_exception(cause, parameter);
 		break;
 	case ARC_EV_TLB_MISS_I:
-		EXCEPTION_DUMP("EV_TLBMissI");
+		ARC_EXCEPTION_DUMP("EV_TLBMissI");
 		break;
 	case ARC_EV_TLB_MISS_D:
-		EXCEPTION_DUMP("EV_TLBMissD");
+		ARC_EXCEPTION_DUMP("EV_TLBMissD");
 		break;
 	case ARC_EV_PROT_V:
-		EXCEPTION_DUMP("EV_ProtV");
+		ARC_EXCEPTION_DUMP("EV_ProtV");
 		dump_protv_exception(cause, parameter);
 		break;
 	case ARC_EV_PRIVILEGE_V:
-		EXCEPTION_DUMP("EV_PrivilegeV");
+		ARC_EXCEPTION_DUMP("EV_PrivilegeV");
 		dump_privilege_exception(cause, parameter);
 		break;
 	case ARC_EV_SWI:
-		EXCEPTION_DUMP("EV_SWI");
+		ARC_EXCEPTION_DUMP("EV_SWI");
 		break;
 	case ARC_EV_TRAP:
-		EXCEPTION_DUMP("EV_Trap");
+		ARC_EXCEPTION_DUMP("EV_Trap");
 		break;
 	case ARC_EV_EXTENSION:
-		EXCEPTION_DUMP("EV_Extension");
+		ARC_EXCEPTION_DUMP("EV_Extension");
 		break;
 	case ARC_EV_DIV_ZERO:
-		EXCEPTION_DUMP("EV_DivZero");
+		ARC_EXCEPTION_DUMP("EV_DivZero");
 		break;
 	case ARC_EV_DC_ERROR:
-		EXCEPTION_DUMP("EV_DCError");
+		ARC_EXCEPTION_DUMP("EV_DCError");
 		break;
 	case ARC_EV_MISALIGNED:
-		EXCEPTION_DUMP("EV_Misaligned");
+		ARC_EXCEPTION_DUMP("EV_Misaligned");
 		break;
 	case ARC_EV_VEC_UNIT:
-		EXCEPTION_DUMP("EV_VecUnit");
+		ARC_EXCEPTION_DUMP("EV_VecUnit");
 		break;
 	default:
-		EXCEPTION_DUMP("unknown");
+		ARC_EXCEPTION_DUMP("unknown");
 		break;
 	}
 }
@@ -385,9 +386,9 @@ void z_arc_fault(struct arch_esf *esf, uint32_t old_sp)
 	}
 
 #ifdef CONFIG_EXCEPTION_DEBUG
-	EXCEPTION_DUMP("***** Exception vector: 0x%x, cause code: 0x%x, parameter 0x%x",
+	ARC_EXCEPTION_DUMP("***** Exception vector: 0x%x, cause code: 0x%x, parameter 0x%x",
 		vector, cause, parameter);
-	EXCEPTION_DUMP("Address 0x%x", exc_addr);
+	ARC_EXCEPTION_DUMP("Address 0x%x", exc_addr);
 
 	dump_exception_info(vector, cause, parameter);
 #endif

arch/arc/core/prep_c.c

@@ -22,11 +22,53 @@
 #include <zephyr/arch/arc/v2/aux_regs.h>
 #include <zephyr/arch/arc/cluster.h>
 #include <zephyr/kernel_structs.h>
-#include <zephyr/arch/common/xip.h>
-#include <zephyr/arch/common/init.h>
+#include <kernel_internal.h>
 #include <zephyr/platform/hooks.h>
 #include <zephyr/arch/cache.h>
 
+/* XXX - keep for future use in full-featured cache APIs */
+#if 0
+/**
+ * @brief Disable the i-cache if present
+ *
+ * For those ARC CPUs that have a i-cache present,
+ * invalidate the i-cache and then disable it.
+ */
+
+static void disable_icache(void)
+{
+	unsigned int val;
+
+	val = z_arc_v2_aux_reg_read(_ARC_V2_I_CACHE_BUILD);
+	val &= 0xff; /* version field */
+	if (val == 0) {
+		return; /* skip if i-cache is not present */
+	}
+	z_arc_v2_aux_reg_write(_ARC_V2_IC_IVIC, 0);
+	__builtin_arc_nop();
+	z_arc_v2_aux_reg_write(_ARC_V2_IC_CTRL, 1);
+}
+
+/**
+ * @brief Invalidate the data cache if present
+ *
+ * For those ARC CPUs that have a data cache present,
+ * invalidate the data cache.
+ */
+
+static void invalidate_dcache(void)
+{
+	unsigned int val;
+
+	val = z_arc_v2_aux_reg_read(_ARC_V2_D_CACHE_BUILD);
+	val &= 0xff; /* version field */
+	if (val == 0) {
+		return; /* skip if d-cache is not present */
+	}
+	z_arc_v2_aux_reg_write(_ARC_V2_DC_IVDC, 1);
+}
+#endif
+
 #ifdef CONFIG_ISA_ARCV3
 /* NOTE: it will be called from early C code - we must NOT use global / static variables in it! */
 static void arc_cluster_scm_enable(void)
@@ -50,8 +92,8 @@ static void arc_cluster_scm_enable(void)
 	/* Invalidate SCM before enabling. */
 	arc_cln_write_reg_nolock(ARC_CLN_CACHE_CMD,
 				 ARC_CLN_CACHE_CMD_OP_REG_INV | ARC_CLN_CACHE_CMD_INCR);
-	while (arc_cln_read_reg_nolock(ARC_CLN_CACHE_STATUS) & ARC_CLN_CACHE_STATUS_BUSY) {
-	}
+	while (arc_cln_read_reg_nolock(ARC_CLN_CACHE_STATUS) & ARC_CLN_CACHE_STATUS_BUSY)
+		;
 
 	arc_cln_write_reg_nolock(ARC_CLN_CACHE_STATUS, ARC_CLN_CACHE_STATUS_EN);
 }
@@ -68,7 +110,7 @@ extern char __device_states_end[];
  */
 static void dev_state_zero(void)
 {
-	arch_early_memset(__device_states_start, 0, __device_states_end - __device_states_start);
+	z_early_memset(__device_states_start, 0, __device_states_end - __device_states_start);
 }
 #endif
 
@@ -82,19 +124,21 @@ extern void arc_secureshield_init(void);
  * This routine prepares for the execution of and runs C code.
  */
 
-FUNC_NORETURN void z_prep_c(void)
+void z_prep_c(void)
 {
+#if defined(CONFIG_SOC_PREP_HOOK)
 	soc_prep_hook();
+#endif
 
 #ifdef CONFIG_ISA_ARCV3
 	arc_cluster_scm_enable();
 #endif
 
-	arch_bss_zero();
+	z_bss_zero();
 #ifdef __CCAC__
 	dev_state_zero();
 #endif
-	arch_data_copy();
+	z_data_copy();
 #if CONFIG_ARCH_CACHE
 	arch_cache_init();
 #endif

arch/arc/core/reset.S

@@ -163,20 +163,20 @@ hw_pf_setup_done:
 
 #if defined(CONFIG_SMP) || CONFIG_MP_MAX_NUM_CPUS  > 1
 	_get_cpu_id r0
-	breq r0, 0, _primary_core_startup
+	breq r0, 0, _master_core_startup
 
 /*
- * Non-primary cores wait for primary core (core 0) to boot enough
+ * Non-masters wait for master core (core 0) to boot enough
  */
-_secondary_core_wait:
+_slave_core_wait:
 #if CONFIG_MP_MAX_NUM_CPUS == 1
 	kflag	1
 #endif
 	ld r1, [arc_cpu_wake_flag]
-	brne r0, r1, _secondary_core_wait
+	brne r0, r1, _slave_core_wait
 
 	LDR sp, arc_cpu_sp
-	/* signal primary core that secondary core runs */
+	/* signal master core that slave core runs */
 	st 0, [arc_cpu_wake_flag]
 
 #if defined(CONFIG_ARC_FIRQ_STACK)
@@ -186,7 +186,7 @@ _secondary_core_wait:
 #endif
 	j arch_secondary_cpu_init
 
-_primary_core_startup:
+_master_core_startup:
 #endif
 
 #ifdef CONFIG_INIT_STACKS

arch/arc/core/smp.c

@@ -11,13 +11,13 @@
  */
 #include <zephyr/device.h>
 #include <zephyr/kernel.h>
-#include <zephyr/irq.h>
 #include <zephyr/kernel_structs.h>
+#include <ksched.h>
 #include <ipi.h>
 #include <zephyr/init.h>
+#include <zephyr/irq.h>
 #include <zephyr/platform/hooks.h>
 #include <arc_irq_offload.h>
-#include <kernel_arch_func.h>
 
 volatile struct {
 	arch_cpustart_t fn;
@@ -25,10 +25,10 @@ volatile struct {
 } arc_cpu_init[CONFIG_MP_MAX_NUM_CPUS];
 
 /*
- * arc_cpu_wake_flag is used to sync up primary core and secondary cores
- * Secondary core will spin for arc_cpu_wake_flag until primary core sets
- * it to the core id of secondary core. Then, secondary core clears it to notify
- * primary core that it's waken
+ * arc_cpu_wake_flag is used to sync up master core and slave cores
+ * Slave core will spin for arc_cpu_wake_flag until master core sets
+ * it to the core id of slave core. Then, slave core clears it to notify
+ * master core that it's waken
  *
  */
 volatile uint32_t arc_cpu_wake_flag;
@@ -50,13 +50,13 @@ void arch_cpu_start(int cpu_num, k_thread_stack_t *stack, int sz,
 
 	/* set the initial sp of target sp through arc_cpu_sp
 	 * arc_cpu_wake_flag will protect arc_cpu_sp that
-	 * only one secondary cpu can read it per time
+	 * only one slave cpu can read it per time
 	 */
 	arc_cpu_sp = K_KERNEL_STACK_BUFFER(stack) + sz;
 
 	arc_cpu_wake_flag = cpu_num;
 
-	/* wait secondary cpu to start */
+	/* wait slave cpu to start */
 	while (arc_cpu_wake_flag != 0U) {
 		;
 	}
@@ -90,7 +90,7 @@ static void arc_connect_debug_mask_update(int cpu_num)
 
 void arc_core_private_intc_init(void);
 
-/* the C entry of secondary cores */
+/* the C entry of slave cores */
 void arch_secondary_cpu_init(int cpu_num)
 {
 	arch_cpustart_t fn;
@@ -117,7 +117,9 @@ void arch_secondary_cpu_init(int cpu_num)
 	irq_enable(DT_IRQN(DT_NODELABEL(ici)));
 #endif
 
+#ifdef CONFIG_SOC_PER_CORE_INIT_HOOK
 	soc_per_core_init_hook();
+#endif /* CONFIG_SOC_PER_CORE_INIT_HOOK */
 
 	/* call the function set by arch_cpu_start */
 	fn = arc_cpu_init[cpu_num].fn;
@@ -160,7 +162,7 @@ int arch_smp_init(void)
 {
 	struct arc_connect_bcr bcr;
 
-	/* necessary primary core init */
+	/* necessary master core init */
 	_curr_cpu[0] = &(_kernel.cpus[0]);
 
 	bcr.val = z_arc_v2_aux_reg_read(_ARC_V2_CONNECT_BCR);
@@ -171,7 +173,7 @@ int arch_smp_init(void)
 	}
 
 	if (bcr.ipi) {
-	/* register ici interrupt, just need primary core to register once */
+	/* 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),

arch/arc/core/thread.c

@@ -276,15 +276,6 @@ int arch_float_enable(struct k_thread *thread, unsigned int options)
 }
 #endif /* CONFIG_FPU && CONFIG_FPU_SHARING */
 
-int arch_coprocessors_disable(struct k_thread *thread)
-{
-#if defined(CONFIG_FPU) && defined(CONFIG_FPU_SHARING)
-	return arch_float_disable(thread);
-#else
-	return -ENOTSUP;
-#endif
-}
-
 #if !defined(CONFIG_MULTITHREADING)
 
 K_KERNEL_STACK_ARRAY_DECLARE(z_interrupt_stacks, CONFIG_MP_MAX_NUM_CPUS, CONFIG_ISR_STACK_SIZE);
@@ -318,7 +309,7 @@ void arc_dsp_disable(struct k_thread *thread, unsigned int options)
 	k_spinlock_key_t key = k_spin_lock(&lock);
 
 	/* Disable DSP or AGU capabilities for the thread */
-	thread->base.user_options &= ~(uint16_t)options;
+	thread->base.user_options &= ~(uint8_t)options;
 
 	k_spin_unlock(&lock, key);
 }
@@ -329,7 +320,7 @@ void arc_dsp_enable(struct k_thread *thread, unsigned int options)
 	k_spinlock_key_t key = k_spin_lock(&lock);
 
 	/* Enable dsp or agu capabilities for the thread */
-	thread->base.user_options |= (uint16_t)options;
+	thread->base.user_options |= (uint8_t)options;
 
 	k_spin_unlock(&lock, key);
 }

arch/arc/core/vector_table.c

@@ -47,7 +47,7 @@ struct vector_table {
 	uintptr_t unused_2;
 };
 
-const struct vector_table _VectorTable Z_GENERIC_SECTION(.exc_vector_table) = {
+struct vector_table _VectorTable Z_GENERIC_SECTION(.exc_vector_table) = {
 	(uintptr_t)__reset,
 	(uintptr_t)__memory_error,
 	(uintptr_t)__instruction_error,

arch/arc/include/err_dump_handling.h

@@ -0,0 +1,16 @@
+/*
+ * Copyright (c) 2023 Synopsys.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#ifndef ZEPHYR_ARCH_ARC_INCLUDE_ERR_DUMP_HANDLING_H_
+#define ZEPHYR_ARCH_ARC_INCLUDE_ERR_DUMP_HANDLING_H_
+
+#if defined CONFIG_LOG
+#define ARC_EXCEPTION_DUMP(...) LOG_ERR(__VA_ARGS__)
+#else
+#define ARC_EXCEPTION_DUMP(format, ...) printk(format "\n", ##__VA_ARGS__)
+#endif
+
+#endif /* ZEPHYR_ARCH_ARC_INCLUDE_ERR_DUMP_HANDLING_H_ */

arch/arc/include/kernel_arch_func.h

@@ -36,7 +36,9 @@ static ALWAYS_INLINE void arch_kernel_init(void)
 {
 	z_irq_setup();
 
+#ifdef CONFIG_SOC_PER_CORE_INIT_HOOK
 	soc_per_core_init_hook();
+#endif /* CONFIG_SOC_PER_CORE_INIT_HOOK */
 }
 
 

arch/arc/include/v2/irq.h

@@ -68,7 +68,7 @@ static ALWAYS_INLINE void z_irq_setup(void)
 
 #ifdef CONFIG_ARC_NORMAL_FIRMWARE
 	/* normal mode cannot write irq_ctrl, ignore it */
-	ARG_UNUSED(aux_irq_ctrl_value);
+	aux_irq_ctrl_value = aux_irq_ctrl_value;
 #else
 	z_arc_v2_aux_reg_write(_ARC_V2_AUX_IRQ_CTRL, aux_irq_ctrl_value);
 #endif

arch/archs.yml

@@ -1,31 +1,21 @@
 archs:
   - name: arc
     path: arc
-    full_name: Synopsys DesignWare ARC
   - name: arm
     path: arm
-    full_name: ARM
   - name: arm64
     path: arm64
-    full_name: ARM 64
   - name: mips
     path: mips
-    full_name: MIPS
+  - name: nios2
+    path: nios2
   - name: posix
     path: posix
-    full_name: POSIX
   - name: riscv
     path: riscv
-    full_name: RISC-V
   - name: sparc
     path: sparc
-    full_name: SPARC
   - name: xtensa
     path: xtensa
-    full_name: Xtensa
   - name: x86
     path: x86
-    full_name: x86
-  - name: rx
-    path: rx
-    full_name: Renesas RX

arch/arm/Kconfig

@@ -49,7 +49,7 @@ config ROMSTART_RELOCATION_ROM
 
 	  Most SOCs include an alias for the boot-vector at address 0x00000000
 	  so a default which might be supported by the corresponding Linux rproc driver.
-	  If it is not, additional options allow to specify the addresses.
+	  If it is not, additionnal options allows to specify the addresses.
 
 	  In general this option should be chosen if the zephyr,flash chosen node
 	  is not placed into the boot-vector memory area.
@@ -190,43 +190,4 @@ config HAS_SWO
 	help
 	  When enabled, indicates that SoC has an SWO output
 
-DT_CHOSEN_Z_DTCM := zephyr,dtcm
-DT_CHOSEN_Z_ITCM := zephyr,itcm
-
-choice
-	prompt "Vector table memory location"
-	depends on SRAM_VECTOR_TABLE
-	default ARM_VECTOR_TABLE_SRAM
-
-config ARM_VECTOR_TABLE_SRAM
-	bool "Place the vector table in DT Chosen SRAM instead of DT Chosen Flash"
-	help
-	  When executing in place (XiP), selecting this option will result in the
-	  interrupt vector table being relocated from DT 'zephyr,flash' chosen
-	  memory to DT 'zephyr,sram' chosen memory.
-
-config ARM_VECTOR_TABLE_DTCM
-	bool "Place the vector table in DT Chosen DTCM instead of DT Chosen Flash"
-	depends on $(dt_chosen_enabled,$(DT_CHOSEN_Z_DTCM))
-	help
-	  When executing in place (XiP), selecting this option will result in the
-	  interrupt vector table being relocated from DT 'zephyr,flash' chosen
-	  memory to DT 'zephyr,dtcm' chosen memory. While the vector table is
-	  instruction-fetched during exception entry, a DTCM option is provided
-	  for systems where ITCM is unavailable. DTCM still offers low-latency,
-	  deterministic access compared to normal RAM, but is not the optimal
-	  location for instruction fetch performance.
-
-config ARM_VECTOR_TABLE_ITCM
-	bool "Place the vector table in DT Chosen ITCM instead of DT Chosen Flash"
-	depends on $(dt_chosen_enabled,$(DT_CHOSEN_Z_ITCM))
-	help
-	  When executing in place (XiP), selecting this option will result in the
-	  interrupt vector table being relocated from DT 'zephyr,flash' chosen
-	  memory to DT 'zephyr,itcm' chosen memory. ITCM provides single-cycle,
-	  deterministic instruction fetches via the CPU instruction bus, it offers
-	  the lowest interrupt latency and is the preferred location when available.
-
-endchoice
-
 endmenu

arch/arm/core/CMakeLists.txt

@@ -27,7 +27,7 @@ add_subdirectory_ifdef(CONFIG_ARM_AARCH32_MMU mmu)
 add_subdirectory_ifdef(CONFIG_CPU_AARCH32_CORTEX_R cortex_a_r)
 add_subdirectory_ifdef(CONFIG_CPU_AARCH32_CORTEX_A cortex_a_r)
 
-if(CONFIG_ARM_ZIMAGE_HEADER)
+if (CONFIG_ARM_ZIMAGE_HEADER)
 zephyr_linker_sources(ROM_START SORT_KEY 0x0vectors zimage_header.ld)
 zephyr_linker_sources(ROM_START SORT_KEY 0x1vectors vector_table.ld)
 zephyr_linker_sources(ROM_START SORT_KEY 0x2vectors cortex_m/vector_table_pad.ld)

arch/arm/core/Kconfig

@@ -16,7 +16,6 @@ config CPU_CORTEX_M
 	select ARCH_HAS_USERSPACE if ARM_MPU
 	select ARCH_HAS_NOCACHE_MEMORY_SUPPORT if ARM_MPU && CPU_HAS_ARM_MPU && CPU_HAS_DCACHE
 	select ARCH_HAS_RAMFUNC_SUPPORT
-	select ARCH_HAS_VECTOR_TABLE_RELOCATION if CPU_CORTEX_M_HAS_VTOR
 	select ARCH_HAS_NESTED_EXCEPTION_DETECTION
 	select SWAP_NONATOMIC
 	select ARCH_HAS_EXTRA_EXCEPTION_INFO

arch/arm/core/Kconfig.vfp

@@ -109,17 +109,6 @@ config VFP_U_DP_D16_FP16_FMAC
 	  fused multiply-accumulate) and floating-point exception trapping with 16
 	  double-word registers.
 
-config VFP_DP_D32
-	bool
-	select CPU_HAS_VFP
-	select VFP_FEATURE_SINGLE_PRECISION
-	select VFP_FEATURE_DOUBLE_PRECISION
-	select VFP_FEATURE_REGS_S64_D32
-	help
-	  This option signifies the use of a VFP floating-point coprocessor
-	  that supports single- and double-precision operations
-	  with 32 double-word registers.
-
 config VFP_DP_D32_FP16_FMAC
 	bool
 	select CPU_HAS_VFP

arch/arm/core/cortex_a_r/Kconfig

@@ -13,21 +13,10 @@
 # CPU_AARCH32_CORTEX_A / if CPU_AARCH32_CORTEX_R blocks so they are not
 # exposed if one selects a different ARM Cortex Family (Cortex-M).
 
-config CPU_CORTEX_A7
-	bool
-	select CPU_AARCH32_CORTEX_A
-	select ARMV7_A
-	select CPU_HAS_ICACHE
-	select CPU_HAS_DCACHE
-	help
-	  This option signifies the use of a Cortex-A7 CPU.
-
 config CPU_CORTEX_A9
 	bool
 	select CPU_AARCH32_CORTEX_A
 	select ARMV7_A
-	select CPU_HAS_ICACHE
-	select CPU_HAS_DCACHE
 	help
 	  This option signifies the use of a Cortex-A9 CPU.
 
@@ -93,8 +82,6 @@ config CPU_CORTEX_R5
 	select CPU_AARCH32_CORTEX_R
 	select ARMV7_R
 	select ARMV7_R_FP if CPU_HAS_FPU
-	select CPU_HAS_ICACHE
-	select CPU_HAS_DCACHE
 	help
 	  This option signifies the use of a Cortex-R5 CPU
 

arch/arm/core/cortex_a_r/cache.c

@@ -63,13 +63,13 @@ void arch_dcache_disable(void)
 {
 	uint32_t val;
 
-	L1C_CleanInvalidateDCacheAll();
-
 	val = __get_SCTLR();
 	val &= ~SCTLR_C_Msk;
 	barrier_dsync_fence_full();
 	__set_SCTLR(val);
 	barrier_isync_fence_full();
+
+	arch_dcache_flush_and_invd_all();
 }
 
 int arch_dcache_flush_all(void)
@@ -203,30 +203,16 @@ int arch_icache_flush_and_invd_all(void)
 
 int arch_icache_flush_range(void *start_addr, size_t size)
 {
-	ARG_UNUSED(start_addr);
-	ARG_UNUSED(size);
-
 	return -ENOTSUP;
 }
 
 int arch_icache_invd_range(void *start_addr, size_t size)
 {
-	ARG_UNUSED(start_addr);
-	ARG_UNUSED(size);
-	/* Cortex A/R do have the ICIMVAU operation to selectively invalidate
-	 * the instruction cache, but not currently supported by CMSIS.
-	 * For now, invalidate the entire cache.
-	 */
-	L1C_InvalidateICacheAll();
-
-	return 0;
+	return -ENOTSUP;
 }
 
 int arch_icache_flush_and_invd_range(void *start_addr, size_t size)
 {
-	ARG_UNUSED(start_addr);
-	ARG_UNUSED(size);
-
 	return -ENOTSUP;
 }