Skip to content

Commit 15a3eec

Browse files
authored
Merge branch 'zephyrproject-rtos:main' into main
2 parents 93337b1 + 3af17bf commit 15a3eec

File tree

526 files changed

+7767
-3036
lines changed

Some content is hidden

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

526 files changed

+7767
-3036
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,7 @@ BoardYml.txt
9595
Checkpatch.txt
9696
ClangFormat.txt
9797
DevicetreeBindings.txt
98+
DevicetreeLinting.txt
9899
GitDiffCheck.txt
99100
Gitlint.txt
100101
Identity.txt

.ruff-excludes.toml

Lines changed: 10 additions & 81 deletions
Large diffs are not rendered by default.

CMakeLists.txt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -409,7 +409,7 @@ if(CONFIG_COMPILER_FREESTANDING)
409409
zephyr_compile_options($<$<COMPILE_LANGUAGE:ASM>:$<TARGET_PROPERTY:compiler,freestanding>>)
410410
endif()
411411

412-
if (CONFIG_PICOLIBC AND NOT CONFIG_PICOLIBC_IO_FLOAT)
412+
if(CONFIG_PICOLIBC AND NOT CONFIG_PICOLIBC_IO_FLOAT)
413413
# @Intent: Set compiler specific flag to disable printf-related optimizations
414414
zephyr_compile_options($<$<COMPILE_LANGUAGE:C>:$<TARGET_PROPERTY:compiler,no_printf_return_value>>)
415415
endif()
@@ -1157,7 +1157,7 @@ endif()
11571157

11581158
get_property(OUTPUT_FORMAT GLOBAL PROPERTY PROPERTY_OUTPUT_FORMAT)
11591159

1160-
if (CONFIG_CODE_DATA_RELOCATION)
1160+
if(CONFIG_CODE_DATA_RELOCATION)
11611161
set(CODE_RELOCATION_DEP code_relocation_source_lib)
11621162
endif() # CONFIG_CODE_DATA_RELOCATION
11631163

@@ -2134,7 +2134,7 @@ if(CONFIG_BUILD_OUTPUT_INFO_HEADER)
21342134
)
21352135
endif()
21362136

2137-
if (CONFIG_LLEXT AND CONFIG_LLEXT_EXPORT_BUILTINS_BY_SLID)
2137+
if(CONFIG_LLEXT AND CONFIG_LLEXT_EXPORT_BUILTINS_BY_SLID)
21382138
#slidgen must be the first post-build command to be executed
21392139
#on the Zephyr ELF to ensure that all other commands, such as
21402140
#binary file generation, are operating on a preparated ELF.
@@ -2200,7 +2200,7 @@ if(signing_script)
22002200
endif()
22012201

22022202
# Generate USB-C VIF policies in XML format
2203-
if (CONFIG_BUILD_OUTPUT_VIF)
2203+
if(CONFIG_BUILD_OUTPUT_VIF)
22042204
include(${CMAKE_CURRENT_LIST_DIR}/cmake/vif.cmake)
22052205
endif()
22062206

@@ -2251,7 +2251,7 @@ if(LOG_DICT_DB_NAME_ARG)
22512251
--build-header ${PROJECT_BINARY_DIR}/include/generated/zephyr/version.h
22522252
)
22532253

2254-
if (NOT CONFIG_LOG_DICTIONARY_DB_TARGET)
2254+
if(NOT CONFIG_LOG_DICTIONARY_DB_TARGET)
22552255
# If not using a separate target for generating logging dictionary
22562256
# database, add the generation to post build command to make sure
22572257
# the database is actually being generated.

MAINTAINERS.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -762,6 +762,8 @@ Build system:
762762
- scripts/schemas/soc-schema.yaml
763763
- scripts/list_shields.py
764764
- scripts/snippets.py
765+
files-exclude:
766+
- doc/build/dts/
765767
labels:
766768
- "area: Build System"
767769
tests:
@@ -4306,6 +4308,11 @@ Realtek EC Platforms:
43064308
status: maintained
43074309
maintainers:
43084310
- JasonLin-RealTek
4311+
collaborators:
4312+
- elmo9999
4313+
- benson0715
4314+
- JhanBoChao-Realtek
4315+
- Titan-Realtek
43094316
files:
43104317
- boards/realtek/
43114318
- drivers/*/*rts5912*

VERSION

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
VERSION_MAJOR = 4
2-
VERSION_MINOR = 2
3-
PATCHLEVEL = 99
2+
VERSION_MINOR = 3
3+
PATCHLEVEL = 0
44
VERSION_TWEAK = 0
5-
EXTRAVERSION =
5+
EXTRAVERSION = rc1

arch/arm/core/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ add_subdirectory_ifdef(CONFIG_ARM_AARCH32_MMU mmu)
2727
add_subdirectory_ifdef(CONFIG_CPU_AARCH32_CORTEX_R cortex_a_r)
2828
add_subdirectory_ifdef(CONFIG_CPU_AARCH32_CORTEX_A cortex_a_r)
2929

30-
if (CONFIG_ARM_ZIMAGE_HEADER)
30+
if(CONFIG_ARM_ZIMAGE_HEADER)
3131
zephyr_linker_sources(ROM_START SORT_KEY 0x0vectors zimage_header.ld)
3232
zephyr_linker_sources(ROM_START SORT_KEY 0x1vectors vector_table.ld)
3333
zephyr_linker_sources(ROM_START SORT_KEY 0x2vectors cortex_m/vector_table_pad.ld)

arch/arm/core/cortex_m/CMakeLists.txt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -49,13 +49,13 @@ if(CONFIG_NULL_POINTER_EXCEPTION_DETECTION_DWT)
4949
endif()
5050

5151
if(CONFIG_CORTEX_M_DWT)
52-
if (CONFIG_TIMING_FUNCTIONS)
52+
if(CONFIG_TIMING_FUNCTIONS)
5353
zephyr_library_sources(timing.c)
5454
endif()
5555
endif()
5656

57-
if (CONFIG_SW_VECTOR_RELAY)
58-
if (CONFIG_CPU_CORTEX_M_HAS_VTOR)
57+
if(CONFIG_SW_VECTOR_RELAY)
58+
if(CONFIG_CPU_CORTEX_M_HAS_VTOR)
5959
set(relay_vector_table_sort_key relay_vectors)
6060
else()
6161
# Using 0x0 prefix will result in placing the relay vector table section
@@ -72,14 +72,14 @@ zephyr_linker_sources(
7272
)
7373
endif()
7474

75-
if (CONFIG_SW_VECTOR_RELAY OR CONFIG_SW_VECTOR_RELAY_CLIENT)
75+
if(CONFIG_SW_VECTOR_RELAY OR CONFIG_SW_VECTOR_RELAY_CLIENT)
7676
zephyr_linker_sources(
7777
RAM_SECTIONS
7878
vt_pointer_section.ld
7979
)
8080
endif()
8181

82-
if (CONFIG_CPU_CORTEX_M_HAS_VTOR)
82+
if(CONFIG_CPU_CORTEX_M_HAS_VTOR)
8383
zephyr_linker_sources_ifdef(CONFIG_SRAM_VECTOR_TABLE
8484
RAM_SECTIONS
8585
# Maybe need to be changed in order to be placed at the beginning of RAM

arch/arm/core/mpu/CMakeLists.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@ if(CONFIG_CPU_CORTEX_M AND NOT CONFIG_CPU_HAS_CUSTOM_FIXED_SOC_MPU_REGIONS)
1111
zephyr_library_sources_ifdef(CONFIG_CPU_HAS_NXP_SYSMPU nxp_mpu_regions.c)
1212
endif()
1313

14-
if (CONFIG_CPU_AARCH32_CORTEX_R)
14+
if(CONFIG_CPU_AARCH32_CORTEX_R)
1515
zephyr_library_include_directories(cortex_a_r)
16-
elseif (CONFIG_CPU_CORTEX_M)
16+
elseif(CONFIG_CPU_CORTEX_M)
1717
zephyr_library_include_directories(cortex_m)
18-
else ()
18+
else()
1919
message(FATAL_ERROR "CPU is not Cortex-A/R/M")
20-
endif ()
20+
endif()

arch/arm64/core/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,9 @@ zephyr_library_sources_ifdef(CONFIG_HAS_ARM_SMCCC smccc-call.S)
4141
zephyr_library_sources_ifdef(CONFIG_AARCH64_IMAGE_HEADER header.S)
4242
zephyr_library_sources_ifdef(CONFIG_SEMIHOST semihost.c)
4343
zephyr_library_sources_ifdef(CONFIG_DEBUG_COREDUMP coredump.c)
44-
if ((CONFIG_MP_MAX_NUM_CPUS GREATER 1) OR (CONFIG_SMP))
44+
if((CONFIG_MP_MAX_NUM_CPUS GREATER 1) OR (CONFIG_SMP))
4545
zephyr_library_sources(smp.c)
46-
endif ()
46+
endif()
4747

4848
zephyr_cc_option_ifdef(CONFIG_USERSPACE -mno-outline-atomics)
4949
zephyr_cc_option_ifdef(CONFIG_FRAME_POINTER -mno-omit-leaf-frame-pointer)

arch/common/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ zephyr_linker_sources_ifdef(CONFIG_NOCACHE_MEMORY
8686
nocache.ld
8787
)
8888

89-
if (DEFINED CONFIG_ARCH_SUPPORTS_ROM_OFFSET)
89+
if(DEFINED CONFIG_ARCH_SUPPORTS_ROM_OFFSET)
9090
# Exclamation mark is printable character with lowest number in ASCII table.
9191
# We are sure that this file will be included as a first.
9292
zephyr_linker_sources(ROM_START SORT_KEY ! rom_start_address.ld)
@@ -101,7 +101,7 @@ endif()
101101

102102
# isr_tables is a normal CMake library and not a zephyr_library because it
103103
# should not be --whole-archive'd
104-
if (CONFIG_GEN_ISR_TABLES)
104+
if(CONFIG_GEN_ISR_TABLES)
105105
add_library(isr_tables
106106
isr_tables.c
107107
)

0 commit comments

Comments
 (0)