Skip to content

Commit b7a9811

Browse files
Merge branch 'zephyrproject-rtos:main' into drivers_ltc2959
2 parents 3cbcfb9 + a1f66f0 commit b7a9811

File tree

1,001 files changed

+23923
-22988
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,001 files changed

+23923
-22988
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -110,3 +110,4 @@ SysbuildKconfigBasic.txt
110110
SysbuildKconfigBasicNoModules.txt
111111
TextEncoding.txt
112112
YAMLLint.txt
113+
ZephyrModuleFile.txt

.gitlint

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
# All these sections are optional, edit this file as you like.
22
# Zephyr-specific defaults are located in scripts/gitlint/zephyr_commit_rules.py
33
[general]
4+
regex-style-search=true
45
ignore=title-trailing-punctuation, T3, title-max-length, T1, body-hard-tab, B3, B1
56
# verbosity should be a value between 1 and 3, the commandline -v flags take precedence over this
67
verbosity = 3

MAINTAINERS.yml

Lines changed: 48 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2501,6 +2501,20 @@ Documentation Infrastructure:
25012501
labels:
25022502
- "area: Wi-Fi"
25032503

2504+
"Drivers: Wurth Elektronik Sensors":
2505+
status: maintained
2506+
maintainers:
2507+
- mah-eiSmart
2508+
- wm-eisos
2509+
files:
2510+
- drivers/sensor/wsen/
2511+
labels:
2512+
- "area: Sensors"
2513+
tests:
2514+
- drivers.sensors
2515+
description: >-
2516+
Drivers of Wurth Elektronik sensors.
2517+
25042518
"Drivers: bbram":
25052519
status: maintained
25062520
maintainers:
@@ -3628,7 +3642,7 @@ Networking:
36283642
- jukkar
36293643
- rlubos
36303644
collaborators:
3631-
- mrodgers-witekio
3645+
- matt-rodgers
36323646
files:
36333647
- doc/connectivity/networking/api/http*.rst
36343648
- include/zephyr/net/http/
@@ -3861,6 +3875,7 @@ Open AMP:
38613875
- iuliana-prodan
38623876
collaborators:
38633877
- uLipe
3878+
- arnopo
38643879
files:
38653880
- lib/open-amp/
38663881
- samples/subsys/ipc/openamp/
@@ -4111,8 +4126,8 @@ Realtek EC Platforms:
41114126
Release Notes:
41124127
status: maintained
41134128
maintainers:
4114-
- danieldegrasse
4115-
- dkalowsk
4129+
- cfriedt
4130+
- jhedberg
41164131
collaborators:
41174132
- kartben
41184133
files:
@@ -5282,9 +5297,16 @@ West:
52825297
status: maintained
52835298
maintainers:
52845299
- anangl
5300+
- nika-nordic
5301+
- masz-nordic
52855302
collaborators:
52865303
- hubertmis
52875304
- nordic-krch
5305+
- kl-cruz
5306+
- magp-nordic
5307+
- jaz1-nordic
5308+
- mif1-nordic
5309+
- adamkondraciuk
52885310
files:
52895311
- modules/hal_nordic/
52905312
labels:
@@ -5293,6 +5315,9 @@ West:
52935315
"West project: hal_nuvoton":
52945316
status: maintained
52955317
maintainers:
5318+
- cyliangtw
5319+
- ccli8
5320+
collaborators:
52965321
- ssekar15
52975322
files:
52985323
- modules/Kconfig.nuvoton
@@ -5304,11 +5329,16 @@ West:
53045329
maintainers:
53055330
- dleach02
53065331
- mmahadevan108
5307-
collaborators:
53085332
- decsny
5333+
collaborators:
53095334
- manuargue
53105335
- PetervdPerk-NXP
53115336
- bperseghetti
5337+
- JiafeiPan
5338+
- ZhaoxiangJin
5339+
- EmilioCBen
5340+
- MaochenWang1
5341+
- axelnxp
53125342
files:
53135343
- modules/hal_nxp/
53145344
labels:
@@ -5444,6 +5474,7 @@ West:
54445474
status: maintained
54455475
maintainers:
54465476
- mah-eiSmart
5477+
- wm-eisos
54475478
files:
54485479
- modules/Kconfig.wurthelektronik
54495480

@@ -5759,13 +5790,6 @@ West:
57595790
tests:
57605791
- thrift
57615792

5762-
"West project: tinycrypt":
5763-
status: odd fixes
5764-
files:
5765-
- modules/Kconfig.tinycrypt
5766-
labels:
5767-
- "area: Crypto / RNG"
5768-
57695793
"West project: trusted-firmware-a":
57705794
status: maintained
57715795
maintainers:
@@ -5835,6 +5859,19 @@ West:
58355859
- microbuilder
58365860
files: []
58375861

5862+
Wurth Elektronik Platforms:
5863+
status: maintained
5864+
maintainers:
5865+
- mah-eiSmart
5866+
- wm-eisos
5867+
files:
5868+
- boards/we/
5869+
- dts/arm/we/
5870+
labels:
5871+
- "platform: WE"
5872+
description: >-
5873+
Wurth Elektronik radio modules, development boards, and SoCs.
5874+
58385875
Xen Platform:
58395876
status: maintained
58405877
maintainers:

arch/xtensa/core/gdbstub.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1061,11 +1061,11 @@ void arch_gdb_post_memory_write(uintptr_t addr, size_t len, uint8_t align)
10611061
* the modified memory.
10621062
* 4. Do another ISYNC.
10631063
*/
1064-
arch_dcache_flush_range(addr, len);
1064+
arch_dcache_flush_range((__sparse_force void __sparse_cache *)addr, len);
10651065

10661066
__asm__ volatile("isync; memw");
10671067

1068-
arch_icache_invd_range(addr, len);
1068+
arch_icache_invd_range((__sparse_force void __sparse_cache *)addr, len);
10691069

10701070
__asm__ volatile("isync");
10711071
#endif /* CONFIG_ICACHE && CONFIG_DCACHE */

boards/adi/eval_adin1110ebz/adi_eval_adin1110ebz.dts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -308,7 +308,7 @@ zephyr_udc0: &usbotg_fs {
308308

309309
sram {
310310
bank@0 {
311-
reg = <0x0>;
311+
reg = <STM32_FMC_NORSRAM_BANK1>;
312312
st,control = <STM32_FMC_DATA_ADDRESS_MUX_DISABLE
313313
STM32_FMC_MEMORY_TYPE_SRAM
314314
STM32_FMC_NORSRAM_MEM_BUS_WIDTH_16

boards/adi/max32657evkit/max32657evkit_max32657.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ supported:
1414
- dma
1515
- counter
1616
- pwm
17+
- rtc_counter
1718
- spi
1819
ram: 256
1920
flash: 960

boards/adi/max32657evkit/max32657evkit_max32657_common.dtsi

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,3 +71,8 @@
7171
pinctrl-0 = <&spi0_mosi_p0_2 &spi0_miso_p0_4 &spi0_sck_p0_6 &spi0_ss0_p0_3>;
7272
pinctrl-names = "default";
7373
};
74+
75+
&rtc_counter {
76+
status = "okay";
77+
clock-source = <ADI_MAX32_PRPH_CLK_SRC_INRO>;
78+
};

boards/adi/max32657evkit/max32657evkit_max32657_ns.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ supported:
1313
- dma
1414
- counter
1515
- pwm
16+
- rtc_counter
1617
- spi
1718
ram: 192
1819
flash: 576

boards/beagle/pocketbeagle_2/pocketbeagle_2_am6232_m4-pinctrl.dtsi

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,4 +24,11 @@
2424
/* (E5) MCU_MCAN1_TX.MCU_GPIO0_15 */
2525
pinmux = <K3_PINMUX(0x003c, PIN_INPUT, MUX_MODE_7)>;
2626
};
27+
28+
main_uart0_pins_default: main-uart0-default-pins {
29+
pinmux = <
30+
K3_PINMUX(0x1c8, PIN_INPUT, MUX_MODE_0) /* (D14/A13) UART0_RXD */
31+
K3_PINMUX(0x1cc, PIN_OUTPUT, MUX_MODE_0) /* (E14/E11) UART0_TXD */
32+
>;
33+
};
2734
};
Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
:orphan:
2+
3+
.. espressif-board-variants
4+
5+
Board variants using Snippets
6+
=============================
7+
8+
ESP32 boards can be assembled with different modules using multiple combinations of SPI flash sizes, PSRAM sizes and PSRAM modes.
9+
The snippets under ``snippets/espressif`` provide a modular way to apply these variations at build time without duplicating board definitions.
10+
11+
The following snippet-based variants are supported:
12+
13+
=============== ========================
14+
Snippet name Description
15+
=============== ========================
16+
*Flash memory size*
17+
-----------------------------------------
18+
``flash-4M`` Board with 4MB of flash
19+
``flash-8M`` Board with 8MB of flash
20+
``flash-16M`` Board with 16MB of flash
21+
``flash-32M`` Board with 32MB of flash
22+
--------------- ------------------------
23+
*PSRAM memory size*
24+
-----------------------------------------
25+
``psram-2M`` Board with 2MB of PSRAM
26+
``psram-4M`` Board with 4MB of PSRAM
27+
``psram-8M`` Board with 8MB of PSRAM
28+
--------------- ------------------------
29+
*PSRAM utilization*
30+
-----------------------------------------
31+
``psram-reloc`` Relocate flash to PSRAM
32+
``psram-wifi`` Wi-Fi buffers in PSRAM
33+
=============== ========================
34+
35+
To apply a board variant, use the ``-S`` flag with west build:
36+
37+
.. zephyr-app-commands::
38+
:tool: west
39+
:zephyr-app: samples/hello_world
40+
:board: <esp_board_name_qualifier>
41+
:goals: build
42+
:west-args: -S flash-32M -S psram-4M
43+
:compact:
44+
45+
**Note:** These snippets are applicable to boards with compatible hardware support for the selected flash/PSRAM configuration.

0 commit comments

Comments
 (0)