Skip to content

Commit

Permalink
Merge branch 'zephyrproject-rtos:main' into new_board_nucleo_g431kb
Browse files Browse the repository at this point in the history
  • Loading branch information
nagelkl authored Sep 16, 2024
2 parents 84763ac + 50b07f9 commit 9208b39
Show file tree
Hide file tree
Showing 3,395 changed files with 64,338 additions and 17,836 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
21 changes: 21 additions & 0 deletions .codechecker.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
# SPDX-License-Identifier: Apache-2.0
#
# Copyright (c) 2024, Basalte bv

analyzer:
# Start by disabling all
- --disable-all

# Enable the sensitive profile
- --enable=sensitive

# Disable unused cases
- --disable=boost
- --disable=mpi

# Many identifiers in zephyr start with _
- --disable=clang-diagnostic-reserved-identifier
- --disable=clang-diagnostic-reserved-macro-identifier

# Cleanup
- --clean
4 changes: 4 additions & 0 deletions .github/workflows/bsim-tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@ on:
- "west.yml"
- "subsys/bluetooth/**"
- "tests/bsim/**"
- "boards/nordic/nrf5*/*dt*"
- "dts/*/nordic/**"
- "tests/bluetooth/common/testlib/**"
- "samples/bluetooth/**"
- "boards/posix/**"
Expand Down Expand Up @@ -98,6 +100,8 @@ jobs:
include/zephyr/arch/posix/
scripts/native_simulator/
tests/bsim/*
boards/nordic/nrf5*/*dt*
dts/*/nordic/
- name: Check if Bluethooth files changed
uses: tj-actions/changed-files@v45
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/compliance.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ jobs:
run: |
pip3 install setuptools
pip3 install wheel
pip3 install python-magic lxml junitparser gitlint pylint pykwalify yamllint clang-format unidiff
pip3 install python-magic lxml junitparser gitlint pylint pykwalify yamllint clang-format unidiff sphinx-lint
pip3 install west
- name: west setup
Expand Down
5 changes: 0 additions & 5 deletions .github/workflows/devicetree_checks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,6 @@ jobs:
matrix:
python-version: ['3.10', '3.11', '3.12']
os: [ubuntu-22.04, macos-14, windows-2022]
exclude:
- os: macos-14
python-version: 3.6
- os: windows-2022
python-version: 3.6
steps:
- name: checkout
uses: actions/checkout@v4
Expand Down
5 changes: 0 additions & 5 deletions .github/workflows/west_cmds.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,6 @@ jobs:
matrix:
python-version: ['3.10', '3.11', '3.12']
os: [ubuntu-22.04, macos-14, windows-2022]
exclude:
- os: macos-14
python-version: 3.6
- os: windows-2022
python-version: 3.6
steps:
- name: checkout
uses: actions/checkout@v4
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -91,4 +91,5 @@ MaintainersFormat.txt
ModulesMaintainers.txt
Nits.txt
Pylint.txt
SphinxLint.txt
YAMLLint.txt
51 changes: 44 additions & 7 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -360,22 +360,59 @@ zephyr_compile_options(
$<$<COMPILE_LANGUAGE:ASM>:-D_ASMLANGUAGE>
)

# @Intent: Set fundamental linker specific flags
toolchain_ld_base()
find_package(Deprecated COMPONENTS toolchain_ld_base)

if(DEFINED TOOLCHAIN_LD_FLAGS)
zephyr_ld_options(${TOOLCHAIN_LD_FLAGS})
endif()

zephyr_link_libraries(PROPERTY base)

zephyr_link_libraries_ifndef(CONFIG_LINKER_USE_RELAX PROPERTY no_relax)

zephyr_link_libraries_ifdef(CONFIG_LINKER_USE_RELAX PROPERTY relax)

# Sort the common symbols and each input section by alignment
# in descending order to minimize padding between these symbols.
zephyr_link_libraries_ifdef(CONFIG_LINKER_SORT_BY_ALIGNMENT PROPERTY sort_alignment)

toolchain_ld_force_undefined_symbols(
_OffsetAbsSyms
_ConfigAbsSyms
)

if(NOT CONFIG_NATIVE_BUILD)
# @Intent: Set linker specific flags for bare metal target
toolchain_ld_baremetal()
find_package(Deprecated COMPONENTS toolchain_ld_baremetal)

zephyr_link_libraries(PROPERTY baremetal)

# Note that some architectures will skip this flag if set to error, even
# though the compiler flag check passes (e.g. ARC and Xtensa). So warning
# should be the default for now.
#
# Skip this for native application as Zephyr only provides
# additions to the host toolchain linker script. The relocation
# sections (.rel*) requires us to override those provided
# by host toolchain. As we can't account for all possible
# combination of compiler and linker on all machines used
# for development, it is better to turn this off.
#
# CONFIG_LINKER_ORPHAN_SECTION_PLACE is to place the orphan sections
# without any warnings or errors, which is the default behavior.
# So there is no need to explicitly set a linker flag.
if(CONFIG_LINKER_ORPHAN_SECTION_WARN)
zephyr_link_libraries(PROPERTY orphan_warning)
elseif(CONFIG_LINKER_ORPHAN_SECTION_ERROR)
zephyr_link_libraries(PROPERTY orphan_error)
endif()
endif()

if(CONFIG_CPP AND NOT CONFIG_MINIMAL_LIBCPP AND NOT CONFIG_NATIVE_LIBRARY)
# @Intent: Set linker specific flags for C++
toolchain_ld_cpp()
if(CONFIG_CPP)
if(NOT CONFIG_MINIMAL_LIBCPP AND NOT CONFIG_NATIVE_LIBRARY)
find_package(Deprecated COMPONENTS toolchain_ld_cpp)
endif()

zephyr_link_libraries(PROPERTY cpp_base)
endif()

# @Intent: Add the basic toolchain warning flags
Expand Down
2 changes: 2 additions & 0 deletions CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -210,6 +210,8 @@
/drivers/ethernet/*adin2111* @GeorgeCGV
/drivers/ethernet/*oa_tc6* @lmajewski
/drivers/ethernet/*lan865x* @lmajewski
/drivers/ethernet/dwc_xgmac @Smale-12048867
/drivers/ethernet/dwc_xgmac/dwc_xgmac @Smale-12048867
/drivers/ethernet/phy/ @rlubos @tbursztyka @arvinf @jukkar
/drivers/ethernet/phy/*adin2111* @GeorgeCGV
/drivers/mdio/*adin2111* @GeorgeCGV
Expand Down
16 changes: 15 additions & 1 deletion Kconfig.zephyr
Original file line number Diff line number Diff line change
Expand Up @@ -260,6 +260,20 @@ config LINKER_USE_PINNED_SECTION
Requires that pinned sections exist in the architecture, SoC,
board or custom linker script.

config LINKER_USE_ONDEMAND_SECTION
bool "Use Evictable Linker Section"
depends on DEMAND_MAPPING
depends on !LINKER_USE_PINNED_SECTION
depends on !ARCH_MAPS_ALL_RAM
help
If enabled, the symbols which may be evicted from memory
will be put into a linker section reserved for on-demand symbols.
During boot, the corresponding memory will be mapped as paged out.
This is conceptually the opposite of CONFIG_LINKER_USE_PINNED_SECTION.

Requires that on-demand sections exist in the architecture, SoC,
board or custom linker script.

config LINKER_GENERIC_SECTIONS_PRESENT_AT_BOOT
bool "Generic sections are present at boot" if DEMAND_PAGING && LINKER_USE_PINNED_SECTION
default y
Expand All @@ -275,7 +289,7 @@ config LINKER_GENERIC_SECTIONS_PRESENT_AT_BOOT

config LINKER_LAST_SECTION_ID
bool "Last section identifier"
default y
default y if !ARM64
depends on ARM || ARM64 || RISCV
help
If enabled, the last section will contain an identifier.
Expand Down
37 changes: 17 additions & 20 deletions MAINTAINERS.yml
Original file line number Diff line number Diff line change
Expand Up @@ -350,8 +350,6 @@ Bluetooth controller:
- subsys/bluetooth/shell/ticker.c
- tests/bluetooth/controller/
- tests/bsim/bluetooth/ll/
- tests/bluetooth/ctrl*/
- tests/bluetooth/ll_settings/
labels:
- "area: Bluetooth Controller"
- "area: Bluetooth"
Expand Down Expand Up @@ -416,8 +414,6 @@ Bluetooth Host:
- subsys/bluetooth/host/iso_internal.h
- tests/bluetooth/audio/
- tests/bluetooth/controller/
- tests/bluetooth/ctrl*/
- tests/bluetooth/ll_settings/
- tests/bluetooth/mesh*/
- tests/bluetooth/qualification/
- tests/bluetooth/tester/
Expand Down Expand Up @@ -994,10 +990,10 @@ Documentation Infrastructure:
status: maintained
maintainers:
- gmarull
- kartben
collaborators:
- carlescufi
- nashif
- kartben
files:
- doc/_*/
- doc/CMakeLists.txt
Expand Down Expand Up @@ -1739,7 +1735,7 @@ Release Notes:
- drivers/led/
- include/zephyr/drivers/led/
- include/zephyr/drivers/led.h
- samples/drivers/led_*/
- samples/drivers/led/
- tests/drivers/led/
- doc/hardware/peripherals/led.rst
- tests/drivers/build_all/led/
Expand Down Expand Up @@ -2088,13 +2084,15 @@ Release Notes:
status: odd fixes
collaborators:
- loicpoulain
- josuah
files:
- drivers/video/
- include/zephyr/drivers/video.h
- include/zephyr/drivers/video-controls.h
- doc/hardware/peripherals/video.rst
- tests/drivers/*/video/
- dts/bindings/video/
- samples/drivers/video/
labels:
- "area: Video"
tests:
Expand Down Expand Up @@ -2319,7 +2317,7 @@ Google Platforms:
- duda-patryk
files:
- boards/google/
- samples/boards/google_*/
- samples/boards/google/

Hash Utilities:
status: maintained
Expand Down Expand Up @@ -2718,8 +2716,6 @@ hawkBit:
status: maintained
maintainers:
- maass-hamburg
collaborators:
- ycsin
files:
- subsys/mgmt/hawkbit/
- include/zephyr/mgmt/hawkbit.h
Expand Down Expand Up @@ -2805,7 +2801,6 @@ Networking:
- samples/net/lwm2m_client/
- samples/net/wifi/
- samples/net/dhcpv4_client/
- subsys/net/buf*.c
- subsys/net/l2/ethernet/gptp/
- subsys/net/l2/ieee802154/
- subsys/net/l2/wifi/
Expand Down Expand Up @@ -2838,7 +2833,7 @@ Networking:
tests:
- net.socket

"Networking: Buffers":
"Networking Buffers":
status: maintained
maintainers:
- jhedberg
Expand All @@ -2847,13 +2842,15 @@ Networking:
- tbursztyka
- jukkar
files:
- doc/services/net_buf/
- include/zephyr/net/buf.h
- subsys/net/buf*.c
- tests/net/buf/
- include/zephyr/net_buf.h
- lib/net_buf/
- tests/lib/net_buf/
labels:
- "area: Networking Buffers"
tests:
- net.buf
- libraries.net_buf

"Networking: Connection Manager":
status: maintained
Expand Down Expand Up @@ -3570,7 +3567,7 @@ Intel Platforms (Xtensa):
- soc/intel/intel_adsp/
- dts/xtensa/intel/
- tests/boards/intel_adsp/
- samples/boards/intel_adsp/
- samples/boards/intel/adsp/
- dts/bindings/*/intel,adsp*
- scripts/west_commands/runners/intel_adsp.py
labels:
Expand Down Expand Up @@ -3696,7 +3693,7 @@ NXP Platforms (S32):
- drivers/misc/*nxp_s32*/
- dts/bindings/*/nxp,s32*
- dts/arm/nxp/*s32*
- samples/boards/nxp_s32/
- samples/boards/nxp/s32/
- include/zephyr/dt-bindings/*/nxp-s32*
- include/zephyr/dt-bindings/*/nxp_s32*
- include/zephyr/drivers/*/*nxp_s32*
Expand Down Expand Up @@ -3803,7 +3800,7 @@ nRF Platforms:
- drivers/*/*nrf*.c
- drivers/*/*nordic*/
- soc/nordic/
- samples/boards/nrf/
- samples/boards/nordic/
- dts/*/nordic/
- dts/bindings/*/nordic,*
- tests/drivers/*/*nrf*/
Expand Down Expand Up @@ -3928,7 +3925,7 @@ STM32 Platforms:
- dts/arm/st/
- dts/bindings/*/*stm32*
- soc/st/stm32/
- samples/boards/stm32/
- samples/boards/st/
labels:
- "platform: STM32"
description: >-
Expand All @@ -3952,7 +3949,7 @@ Espressif Platforms:
- dts/xtensa/espressif/
- dts/riscv/espressif/
- dts/bindings/*/*esp32*
- samples/boards/esp32*/
- samples/boards/espressif/
- tests/boards/espressif_esp32/
- drivers/*/*esp32*/
labels:
Expand Down Expand Up @@ -4078,7 +4075,7 @@ LiteX Platforms:
- dts/bindings/*/litex*
- dts/riscv/riscv32-litex-vexriscv.dtsi
- include/zephyr/drivers/*/*litex*
- samples/boards/litex/
- samples/boards/enjoydigital/litex/
- samples/drivers/*litex/
- soc/litex/
labels:
Expand Down
2 changes: 2 additions & 0 deletions arch/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,8 @@ config ARM64
select IRQ_OFFLOAD_NESTED if IRQ_OFFLOAD
select BARRIER_OPERATIONS_ARCH
select ARCH_HAS_DIRECTED_IPIS
select ARCH_HAS_DEMAND_PAGING
select ARCH_HAS_DEMAND_MAPPING
help
ARM64 (AArch64) architecture

Expand Down
4 changes: 3 additions & 1 deletion arch/arc/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -374,7 +374,9 @@ config ARC_EXCEPTION_STACK_SIZE
endmenu

config ARC_EARLY_SOC_INIT
bool "Make early stage SoC-specific initialization"
bool "Make early stage SoC-specific initialization [DEPRECATED]"
select SOC_RESET_HOOK
select DEPRECATED
help
Call SoC per-core setup code on early stage initialization
(before C runtime initialization). Setup code is called in form of
Expand Down
5 changes: 5 additions & 0 deletions arch/arc/core/prep_c.c
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
#include <zephyr/arch/arc/cluster.h>
#include <zephyr/kernel_structs.h>
#include <kernel_internal.h>
#include <zephyr/platform/hooks.h>

/* XXX - keep for future use in full-featured cache APIs */
#if 0
Expand Down Expand Up @@ -121,6 +122,10 @@ extern FUNC_NORETURN void z_cstart(void);

void z_prep_c(void)
{
#if defined(CONFIG_SOC_PREP_HOOK)
soc_prep_hook();
#endif

#ifdef CONFIG_ISA_ARCV3
arc_cluster_scm_enable();
#endif
Expand Down
Loading

0 comments on commit 9208b39

Please sign in to comment.