Batch merge 2.9.0 #2339
Merged
Batch merge 2.9.0 #2339
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…rgument" This reverts commit 18ba09b. Signed-off-by: Torsten Rasmussen <[email protected]>
…g SVD file used." This reverts commit 5767e2e. Signed-off-by: Torsten Rasmussen <[email protected]>
This reverts commit 94604d6. Signed-off-by: Torsten Rasmussen <[email protected]>
Switch to released version with all of the Zephyr build fixes Signed-off-by: Keith Packard <[email protected]> (cherry picked from commit d5b6539)
…d final build Currently, the linker that is used when performing various cmake checks (check_c_compiler_flag, for example) may be different than the linker that will be used during the actual build. This happens as we currently specify '-fuse-ld' to force the appropriate linker a) after many such checks have already happened and b) in a way which is not automatically propagated to check_c_compiler_flag (and friends). As a result, the toolchain's default linker will generally be used for such checks regardless of which linker was selected in Zephyr. This can lead to a number of surprises when building Zephyr, particularly when building with clang. For example: - If the linker is misconfigured, where the build will fail can vary depending on whether the linker is the toolchain's default. When the configured linker happens to be the toolchain's default, the build (helpfully) fails quickly on the checks for a basic working toochain. When the configured linker isn't the default, the build won't fail until the final link steps. - The build can fail due to issues with a linker other than the one configured by the user in Zephyr. For example, LLVM toolchains without lld will generally fail to build Zephyr (the checks for a basic working toochain will fail) for targets where lld is the default in LLVM even if GNU ld is configured in Zephyr and would otherwise be used in the final build. - Flags which are only added if check_c_compiler_flag (or similar) succeeds may be unexpectedly omitted during the final build if the flag is supported in the configured linker but is unsupported in the toolchain's default linker (as check_c_compiler_flag will test using the default one). Note that this isn't limited to clang--even when we are building with Zephyr's SDK and force ld.bfd, we seem to use the 'ld' variant during the cmake checks (though this generally seems fairly harmless compared to mixing ld/lld or other proprietary linkers). To fix this, ensure the appropriate 'fuse-ld' is set early enough and in such a way that the same linker will be used throughout the entire build. Signed-off-by: Jonathon Penix <[email protected]> Signed-off-by: Torsten Rasmussen <[email protected]> (cherry picked from commit 9fe6c5e)
Zephyr is a bare metal build where standard libs are disabled. This means that c and runtime libraries must manually be linked in. This has generally been handled by using CMake's link libraries handling but the issue with that is both de-duplication but also library link order. Standard libraries must be linked at last location to ensure symbols are always available, however this is not optimal with target_link_libraries() because this would ultimately require every library to know the c library to link with, which is not desired. Therefore, setup standard C and runtime library linking in linker CMake files for toolchains where this is required. This commit expands the principle introduced with toolchain abstraction, see PR#24851. This means that a toolchain implementation may specify standard C, runtime, C++, etc libraries, as well as their link order. Because a property approach is used, then Zephyr modules, such as the Picolibc module can adjust such properties. An optional `zephyr_linker_finalize()` macro is called at the end of Zephyr's CMakeList process and can be used by the toolchain implementation to define the final linker invocation. This aligns the linker handling flow to the principle introduced in PR#24851 and improves the flexibility and robustness of Zephyr build system. Signed-off-by: Torsten Rasmussen <[email protected]> (cherry picked from commit 2e3873a)
…nk libraries Extend zephyr_link_libraries to allow an optional value together with the `zephyr_link_libraries(PROPERTY <property> [<value>])`. This allow setting linker property combined with a value when linking Zephyr. The value will only be applied if the property is defined. Extend zephyr_compile_options to support the same PROPERTY flag that has been introduced for zephyr_link_libraries(). This remove the need for developers to write complex generator expressions for compiler flags and thus minimizes mistakes. The following syntax is now supported in addition to the existing syntax: `zephyr_compile_options(PROPERTY <property> [<value>])` Signed-off-by: Torsten Rasmussen <[email protected]> (cherry picked from commit 718b726)
The `check_set_linker_property()` and `set_linker_property()` takes a target argument. Make the target argument optional and use the target `linker` as default target. The function name `set_linker_property()` already implies that we are setting a property and the linker target. Remove the need to specify `TARGET linker` when using the default linker property target. Signed-off-by: Torsten Rasmussen <[email protected]> (cherry picked from commit 102b3fc)
…in properties Moving specs argument to compiler and linker properties so that the compiler and linker in use can decide how the flags are mapped / handled for the compiler and linker in use. This avoids specifying `--specs=spec.picolibc` for clang which prints a warning about an unused argument. Signed-off-by: Torsten Rasmussen <[email protected]> (cherry picked from commit 9d835fe)
… property This commit updates picolibc module to remove the need for hard-coding linking with `-lgcc`. Instead it sets the c_library linker property and thereby allows the Zephyr toolchain infrastructure to properly handle the linking of C and runtime libraries. Signed-off-by: Torsten Rasmussen <[email protected]> (cherry picked from commit b2eeef4)
Newlib or Picolibc libraries for LLVM may be compiled or installed from pre-built sources independently of LLVM itself. This means that always indicating that TOOLCHAIN_HAS_NEWLIB=OFF and TOOLCHAIN_HAS_PICOLIBC=OFF are wrong. But it could be just as wrong to always indicate suport for newlib or picolibc. Some pre-built LLVM toolchains are provided with default picolibc support, such as LLVM for Arm embedded, but can also be used with newlib be installing newlib add-on package. Unfortunately it's not possible to query LLVM regarding newlib or picolibc support. Developers have the option of `-DTOOLCHAIN_HAS_<NEWLIB|PICOLIBC>=ON`, but this is not widely known and cumbersome to do for each build. An indication of newlib or picolibc support is the presence of library specific headers, so to improve current situation we check for library specific headers, and if those are present we assume support for the library. This commit improves the current support for LLVM in Zephyr when cross-compiling, especially for users of LLVM for Arm embedded. Signed-off-by: Torsten Rasmussen <[email protected]> (cherry picked from commit 0274bcb)
Store informations regarding the current Zephyr build. The following informations are stored during CMake configure: - Board information - Application source directory - Application configuration directory - Toolchain information - Devicetree files - Kconfig config files - Zephyr version Signed-off-by: Torsten Rasmussen <[email protected]> (cherry picked from commit 09faf53)
…le used. Save information regarding SVD file in use in vendor-specific section of the build info file. Information is stored under Nordic section. Signed-off-by: Torsten Rasmussen <[email protected]> (cherry picked from commit 46a3e61)
Update build_info() calls to use `PATH` argument when values passed to `build_info()` are user specified and thereby might use native path separator, such as a single `\`. Signed-off-by: Torsten Rasmussen <[email protected]> (cherry picked from commit 2c1eae2)
…specific gap fill Deprecate BUILD_NO_GAP_FILL as it gives a false impression that gap filling can be disabled in binary files. Binary files are always gap filled due to the fact they contain no address information. Only option for binary files is to control the gap fill pattern. When no gap fill is enabled in binary files, then a default pattern is used by the tool, which usually is 0x00. Generally the pattern 0x00 leads to unnecessary flash writes, as a flash generally contains 0xFF after an erase. Therefore provide a gap fill pattern Kconfig setting instead, with default value of 0xFF. For hex-files, intel hex and s19, then gap filling is generally not needed but in order to still support cases where gap filling is required then this commit introduces BUILD_OUTPUT_HEX_GAP_FILL and BUILD_OUTPUT_S19_GAP_FILL. Both settings are disabled per default. Signed-off-by: Torsten Rasmussen <[email protected]> (cherry picked from commit 2e8868c)
The llvm-objcopy doesn't support a gap-fill argument, therefore clear the property to remove the error: > llvm-objcopy: error: unknown argument '--gap-fill' Signed-off-by: Torsten Rasmussen <[email protected]> (cherry picked from commit 71fd4d9)
fixup! [nrf noup] sample/smp_svr: nrf54l15dk test cases adds nrf54l10 and nrf54l05 to samples. Signed-off-by: Mateusz Michalek <[email protected]>
…0 bus lib The nrf wifi drivers include code related to qspi/spi bus. This work moves bus related files to a new nrf70 bus library which is now independent of the core driver and facilitlates building applications directly using the bus APIs, agnostic to enabling wifi configs. Upstream PR #: 82372 Signed-off-by: Bansidhar P.M <[email protected]>
Add ztests for nrf70 bus lib to help validate functional integrity of the QPSI/SPI interface to nRF70 device via appropriate reads/writes from host processor to relevant memory blocks of nrf70 device. Note that this will NOT serve as a memory test for nrf70 device, rather just a functional verification of the wiring between the host processor and the nrf70 device. Upstream PR #: 82372 Signed-off-by: Bansidhar P.M <[email protected]>
…nnect This fixes an issue that occurred if deferred_work is queued by another procedure before we run bt_conn_set_state(BT_CONN_DISCONNECTED). bt_conn_set_state yields to the system work queue in bt_conn_tx_notify, and then deferred_work runs and handles the disconnected callbacks. bt_conn_set_state then enqueues another deferred_work which calls the disconnected callbacks again and causes an assert. k_work_cancel_delayable will clear queued deferred work when we call bt_conn_set_state(BT_CONN_DISCONNECTED), guaranteeing that the disconnect callbacks will only be called once. Upstream PR #: 82543 Signed-off-by: Timothy Keys <[email protected]>
|
The following west manifest projects have been modified in this Pull Request:
Note: This message is automatically posted and updated by the Manifest GitHub Action. |
…presence Common symbol is defined by SoCs that support RAM control helper. Upstream PR #: 82262 Signed-off-by: Nikodem Kastelik <[email protected]>
…icit Updated retained_mem driver variant exposes vendor-specific API, rather than executing implicitly during boot. Upstream PR #: 82262 Signed-off-by: Nikodem Kastelik <[email protected]>
RAM retention is disabled for all RAM blocks before entering System OFF to achieve lowest power consumption. RAM retention can still be enabled using retained_mem driver. Upstream PR #: 82262 Signed-off-by: Nikodem Kastelik <[email protected]>
…argets Using bare-metal approach for retention configuration is no longer compatible with sys_poweroff() implementation. Upstream PR #: 82262 Signed-off-by: Nikodem Kastelik <[email protected]>
carlescufi
added a commit
to carlescufi/sdk-nrf
that referenced
this pull request
Dec 4, 2024
Point to a batch merge: nrfconnect/sdk-zephyr#2339 Signed-off-by: Carles Cufi <[email protected]>
carlescufi
added a commit
to carlescufi/sdk-nrf
that referenced
this pull request
Dec 4, 2024
Point to a batch merge: nrfconnect/sdk-zephyr#2339 Signed-off-by: Carles Cufi <[email protected]>
This was referenced Dec 4, 2024
carlescufi
added a commit
to nrfconnect/sdk-nrf
that referenced
this pull request
Dec 5, 2024
Point to a batch merge: nrfconnect/sdk-zephyr#2339 Signed-off-by: Carles Cufi <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Contains:
#2313
#2322
#2333
#2336
#2337