Skip to content

Commit 75440c1

Browse files
authored
Merge branch 'zephyrproject-rtos:main' into proposal_for_framelength_property_in_i2s_mcux_flexcomm_driver
2 parents 20c027d + 0b2d455 commit 75440c1

File tree

1,210 files changed

+30433
-5880
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,210 files changed

+30433
-5880
lines changed

.clang-format

+1
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,7 @@ IndentCaseLabels: false
9999
IndentGotoLabels: false
100100
IndentWidth: 8
101101
InsertBraces: true
102+
InsertNewlineAtEOF: true
102103
SpaceBeforeInheritanceColon: False
103104
SpaceBeforeParens: ControlStatementsExceptControlMacros
104105
SortIncludes: Never

.github/workflows/assigner.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
assignment:
2323
name: Pull Request Assignment
2424
if: github.event.pull_request.draft == false
25-
runs-on: ubuntu-22.04
25+
runs-on: ubuntu-24.04
2626
permissions:
2727
pull-requests: write # to add assignees to pull requests
2828
issues: write # to add assignees to issues

.github/workflows/backport.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ permissions:
1313
jobs:
1414
backport:
1515
name: Backport
16-
runs-on: ubuntu-22.04
16+
runs-on: ubuntu-24.04
1717
permissions:
1818
contents: write # to create/push backport branches
1919
pull-requests: write # to create backport PRs

.github/workflows/backport_issue_check.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
concurrency:
2020
group: backport-issue-check-${{ github.ref }}
2121
cancel-in-progress: true
22-
runs-on: ubuntu-22.04
22+
runs-on: ubuntu-24.04
2323
if: github.repository == 'zephyrproject-rtos/zephyr'
2424
permissions:
2525
issues: read # to check if associated issue exists for backport

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ permissions:
1212
jobs:
1313
bsim-test-results:
1414
name: "Publish BabbleSim Test Results"
15-
runs-on: ubuntu-22.04
15+
runs-on: ubuntu-24.04
1616
if: github.event.workflow_run.conclusion != 'skipped'
1717
permissions:
1818
checks: write # to create the check run entry with test results

.github/workflows/bsim-tests.yaml

+2-1
Original file line numberDiff line numberDiff line change
@@ -121,9 +121,10 @@ jobs:
121121
id: check-bluetooth-files
122122
with:
123123
files: |
124-
tests/bsim/bluetooth/
125124
samples/bluetooth/
126125
subsys/bluetooth/
126+
tests/bluetooth/common/testlib/
127+
tests/bsim/bluetooth/
127128
128129
- name: Check if Networking files changed
129130
uses: tj-actions/changed-files@823fcebdb31bb35fdf2229d9f769b400309430d0 # v46.0.3

.github/workflows/bug_snapshot.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ permissions:
1919
jobs:
2020
make_bugs_pickle:
2121
name: Make bugs pickle
22-
runs-on: ubuntu-22.04
22+
runs-on: ubuntu-24.04
2323
if: github.repository_owner == 'zephyrproject-rtos'
2424

2525
steps:

.github/workflows/codecov.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ jobs:
134134
codecov-results:
135135
name: "Publish Coverage Results"
136136
needs: codecov
137-
runs-on: ubuntu-22.04
137+
runs-on: ubuntu-24.04
138138
# the codecov job might be skipped, we don't need to run this job then
139139
if: success() || failure()
140140

.github/workflows/coding_guidelines.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ permissions:
77

88
jobs:
99
compliance_job:
10-
runs-on: ubuntu-22.04
10+
runs-on: ubuntu-24.04
1111
name: Run coding guidelines checks on patch series (PR)
1212
steps:
1313
- name: Checkout the code

.github/workflows/compliance.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ permissions:
1313

1414
jobs:
1515
check_compliance:
16-
runs-on: ubuntu-22.04
16+
runs-on: ubuntu-24.04
1717
name: Run compliance checks on patch series (PR)
1818
steps:
1919
- name: Update PATH for west

.github/workflows/daily_test_version.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ permissions:
1515

1616
jobs:
1717
get_version:
18-
runs-on: ubuntu-22.04
18+
runs-on: ubuntu-24.04
1919
if: github.repository == 'zephyrproject-rtos/zephyr'
2020

2121
steps:

.github/workflows/doc-build.yml

+14
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,13 @@ jobs:
100100
git clean -f -d
101101
git log --graph --oneline HEAD...${PR_HEAD}
102102
103+
- name: Set up Python
104+
uses: actions/setup-python@8d9ed9ac5c53483de85588cdf95a591a75ab9f55 # v5.5.0
105+
with:
106+
python-version: 3.12
107+
cache: pip
108+
cache-dependency-path: doc/requirements.txt
109+
103110
- name: Setup Zephyr project
104111
uses: zephyrproject-rtos/action-zephyr-setup@f7b70269a8eb01f70c8e710891e4c94972a2f6b4 # v1.0.6
105112
with:
@@ -195,6 +202,13 @@ jobs:
195202
with:
196203
path: zephyr
197204

205+
- name: Set up Python
206+
uses: actions/setup-python@8d9ed9ac5c53483de85588cdf95a591a75ab9f55 # v5.5.0
207+
with:
208+
python-version: 3.12
209+
cache: pip
210+
cache-dependency-path: doc/requirements.txt
211+
198212
- name: install-pkgs
199213
run: |
200214
sudo apt-get update

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ permissions:
1616
jobs:
1717
doc-publish:
1818
name: Publish Documentation
19-
runs-on: ubuntu-22.04
19+
runs-on: ubuntu-24.04
2020
if: |
2121
github.event.workflow_run.event == 'pull_request' &&
2222
github.event.workflow_run.conclusion == 'success' &&

.github/workflows/doc-publish.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ permissions:
1919
jobs:
2020
doc-publish:
2121
name: Publish Documentation
22-
runs-on: ubuntu-22.04
22+
runs-on: ubuntu-24.04
2323
if: |
2424
github.event.workflow_run.event != 'pull_request' &&
2525
github.event.workflow_run.conclusion == 'success' &&

.github/workflows/errno.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ permissions:
1111

1212
jobs:
1313
check-errno:
14-
runs-on: ubuntu-22.04
14+
runs-on: ubuntu-24.04
1515
container:
1616
image: ghcr.io/zephyrproject-rtos/ci:v0.27.4
1717

.github/workflows/greet_first_time_contributor.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ permissions:
1111

1212
jobs:
1313
check_for_first_interaction:
14-
runs-on: ubuntu-22.04
14+
runs-on: ubuntu-24.04
1515
if: github.repository == 'zephyrproject-rtos/zephyr'
1616
permissions:
1717
pull-requests: write # to comment on pull requests

.github/workflows/issue_count.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ env:
1717
jobs:
1818
track-issues:
1919
name: "Collect Issue Stats"
20-
runs-on: ubuntu-22.04
20+
runs-on: ubuntu-24.04
2121
if: github.repository == 'zephyrproject-rtos/zephyr'
2222

2323
steps:

.github/workflows/license_check.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ permissions:
77

88
jobs:
99
scancode_job:
10-
runs-on: ubuntu-22.04
10+
runs-on: ubuntu-24.04
1111
name: Scan code for licenses
1212
steps:
1313
- name: Checkout the code

.github/workflows/manifest.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ permissions:
77

88
jobs:
99
contribs:
10-
runs-on: ubuntu-22.04
10+
runs-on: ubuntu-24.04
1111
permissions:
1212
pull-requests: write # to create/update pull request comments
1313
name: Manifest

.github/workflows/pr_metadata_check.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ permissions:
1616
jobs:
1717
do-not-merge:
1818
name: Prevent Merging
19-
runs-on: ubuntu-22.04
19+
runs-on: ubuntu-24.04
2020
steps:
2121
- name: Check for label
2222
if: ${{ contains(github.event.*.labels.*.name, 'DNM') ||
@@ -32,7 +32,7 @@ jobs:
3232
empty_pr_description:
3333
if: ${{ github.event.pull_request.body == '' }}
3434
name: PR Description
35-
runs-on: ubuntu-22.04
35+
runs-on: ubuntu-24.04
3636
steps:
3737
- name: Check for PR description
3838
run: |

.github/workflows/pylib_tests.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
strategy:
3030
matrix:
3131
python-version: ['3.10', '3.11', '3.12', '3.13']
32-
os: [ubuntu-22.04]
32+
os: [ubuntu-24.04]
3333
steps:
3434
- name: checkout
3535
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2

.github/workflows/release.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ permissions:
1111

1212
jobs:
1313
release:
14-
runs-on: ubuntu-22.04
14+
runs-on: ubuntu-24.04
1515
permissions:
1616
contents: write # to create GitHub release entry
1717
steps:

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ concurrency:
1717
jobs:
1818
cleanup:
1919
name: Cleanup
20-
runs-on: ubuntu-22.04
20+
runs-on: ubuntu-24.04
2121
permissions:
2222
actions: write # to delete stale workflow runs
2323

.github/workflows/stale_issue.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ permissions:
99
jobs:
1010
stale:
1111
name: Find Stale issues and PRs
12-
runs-on: ubuntu-22.04
12+
runs-on: ubuntu-24.04
1313
if: github.repository == 'zephyrproject-rtos/zephyr'
1414
permissions:
1515
pull-requests: write # to comment on stale pull requests

.github/workflows/stats_merged_prs.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ permissions:
1313
jobs:
1414
record_merged:
1515
if: github.event.pull_request.merged == true && github.repository == 'zephyrproject-rtos/zephyr'
16-
runs-on: ubuntu-22.04
16+
runs-on: ubuntu-24.04
1717
steps:
1818
- name: checkout
1919
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2

.github/workflows/twister-publish.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
env:
2020
ELASTICSEARCH_KEY: ${{ secrets.ELASTICSEARCH_KEY }}
2121
ELASTICSEARCH_SERVER: "https://elasticsearch.zephyrproject.io:443"
22-
runs-on: ubuntu-22.04
22+
runs-on: ubuntu-24.04
2323
steps:
2424
# Needed for elasticearch and upload script
2525
- name: Checkout

.github/workflows/twister.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -310,7 +310,7 @@ jobs:
310310
name: "Publish Unit Tests Results"
311311
needs:
312312
- twister-build
313-
runs-on: ubuntu-22.04
313+
runs-on: ubuntu-24.04
314314
permissions:
315315
checks: write # to create the check run entry with Twister test results
316316
# the build-and-test job might be skipped, we don't need to run this job then

.github/workflows/twister_tests.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
strategy:
3737
matrix:
3838
python-version: ['3.10', '3.11', '3.12', '3.13']
39-
os: [ubuntu-22.04]
39+
os: [ubuntu-24.04]
4040
steps:
4141
- name: checkout
4242
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2

MAINTAINERS.yml

+37-5
Original file line numberDiff line numberDiff line change
@@ -291,6 +291,21 @@ Ambiq Platforms:
291291
labels:
292292
- "platform: Ambiq"
293293

294+
AndesTech Platforms:
295+
status: maintained
296+
maintainers:
297+
- jimmyzhe
298+
collaborators:
299+
- kevinwang821020
300+
files:
301+
- boards/andestech/
302+
- drivers/*/*andes*
303+
- dts/bindings/*/*andestech*
304+
- dts/riscv/andes/
305+
- soc/andestech/
306+
labels:
307+
- "platform: Andes Technology"
308+
294309
BeagleBoard Platforms:
295310
status: maintained
296311
maintainers:
@@ -1050,8 +1065,8 @@ Documentation Infrastructure:
10501065
Release Notes:
10511066
status: maintained
10521067
maintainers:
1053-
- fabiobaltieri
1054-
- kartben
1068+
- danieldegrasse
1069+
- dkalowsk
10551070
collaborators:
10561071
- kartben
10571072
files:
@@ -3188,6 +3203,20 @@ PHYTEC Platforms:
31883203
labels:
31893204
- "platform: PHYTEC"
31903205

3206+
PMCI:
3207+
status: maintained
3208+
maintainers:
3209+
- teburd
3210+
collaborators:
3211+
- nashif
3212+
- inteljiangwe1
3213+
- kehintel
3214+
files:
3215+
- subsys/pmci/
3216+
- samples/modules/pmci/
3217+
labels:
3218+
- "area: PMCI"
3219+
31913220
POSIX API layer:
31923221
status: maintained
31933222
maintainers:
@@ -3455,19 +3484,23 @@ ADI Platforms:
34553484
- microbuilder
34563485
files:
34573486
- boards/adi/
3487+
- boards/shields/eval*ardz/
34583488
- boards/shields/pmod_acl/
34593489
- drivers/*/*max*
34603490
- drivers/*/*max*/
34613491
- drivers/dac/dac_ltc*
34623492
- drivers/ethernet/eth_adin*
3493+
- drivers/ethernet/phy/phy_adin*
34633494
- drivers/mdio/mdio_adin*
3464-
- drivers/regulator/regulator_adp5360*
34653495
- drivers/sensor/adi/
3496+
- drivers/stepper/adi_tmc/
34663497
- dts/arm/adi/
34673498
- dts/bindings/*/adi,*
34683499
- dts/bindings/*/lltc,*
34693500
- dts/bindings/*/maxim,*
34703501
- soc/adi/
3502+
files-regex:
3503+
- ^drivers/(adc|dac|gpio|mfd|regulator)/.*adp?\d+
34713504
labels:
34723505
- "platform: ADI"
34733506

@@ -5185,8 +5218,7 @@ West:
51855218
collaborators:
51865219
- nashif
51875220
- inteljiangwe1
5188-
files:
5189-
- samples/modules/mctp/
5221+
files: []
51905222
labels:
51915223
- "area: MCTP"
51925224

arch/Kconfig

+3-3
Original file line numberDiff line numberDiff line change
@@ -1134,9 +1134,9 @@ config ARCH_HAS_CUSTOM_CPU_ATOMIC_IDLE
11341134
config ARCH_HAS_CUSTOM_SWAP_TO_MAIN
11351135
bool
11361136
help
1137-
It's possible that an architecture port cannot use _Swap() to swap to
1138-
the _main() thread, but instead must do something custom. It must
1139-
enable this option in that case.
1137+
It's possible that an architecture port cannot use z_swap_unlocked()
1138+
to swap to the main thread (bg_thread_main), but instead must do
1139+
something custom. It must enable this option in that case.
11401140

11411141
config ARCH_HAS_CUSTOM_BUSY_WAIT
11421142
bool

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

-8
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,6 @@
88

99
__weak void *__dso_handle;
1010

11-
int __cxa_atexit(void (*destructor)(void *), void *objptr, void *dso)
12-
{
13-
ARG_UNUSED(destructor);
14-
ARG_UNUSED(objptr);
15-
ARG_UNUSED(dso);
16-
return 0;
17-
}
18-
1911
int atexit(void (*function)(void))
2012
{
2113
return 0;

0 commit comments

Comments
 (0)