Skip to content

Commit 93337b1

Browse files
authored
Merge branch 'zephyrproject-rtos:main' into main
2 parents df9d583 + 4af34c4 commit 93337b1

File tree

4,625 files changed

+163888
-38355
lines changed

Some content is hidden

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

4,625 files changed

+163888
-38355
lines changed

.editorconfig

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,10 @@ indent_size = 8
8686
[COMMIT_EDITMSG]
8787
max_line_length = 75
8888

89+
# Patches
90+
[{*.patch,*.diff}]
91+
trim_trailing_whitespace = false
92+
8993
# Kconfig
9094
[Kconfig*]
9195
indent_style = tab

.github/workflows/compliance.yml

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,16 @@ jobs:
6060
west config manifest.group-filter -- +ci,-optional
6161
west update -o=--depth=1 -n 2>&1 1> west.update.log || west update -o=--depth=1 -n 2>&1 1> west.update2.log
6262
63+
- name: Setup Node.js
64+
uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6.0.0
65+
with:
66+
node-version: "lts/*"
67+
cache: npm
68+
check-latest: true
69+
70+
- name: Install Node dependencies
71+
run: npm ci
72+
6373
- name: Run Compliance Tests
6474
continue-on-error: true
6575
id: compliance
@@ -86,6 +96,14 @@ jobs:
8696
name: compliance.xml
8797
path: compliance.xml
8898

99+
- name: Upload dts linter patch
100+
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
101+
continue-on-error: true
102+
if: hashFiles('dts_linter.patch') != ''
103+
with:
104+
name: dts_linter.patch
105+
path: dts_linter.patch
106+
89107
- name: check-warns
90108
run: |
91109
if [[ ! -s "compliance.xml" ]]; then

.github/workflows/doc-build.yml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
name: Documentation Build
55

66
on:
7-
schedule:
8-
- cron: '0 */3 * * *'
97
push:
8+
branches:
9+
- main
1010
tags:
1111
- v*
1212
pull_request:
@@ -61,7 +61,7 @@ jobs:
6161
container:
6262
image: ghcr.io/zephyrproject-rtos/ci-repo-cache:v0.28.6.20251003
6363
options: '--entrypoint /bin/bash'
64-
timeout-minutes: 20
64+
timeout-minutes: 60
6565
concurrency:
6666
group: doc-build-html-${{ github.ref }}
6767
cancel-in-progress: true
@@ -112,7 +112,6 @@ jobs:
112112
echo "$HOME/.cargo/bin" >> $GITHUB_PATH
113113
114114
west init -l . || true
115-
west config manifest.group-filter -- +ci,+optional
116115
west config --global update.narrow true
117116
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)
118117
west forall -c 'git reset --hard HEAD'

.gitignore

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,7 @@ target/
7676

7777
# CI output
7878
compliance.xml
79+
dts_linter.patch
7980
_error.types
8081

8182
# Tag files
@@ -118,3 +119,6 @@ TextEncoding.txt
118119
YAMLLint.txt
119120
ZephyrModuleFile.txt
120121
# zephyr-keep-sorted-stop
122+
123+
# Node dependecies
124+
node_modules

.ruff-excludes.toml

Lines changed: 0 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -721,119 +721,85 @@
721721
"UP015", # https://docs.astral.sh/ruff/rules/redundant-open-modes
722722
"UP035", # https://docs.astral.sh/ruff/rules/deprecated-import
723723
]
724-
"./scripts/tests/twister/conftest.py" = [
725-
"E402", # https://docs.astral.sh/ruff/rules/module-import-not-at-top-of-file
726-
"I001", # https://docs.astral.sh/ruff/rules/unsorted-imports
727-
]
728-
"./scripts/tests/twister/pytest_integration/test_harness_pytest.py" = [
729-
"I001", # https://docs.astral.sh/ruff/rules/unsorted-imports
730-
]
731724
"./scripts/tests/twister/test_cmakecache.py" = [
732725
"F541", # https://docs.astral.sh/ruff/rules/f-string-missing-placeholders
733-
"I001", # https://docs.astral.sh/ruff/rules/unsorted-imports
734726
"UP026", # https://docs.astral.sh/ruff/rules/deprecated-mock-import
735727
]
736728
"./scripts/tests/twister/test_config_parser.py" = [
737729
"B017", # https://docs.astral.sh/ruff/rules/assert-raises-exception
738730
"B033", # https://docs.astral.sh/ruff/rules/duplicate-value
739731
"E501", # https://docs.astral.sh/ruff/rules/line-too-long
740-
"I001", # https://docs.astral.sh/ruff/rules/unsorted-imports
741732
"SIM117", # https://docs.astral.sh/ruff/rules/multiple-with-statements
742733
"UP026", # https://docs.astral.sh/ruff/rules/deprecated-mock-import
743734
]
744735
"./scripts/tests/twister/test_data/mixins/test_to_ignore.py" = [
745736
"B011", # https://docs.astral.sh/ruff/rules/assert-false
746737
]
747738
"./scripts/tests/twister/test_environment.py" = [
748-
"I001", # https://docs.astral.sh/ruff/rules/unsorted-imports
749739
"SIM117", # https://docs.astral.sh/ruff/rules/multiple-with-statements
750740
"UP026", # https://docs.astral.sh/ruff/rules/deprecated-mock-import
751741
]
752-
"./scripts/tests/twister/test_errors.py" = [
753-
"I001", # https://docs.astral.sh/ruff/rules/unsorted-imports
754-
]
755742
"./scripts/tests/twister/test_handlers.py" = [
756743
"B011", # https://docs.astral.sh/ruff/rules/assert-false
757-
"E402", # https://docs.astral.sh/ruff/rules/module-import-not-at-top-of-file
758744
"F541", # https://docs.astral.sh/ruff/rules/f-string-missing-placeholders
759-
"I001", # https://docs.astral.sh/ruff/rules/unsorted-imports
760745
"UP012", # https://docs.astral.sh/ruff/rules/unnecessary-encode-utf8
761746
"UP026", # https://docs.astral.sh/ruff/rules/deprecated-mock-import
762747
]
763748
"./scripts/tests/twister/test_hardwaremap.py" = [
764-
"I001", # https://docs.astral.sh/ruff/rules/unsorted-imports
765749
"UP026", # https://docs.astral.sh/ruff/rules/deprecated-mock-import
766750
"UP031", # https://docs.astral.sh/ruff/rules/printf-string-formatting
767751
]
768752
"./scripts/tests/twister/test_harness.py" = [
769753
"B017", # https://docs.astral.sh/ruff/rules/assert-raises-exception
770754
"E501", # https://docs.astral.sh/ruff/rules/line-too-long
771755
"E713", # https://docs.astral.sh/ruff/rules/not-in-test
772-
"I001", # https://docs.astral.sh/ruff/rules/unsorted-imports
773756
"UP015", # https://docs.astral.sh/ruff/rules/redundant-open-modes
774757
"UP026", # https://docs.astral.sh/ruff/rules/deprecated-mock-import
775758
]
776759
"./scripts/tests/twister/test_jobserver.py" = [
777760
"F541", # https://docs.astral.sh/ruff/rules/f-string-missing-placeholders
778-
"I001", # https://docs.astral.sh/ruff/rules/unsorted-imports
779761
"UP026", # https://docs.astral.sh/ruff/rules/deprecated-mock-import
780762
]
781763
"./scripts/tests/twister/test_log_helper.py" = [
782-
"I001", # https://docs.astral.sh/ruff/rules/unsorted-imports
783764
"UP026", # https://docs.astral.sh/ruff/rules/deprecated-mock-import
784765
]
785766
"./scripts/tests/twister/test_platform.py" = [
786767
"B011", # https://docs.astral.sh/ruff/rules/assert-false
787-
"E402", # https://docs.astral.sh/ruff/rules/module-import-not-at-top-of-file
788-
"I001", # https://docs.astral.sh/ruff/rules/unsorted-imports
789768
"UP026", # https://docs.astral.sh/ruff/rules/deprecated-mock-import
790769
]
791770
"./scripts/tests/twister/test_quarantine.py" = [
792-
"I001", # https://docs.astral.sh/ruff/rules/unsorted-imports
793771
"UP026", # https://docs.astral.sh/ruff/rules/deprecated-mock-import
794772
]
795773
"./scripts/tests/twister/test_runner.py" = [
796-
"E402", # https://docs.astral.sh/ruff/rules/module-import-not-at-top-of-file
797774
"E501", # https://docs.astral.sh/ruff/rules/line-too-long
798-
"I001", # https://docs.astral.sh/ruff/rules/unsorted-imports
799775
"UP006", # https://docs.astral.sh/ruff/rules/non-pep585-annotation
800776
"UP015", # https://docs.astral.sh/ruff/rules/redundant-open-modes
801777
"UP026", # https://docs.astral.sh/ruff/rules/deprecated-mock-import
802778
"UP035", # https://docs.astral.sh/ruff/rules/deprecated-import
803779
]
804780
"./scripts/tests/twister/test_scl.py" = [
805-
"E402", # https://docs.astral.sh/ruff/rules/module-import-not-at-top-of-file
806-
"I001", # https://docs.astral.sh/ruff/rules/unsorted-imports
807781
"SIM117", # https://docs.astral.sh/ruff/rules/multiple-with-statements
808782
"UP025", # https://docs.astral.sh/ruff/rules/unicode-kind-prefix
809783
"UP026", # https://docs.astral.sh/ruff/rules/deprecated-mock-import
810784
]
811785
"./scripts/tests/twister/test_testinstance.py" = [
812-
"E402", # https://docs.astral.sh/ruff/rules/module-import-not-at-top-of-file
813786
"E501", # https://docs.astral.sh/ruff/rules/line-too-long
814-
"I001", # https://docs.astral.sh/ruff/rules/unsorted-imports
815787
"UP026", # https://docs.astral.sh/ruff/rules/deprecated-mock-import
816788
]
817789
"./scripts/tests/twister/test_testplan.py" = [
818790
"B905", # https://docs.astral.sh/ruff/rules/zip-without-explicit-strict
819791
"E101", # https://docs.astral.sh/ruff/rules/mixed-spaces-and-tabs
820-
"E402", # https://docs.astral.sh/ruff/rules/module-import-not-at-top-of-file
821792
"E501", # https://docs.astral.sh/ruff/rules/line-too-long
822-
"I001", # https://docs.astral.sh/ruff/rules/unsorted-imports
823793
"SIM118", # https://docs.astral.sh/ruff/rules/in-dict-keys
824794
"UP026", # https://docs.astral.sh/ruff/rules/deprecated-mock-import
825795
"W191", # https://docs.astral.sh/ruff/rules/tab-indentation
826796
]
827797
"./scripts/tests/twister/test_testsuite.py" = [
828798
"B011", # https://docs.astral.sh/ruff/rules/assert-false
829-
"E402", # https://docs.astral.sh/ruff/rules/module-import-not-at-top-of-file
830-
"I001", # https://docs.astral.sh/ruff/rules/unsorted-imports
831799
"UP026", # https://docs.astral.sh/ruff/rules/deprecated-mock-import
832800
]
833801
"./scripts/tests/twister/test_twister.py" = [
834-
"E402", # https://docs.astral.sh/ruff/rules/module-import-not-at-top-of-file
835802
"E501", # https://docs.astral.sh/ruff/rules/line-too-long
836-
"I001", # https://docs.astral.sh/ruff/rules/unsorted-imports
837803
"UP026", # https://docs.astral.sh/ruff/rules/deprecated-mock-import
838804
]
839805
"./scripts/tests/twister_blackbox/conftest.py" = [

MAINTAINERS.yml

Lines changed: 33 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -337,6 +337,7 @@ Arduino Platforms:
337337
- boards/arduino/
338338
- boards/shields/arduino_*/
339339
- drivers/*/*modulino*
340+
- dts/vendor/arduino/
340341

341342
Base OS:
342343
status: maintained
@@ -855,8 +856,6 @@ CPU Frequency Scaling:
855856
- seankyer
856857
files:
857858
- include/zephyr/cpu_freq/
858-
- include/zephyr/cpu_load/
859-
- subsys/cpu_load/
860859
- subsys/cpu_freq/
861860
- dts/bindings/p_state/
862861
labels:
@@ -1275,6 +1274,7 @@ Documentation Infrastructure:
12751274
- martinjaeger
12761275
- str4t0m
12771276
files:
1277+
- boards/shields/canis_canpico/
12781278
- boards/shields/mcp2515/
12791279
- boards/shields/tcan4550evm/
12801280
- doc/connectivity/canbus/
@@ -3047,9 +3047,10 @@ JSON Web Token:
30473047
- libraries.encoding.jwt
30483048

30493049
Kconfig:
3050-
status: odd fixes
3051-
collaborators:
3050+
status: maintained
3051+
maintainers:
30523052
- tejlmand
3053+
collaborators:
30533054
- nashif
30543055
files:
30553056
- scripts/kconfig/
@@ -3353,6 +3354,7 @@ Microchip SAM Platforms:
33533354
maintainers:
33543355
- nandojve
33553356
collaborators:
3357+
- ArunMCHP
33563358
- pdgendt
33573359
- stephanosio
33583360
files:
@@ -3386,8 +3388,6 @@ Modem:
33863388
status: maintained
33873389
maintainers:
33883390
- bjarki-andreasen
3389-
collaborators:
3390-
- tomi-font
33913391
files:
33923392
- subsys/modem/
33933393
- include/zephyr/modem/
@@ -4378,6 +4378,25 @@ Renesas RA Platforms:
43784378
Renesas RA SOCs, dts files, and related drivers. Boards based
43794379
on Renesas RA SoCs.
43804380
4381+
Renesas RX Platform:
4382+
status: maintained
4383+
maintainers:
4384+
- duynguyenxa
4385+
collaborators:
4386+
- quytranpzz
4387+
files:
4388+
- boards/renesas/*rx*/
4389+
- drivers/*/*renesas_rx*
4390+
- drivers/pinctrl/renesas/rx/
4391+
- dts/rx/renesas/
4392+
- dts/bindings/*/*renesas,rx*
4393+
- soc/renesas/rx/
4394+
labels:
4395+
- "platform: Renesas RX"
4396+
description: >-
4397+
Renesas RX SOCs, dts files, and related drivers. Renesas boards based
4398+
on RX SoCs.
4399+
43814400
Renesas RZ Platforms:
43824401
status: maintained
43834402
maintainers:
@@ -4656,6 +4675,7 @@ SiFli SF32LB Platforms:
46564675
- gmarull
46574676
collaborators:
46584677
- cameled
4678+
- ck-telecom
46594679
files:
46604680
- boards/sifli/
46614681
- drivers/*/*sf32lb*
@@ -4863,10 +4883,13 @@ TI SimpleLink Platforms:
48634883
status: maintained
48644884
maintainers:
48654885
- vaishnavachath
4886+
collaborators:
4887+
- bogdanovs
48664888
files:
48674889
- boards/ti/cc*/
48684890
- boards/ti/msp*/
48694891
- drivers/*/*cc13*
4892+
- drivers/*/*cc23*
48704893
- drivers/*/*cc25*
48714894
- drivers/*/*cc26*
48724895
- drivers/*/*cc32*
@@ -5539,6 +5562,7 @@ West:
55395562
- AzharMCHP
55405563
- scottwcpg
55415564
- nandojve
5565+
- NhMchp
55425566
collaborators:
55435567
- VenkatKotakonda
55445568
- albertofloyd
@@ -5794,6 +5818,7 @@ West:
57945818
collaborators:
57955819
- nashif
57965820
- inteljiangwe1
5821+
- dkalowsk
57975822
files: []
57985823
labels:
57995824
- "area: MCTP"
@@ -5920,7 +5945,7 @@ West:
59205945
- "area: Serialization"
59215946

59225947
"West project: net-tools":
5923-
status: odd fixes
5948+
status: maintained
59245949
maintainers:
59255950
- jukkar
59265951
collaborators:
@@ -6078,10 +6103,7 @@ West:
60786103
- thrift
60796104

60806105
"West project: trusted-firmware-a":
6081-
status: maintained
6082-
maintainers:
6083-
- povergoing
6084-
- sgrrzhf
6106+
status: odd fixes
60856107
collaborators:
60866108
- wearyzen
60876109
- ithinuel

arch/Kconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@ config ARM64
5757
select ARCH_HAS_DEMAND_MAPPING
5858
select ARCH_SUPPORTS_EVICTION_TRACKING
5959
select EVICTION_TRACKING if DEMAND_PAGING
60+
select MEM_DOMAIN_HAS_THREAD_LIST if ARM_MPU
6061
help
6162
ARM64 (AArch64) architecture
6263

arch/arc/core/prep_c.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,9 +84,7 @@ extern void arc_secureshield_init(void);
8484

8585
FUNC_NORETURN void z_prep_c(void)
8686
{
87-
#if defined(CONFIG_SOC_PREP_HOOK)
8887
soc_prep_hook();
89-
#endif
9088

9189
#ifdef CONFIG_ISA_ARCV3
9290
arc_cluster_scm_enable();

arch/arm/core/cortex_a_r/prep_c.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -100,9 +100,8 @@ extern FUNC_NORETURN void z_cstart(void);
100100
*/
101101
FUNC_NORETURN void z_prep_c(void)
102102
{
103-
#if defined(CONFIG_SOC_PREP_HOOK)
104103
soc_prep_hook();
105-
#endif
104+
106105
/* Initialize tpidruro with our struct _cpu instance address */
107106
write_tpidruro((uintptr_t)&_kernel.cpus[0]);
108107

arch/arm/core/cortex_m/prep_c.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -197,9 +197,7 @@ extern FUNC_NORETURN void z_cstart(void);
197197
*/
198198
FUNC_NORETURN void z_prep_c(void)
199199
{
200-
#if defined(CONFIG_SOC_PREP_HOOK)
201200
soc_prep_hook();
202-
#endif
203201

204202
relocate_vector_table();
205203
#if defined(CONFIG_CPU_HAS_FPU)

0 commit comments

Comments
 (0)