Skip to content

Commit 9c95398

Browse files
gudipudiramanakumargudipudiramanakumar
authored
Merge branch 'zephyrproject-rtos:main' into main
2 parents c6a4f5b + 6c989de commit 9c95398

File tree

2,332 files changed

+77961
-25157
lines changed

Some content is hidden

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

2,332 files changed

+77961
-25157
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/dependabot.yml

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
version: 2
2+
enable-beta-ecosystems: true
23
updates:
34
- package-ecosystem: "github-actions"
45
directory: "/"
@@ -12,7 +13,7 @@ updates:
1213
patterns:
1314
- "*"
1415

15-
- package-ecosystem: "pip"
16+
- package-ecosystem: "uv"
1617
directory: "/doc"
1718
schedule:
1819
interval: "weekly"

‎.github/workflows/clang.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ jobs:
110110
export ZEPHYR_TOOLCHAIN_VARIANT=llvm
111111
112112
./scripts/twister -p native_sim --no-detailed-test-id --force-color --inline-logs -M -N -v --retry-failed 2 \
113-
-T tests --subset ${{matrix.subset}}/2
113+
-T tests --subset ${{matrix.subset}}/2 -j 16
114114
115115
- name: Print ccache stats
116116
if: always()

‎.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/twister.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -143,9 +143,9 @@ jobs:
143143
BSIM_OUT_PATH: /opt/bsim/
144144
BSIM_COMPONENTS_PATH: /opt/bsim/components
145145
TWISTER_COMMON: ' --test-config tests/test_config_ci.yaml --no-detailed-test-id --force-color --inline-logs -v -N -M --retry-failed 3 --timeout-multiplier 2 '
146-
WEEKLY_OPTIONS: ' -M --build-only --all --show-footprint --report-filtered'
147-
PR_OPTIONS: ' --clobber-output --integration'
148-
PUSH_OPTIONS: ' --clobber-output -M --show-footprint --report-filtered'
146+
WEEKLY_OPTIONS: ' -M --build-only --all --show-footprint --report-filtered -j 32'
147+
PR_OPTIONS: ' --clobber-output --integration -j 16'
148+
PUSH_OPTIONS: ' --clobber-output -M --show-footprint --report-filtered -j 16'
149149
COMMIT_RANGE: ${{ github.event.pull_request.base.sha }}..${{ github.event.pull_request.head.sha }}
150150
BASE_REF: ${{ github.base_ref }}
151151
LLVM_TOOLCHAIN_PATH: /usr/lib/llvm-16

‎.github/workflows/twister_tests_blackbox.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -62,4 +62,4 @@ jobs:
6262
export ZEPHYR_SDK_INSTALL_DIR=${{ github.workspace }}/zephyr-sdk
6363
echo "Run twister tests"
6464
source zephyr-env.sh
65-
PYTHONPATH="./scripts/tests" pytest ./scripts/tests/twister_blackbox/test_output.py
65+
PYTHONPATH="./scripts/tests" pytest ./scripts/tests/twister_blackbox/

‎.gitlint

+4
Original file line numberDiff line numberDiff line change
@@ -59,3 +59,7 @@ ignore-merge-commits=false
5959
# By specifying this rule, developers can only change the file when they explicitly reference
6060
# it in the commit message.
6161
#files=gitlint/rules.py,README.md
62+
63+
[ignore-by-author-name]
64+
regex=^dependabot\[bot\]$
65+
ignore=all

‎MAINTAINERS.yml

+30-10
Original file line numberDiff line numberDiff line change
@@ -886,7 +886,6 @@ Demand Paging:
886886
Device Driver Model:
887887
status: maintained
888888
maintainers:
889-
- gmarull
890889
- tbursztyka
891890
collaborators:
892891
- dcpleung
@@ -1034,9 +1033,9 @@ Documentation:
10341033
Documentation Infrastructure:
10351034
status: maintained
10361035
maintainers:
1037-
- gmarull
10381036
- kartben
10391037
collaborators:
1038+
- gmarull
10401039
- carlescufi
10411040
- nashif
10421041
files:
@@ -1822,7 +1821,6 @@ Release Notes:
18221821
"Drivers: MFD":
18231822
status: odd fixes
18241823
collaborators:
1825-
- gmarull
18261824
- aasinclair
18271825
files:
18281826
- drivers/mfd/
@@ -1933,8 +1931,8 @@ Release Notes:
19331931
- samples.drivers.peci
19341932

19351933
"Drivers: Pin Control":
1936-
status: maintained
1937-
maintainers:
1934+
status: odd fixes
1935+
collaborators:
19381936
- gmarull
19391937
files:
19401938
- doc/hardware/pinctrl/
@@ -2392,8 +2390,6 @@ Input:
23922390
status: maintained
23932391
maintainers:
23942392
- fabiobaltieri
2395-
collaborators:
2396-
- gmarull
23972393
files:
23982394
- doc/services/input/
23992395
- drivers/input/
@@ -3459,19 +3455,23 @@ ADI Platforms:
34593455
- microbuilder
34603456
files:
34613457
- boards/adi/
3458+
- boards/shields/eval*ardz/
34623459
- boards/shields/pmod_acl/
34633460
- drivers/*/*max*
34643461
- drivers/*/*max*/
34653462
- drivers/dac/dac_ltc*
34663463
- drivers/ethernet/eth_adin*
3464+
- drivers/ethernet/phy/phy_adin*
34673465
- drivers/mdio/mdio_adin*
3468-
- drivers/regulator/regulator_adp5360*
34693466
- drivers/sensor/adi/
3467+
- drivers/stepper/adi_tmc/
34703468
- dts/arm/adi/
34713469
- dts/bindings/*/adi,*
34723470
- dts/bindings/*/lltc,*
34733471
- dts/bindings/*/maxim,*
34743472
- soc/adi/
3473+
files-regex:
3474+
- ^drivers/(adc|dac|gpio|mfd|regulator)/.*adp?\d+
34753475
labels:
34763476
- "platform: ADI"
34773477

@@ -3487,7 +3487,6 @@ GD32 Platforms:
34873487
maintainers:
34883488
- nandojve
34893489
collaborators:
3490-
- gmarull
34913490
- soburi
34923491
- cameled
34933492
files:
@@ -4058,6 +4057,7 @@ Renesas RA Platforms:
40584057
collaborators:
40594058
- duynguyenxa
40604059
- thaoluonguw
4060+
- thenguyenyf
40614061
files:
40624062
- boards/arduino/uno_r4/
40634063
- boards/renesas/*ra*/
@@ -4456,8 +4456,13 @@ Task Watchdog:
44564456
TDK Sensors:
44574457
status: maintained
44584458
maintainers:
4459+
- afontaine-invn
4460+
- rbuisson-invn
4461+
collaborators:
44594462
- teburd
44604463
- MaureenHelm
4464+
- sriccardi-invn
4465+
- gjabouley-invn
44614466
files:
44624467
- drivers/sensor/tdk/
44634468
labels:
@@ -4943,7 +4948,6 @@ West:
49434948
maintainers:
49444949
- nandojve
49454950
collaborators:
4946-
- gmarull
49474951
- soburi
49484952
files:
49494953
- modules/hal_gigadevice/
@@ -5672,6 +5676,22 @@ Peregrine Platforms:
56725676
labels:
56735677
- "platform: Peregrine"
56745678

5679+
WCH Platforms:
5680+
status: maintained
5681+
maintainers:
5682+
- nzmichaelh
5683+
- kholia
5684+
collaborators:
5685+
- VynDragon
5686+
files:
5687+
- boards/wch/
5688+
- dts/riscv/wch/
5689+
- soc/wch/
5690+
- drivers/*/*wch*
5691+
- dts/bindings/*/wch,*
5692+
labels:
5693+
- "platform: WinChipHead"
5694+
56755695
# This area is to be converted to a subarea
56765696
Testing with Renode:
56775697
status: odd fixes

‎arch/arm/core/cortex_a_r/Kconfig

+9
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,15 @@
1313
# CPU_AARCH32_CORTEX_A / if CPU_AARCH32_CORTEX_R blocks so they are not
1414
# exposed if one selects a different ARM Cortex Family (Cortex-M).
1515

16+
config CPU_CORTEX_A7
17+
bool
18+
select CPU_AARCH32_CORTEX_A
19+
select ARMV7_A
20+
select CPU_HAS_ICACHE
21+
select CPU_HAS_DCACHE
22+
help
23+
This option signifies the use of a Cortex-A7 CPU.
24+
1625
config CPU_CORTEX_A9
1726
bool
1827
select CPU_AARCH32_CORTEX_A

‎arch/arm/core/cortex_a_r/fault.c

+53
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,59 @@ static uint32_t dump_fault(uint32_t status, uint32_t addr)
100100
reason = K_ERR_ARM_UNSUPPORTED_EXCLUSIVE_ACCESS_FAULT;
101101
LOG_ERR("Unsupported Exclusive Access Fault @ 0x%08x", addr);
102102
break;
103+
#elif defined(CONFIG_ARMV7_A)
104+
case FSR_FS_PERMISSION_FAULT_2ND_LEVEL:
105+
reason = K_ERR_ARM_PERMISSION_FAULT_2ND_LEVEL;
106+
LOG_ERR("2nd Level Permission Fault @ 0x%08x", addr);
107+
break;
108+
case FSR_FS_ACCESS_FLAG_FAULT_1ST_LEVEL:
109+
reason = K_ERR_ARM_ACCESS_FLAG_FAULT_1ST_LEVEL;
110+
LOG_ERR("1st Level Access Flag Fault @ 0x%08x", addr);
111+
break;
112+
case FSR_FS_ACCESS_FLAG_FAULT_2ND_LEVEL:
113+
reason = K_ERR_ARM_ACCESS_FLAG_FAULT_2ND_LEVEL;
114+
LOG_ERR("2nd Level Access Flag Fault @ 0x%08x", addr);
115+
break;
116+
case FSR_FS_CACHE_MAINTENANCE_INSTRUCTION_FAULT:
117+
reason = K_ERR_ARM_CACHE_MAINTENANCE_INSTRUCTION_FAULT;
118+
LOG_ERR("Cache Maintenance Instruction Fault @ 0x%08x", addr);
119+
break;
120+
case FSR_FS_TRANSLATION_FAULT:
121+
reason = K_ERR_ARM_TRANSLATION_FAULT;
122+
LOG_ERR("1st Level Translation Fault @ 0x%08x", addr);
123+
break;
124+
case FSR_FS_TRANSLATION_FAULT_2ND_LEVEL:
125+
reason = K_ERR_ARM_TRANSLATION_FAULT_2ND_LEVEL;
126+
LOG_ERR("2nd Level Translation Fault @ 0x%08x", addr);
127+
break;
128+
case FSR_FS_DOMAIN_FAULT_1ST_LEVEL:
129+
reason = K_ERR_ARM_DOMAIN_FAULT_1ST_LEVEL;
130+
LOG_ERR("1st Level Domain Fault @ 0x%08x", addr);
131+
break;
132+
case FSR_FS_DOMAIN_FAULT_2ND_LEVEL:
133+
reason = K_ERR_ARM_DOMAIN_FAULT_2ND_LEVEL;
134+
LOG_ERR("2nd Level Domain Fault @ 0x%08x", addr);
135+
break;
136+
case FSR_FS_SYNC_EXTERNAL_ABORT_TRANSLATION_TABLE_1ST_LEVEL:
137+
reason = K_ERR_ARM_SYNC_EXTERNAL_ABORT_TRANSLATION_TABLE_1ST_LEVEL;
138+
LOG_ERR("1st Level Synchronous External Abort Translation Table @ 0x%08x", addr);
139+
break;
140+
case FSR_FS_SYNC_EXTERNAL_ABORT_TRANSLATION_TABLE_2ND_LEVEL:
141+
reason = K_ERR_ARM_SYNC_EXTERNAL_ABORT_TRANSLATION_TABLE_2ND_LEVEL;
142+
LOG_ERR("2nd Level Synchronous External Abort Translation Table @ 0x%08x", addr);
143+
break;
144+
case FSR_FS_TLB_CONFLICT_FAULT:
145+
reason = K_ERR_ARM_TLB_CONFLICT_FAULT;
146+
LOG_ERR("Table Conflict Fault @ 0x%08x", addr);
147+
break;
148+
case FSR_FS_SYNC_PARITY_ERROR_TRANSLATION_TABLE_1ST_LEVEL:
149+
reason = K_ERR_ARM_SYNC_PARITY_ERROR_TRANSLATION_TABLE_1ST_LEVEL;
150+
LOG_ERR("1st Level Synchronous Parity Error Translation Table @ 0x%08x", addr);
151+
break;
152+
case FSR_FS_SYNC_PARITY_ERROR_TRANSLATION_TABLE_2ND_LEVEL:
153+
reason = K_ERR_ARM_SYNC_PARITY_ERROR_TRANSLATION_TABLE_2ND_LEVEL;
154+
LOG_ERR("2nd Level Synchronous Parity Error Translation Table @ 0x%08x", addr);
155+
break;
103156
#else
104157
case FSR_FS_BACKGROUND_FAULT:
105158
reason = K_ERR_ARM_BACKGROUND_FAULT;

‎arch/arm/core/cortex_m/prep_c.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ Z_GENERIC_SECTION(.vt_pointer_section) __attribute__((used)) void *_vector_table
4848
#define VTOR_MASK SCB_VTOR_TBLOFF_Msk
4949
#endif
5050

51-
static inline void relocate_vector_table(void)
51+
void __weak relocate_vector_table(void)
5252
{
5353
SCB->VTOR = VECTOR_ADDRESS & VTOR_MASK;
5454
barrier_dsync_fence_full();

‎boards/01space/esp32c3_042_oled/doc/index.rst

+2
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,8 @@ retrieve those files.
6767
Programming and Debugging
6868
*************************
6969

70+
.. zephyr:board-supported-runners::
71+
7072
Standalone application
7173
======================
7274

‎boards/acrn/acrn/Kconfig

+3-11
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,9 @@
1-
# Copyright (c) 2019-2024 Intel Corporation
1+
# Copyright (c) 2019-2025 Intel Corporation
22
#
33
# SPDX-License-Identifier: Apache-2.0
44

5-
config BOARD_ACRN
5+
config ACRN_COMMON
66
bool
7+
default y if BOARD_ACRN || BOARD_ACRN_EHL_CRB || BOARD_ACRN_ADL_CRB
78
select CPU_HAS_FPU
89
select X86_64
9-
help
10-
"ACRN User OS"
11-
12-
config BOARD_ACRN_EHL_CRB
13-
bool
14-
select CPU_HAS_FPU
15-
select X86_64
16-
help
17-
"ACRN User OS on ElkhartLake CRB"

‎boards/acrn/acrn/Kconfig.acrn_adl_crb

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
# Copyright (c) 2025 Intel Corporation
2+
#
3+
# SPDX-License-Identifier: Apache-2.0
4+
5+
config BOARD_ACRN_ADL_CRB
6+
select SOC_ATOM

‎boards/acrn/acrn/acrn_adl_crb.dts

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
/*
2+
* Copyright (c) 2025 Intel Corporation
3+
*
4+
* SPDX-License-Identifier: Apache-2.0
5+
*/
6+
7+
#include "acrn.dts"

‎boards/acrn/acrn/acrn_adl_crb.yaml

+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
identifier: acrn_adl_crb
2+
name: ACRN on ADL configuration
3+
type: mcu
4+
arch: x86
5+
toolchain:
6+
- zephyr
7+
ram: 8192
8+
testing:
9+
ignore_tags:
10+
- net
11+
- bluetooth

‎boards/acrn/acrn/acrn_adl_crb_defconfig

+15
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
# Copyright (c) 2025 Intel Corporation
2+
#
3+
# SPDX-License-Identifier: Apache-2.0
4+
5+
CONFIG_PIC_DISABLE=y
6+
CONFIG_LOAPIC=y
7+
CONFIG_X2APIC=y
8+
CONFIG_CONSOLE=y
9+
CONFIG_SERIAL=y
10+
CONFIG_UART_CONSOLE=y
11+
CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=1500000000
12+
CONFIG_BUILD_OUTPUT_BIN=y
13+
CONFIG_SHELL_BACKEND_SERIAL_INTERRUPT_DRIVEN=n
14+
CONFIG_KERNEL_VM_SIZE=0x5000000
15+
CONFIG_APIC_TSC_DEADLINE_TIMER=y

‎boards/acrn/acrn/board.yml

+6-1
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,9 @@ boards:
88
- name: acrn_ehl_crb
99
full_name: ACRN on EHL hypervisor
1010
socs:
11-
- name: elkhart_lake
11+
- name: atom
12+
13+
- name: acrn_adl_crb
14+
full_name: ACRN Hypervisor on ADL
15+
socs:
16+
- name: atom

‎boards/adafruit/feather_esp32s2/doc/adafruit_feather_esp32s2.rst

+2
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,8 @@ pinouts and the schematic.
6161
Programming and Debugging
6262
*************************
6363

64+
.. zephyr:board-supported-runners::
65+
6466
Prerequisites
6567
=============
6668

0 commit comments

Comments
 (0)