Upmerge 2023.04.17 #10876
Merged
Upmerge 2023.04.17 #10876
Conversation
This file contains hidden or 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
github-actions
bot
added
changelog-entry-required
Contributor
Contributor
Test specificationCI/Jenkins/NRF
CI/Jenkins/integration
test-ci-nrfconnect-boot-fw-update: added because there was no .github/test-spec.yml in 'mcuboot' Detailed information of selected test modules Note: This message is automatically posted and updated by the CI |
Contributor
|
You can find the documentation preview for this PR at this link. It will be updated about 10 minutes after the documentation build succeeds. Note: This comment is automatically posted by the Documentation Publishing GitHub Action. |
mbolivar-nordic
requested review from
KAGA164,
MarekPieta,
MirkoCovizzi,
SebastianBoe,
SeppoTakalo,
hakonfam,
jarlamsa,
jheiskan81,
joerchan,
jtguggedal,
juhaylinen,
kapi-no,
ludvigsj,
magnev,
maxd-nordic,
nordic-krch,
rakons,
simensrostad and
torsteingrindvik
as code owners
The old API bt_set_oob_data_flag was replaced by 2 new functions: bt_le_oob_set_legacy_flag and bt_le_oob_set_sc_flag. Signed-off-by: Michał Grochala <[email protected]>
This patch makes the sensor_trigger structs static since they are not stored in the driver anymore. Signed-off-by: Maximilian Deubel <[email protected]>
The API for an offloaded net device has changed from net_if_api to offloaded_if_api, which introduced an `enable` function pointer. Give that the API structure was passed to a macro, no parameter checking guaranteed that the type was correct. Eventually the networking subsystem would call enable(), which being uninitialized resulted in a MPU fault. Signed-off-by: Emanuele Di Santo <[email protected]>
Removed settings the LOG_DEFAULT_LEVEL to error, when NCS_SAMPLE_DEFAULTS config is enabled. It is related to the change in Zephyr that started to use LOG_DEFAULT_LEVEL for setting the default log level of every created log module. The impact was that log level for multiple applications changed from INF to ERR and CI tests failed. Additionally aligned the configuration of applications that CI tests were affected by this change. Signed-off-by: Kamil Kasperczyk <[email protected]> Co-authored-by: Marek Pieta <[email protected]>
Gazell does not use a TIMER instance that is enabled in devicetree. It adheres to the changed timer resource protection semantics. Signed-off-by: Bernard Lee <[email protected]>
After moving counter driver configuration to the devicetree timer nodes shall not be enabled if not used. Cleaning up board dts files. Signed-off-by: Krzysztof Chruscinski <[email protected]>
Align to changes in counter driver configuration (from Kconfig to devicetree). Signed-off-by: Krzysztof Chruscinski <[email protected]>
Kconfig option was removed and it must be replaced with device tree node status check. Signed-off-by: Krzysztof Chruscinski <[email protected]>
Align application to change in counter driver configuration. Signed-off-by: Krzysztof Chruscinski <[email protected]>
Counter is now controlled by the device tree and it must be enabled in the sample. Signed-off-by: Krzysztof Chruscinski <[email protected]>
Counter is now controlled by the device tree and it must be enabled in the sample. Signed-off-by: Krzysztof Chruscinski <[email protected]>
Counter is now controlled by the device tree and it must be enabled in the sample. Signed-off-by: Krzysztof Chruscinski <[email protected]> Signed-off-by: Sebastian Draus <[email protected]>
Counter is now controlled by the device tree and it must be enabled in the sample. Signed-off-by: Krzysztof Chruscinski <[email protected]>
Align sample to change in counter driver configuration. Signed-off-by: Krzysztof Chruscinski <[email protected]>
Align test to changes in the counter driver (transition to DT configuration. Signed-off-by: Krzysztof Chruscinski <[email protected]>
Align to configuration counter change (Kconfig to devicetree). Signed-off-by: Krzysztof Chruscinski <[email protected]>
Align test to change in counter driver configuration. Signed-off-by: Krzysztof Chruscinski <[email protected]>
Align test to change in counter driver configuration. Signed-off-by: Krzysztof Chruscinski <[email protected]>
Align to change in counter configuration (from Kconfig to devicetree). Signed-off-by: Krzysztof Chruscinski <[email protected]>
Adapt sample to changes in counter driver configuration which is now done through the devicetree. Signed-off-by: Krzysztof Chruscinski <[email protected]>
Counter configuration is moved fully to DT and HAS_HW_NRF_TIMERx cannot longer be used to determine if given TIMER instance is present. Switching to check if not has timer compat. Signed-off-by: Krzysztof Chruscinski <[email protected]>
Adapt to the changes in counter - use device tree instead of Kconfig for Timer instances. Signed-off-by: Michał Grochala <[email protected]>
Fixed an array overflow in iperf3. Signed-off-by: Tommi Kangas <[email protected]>
The latest zephyr upmerge has made the absence of this file a hard error. Signed-off-by: Martí Bolívar <[email protected]>
- Start to use CONFIG_BT_AUDIO_RX/TX - Some renaming and API changes Signed-off-by: Alexander Svensen <[email protected]>
carlescufi
force-pushed
the
upmerge-2023.04.17
branch
from
69c0090 to
6436c1a
Compare
rick1082
approved these changes
May 3, 2023
Contributor
|
Merging with all checks passing on current or previous runs. All GH Actions passing and twister too in this run. |
ktaborowski
added a commit
to nrfconnect/sdk-sidewalk
that referenced
this pull request
May 9, 2023
[KRKNWK-16741] nrfconnect/sdk-nrf#10876 * main always return int * Fix current cosumption nrfconnect/sdk-nrf#10930 * Add PSA config after crypto driver update Signed-off-by: ktaborowski <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
29 participants
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.
Regularly scheduled upmerge. Status of handling breaking changes from zephyr (owners are
@-mentioned where appropriate):Quarantined
void main(void)toint main(void): Switch return type of main from 'void' to 'int' zephyrproject-rtos/zephyr#54628int callback(void)fromint callback(const struct device*)init: remove the need for a dummy device pointer in SYS_INIT functions zephyrproject-rtos/zephyr#51217Other breaking changes:
CONFIG_COUNTER_TIMERx(and other counter related symbols) in drivers: counter: Adapt to use device tree zephyrproject-rtos/zephyr#55898CONFIG_OPENTHREAD_CHILD_SUPERVISION: removed module: openthread: align OT_DNS_UPSTREAM_QUERY configs with upstream zephyrproject-rtos/zephyr#55935struct wifi_twt_params:twt_interval_mschanged units to microseconds and was renamedtwt_interval,twt_wake_interval_mschanged units to microseconds and was renamedtwt_wake_intervalnet: wifi: Use micro seconds for precision for TWT intervals zephyrproject-rtos/zephyr#55796struct bt_bap_unicast_server_cb: callback signatures gained an extrarspparameter LE Audio: Fix ASCS/SR/SPE/BI- (07/08/09) -C test cases zephyrproject-rtos/zephyr#54894struct bt_bap_stream_ops: new Kconfig options controlling structure member visibility are breaking the build in nrf5340_audio Bluetooth: audio: Introduce helper BT_AUDIO_RX(TX) flags zephyrproject-rtos/zephyr#56464bt_set_oob_data_flag: removed and replaced with eitherbt_le_oob_set_sc_flagorbt_le_oob_set_legacy_flagBluetooth: pairing: OOB: Separate LE SC OOB from legacy OOB logic zephyrproject-rtos/zephyr#50518BT_AUDIO_LC3_PRESETrenamed toBT_BAP_LC3_PRESETBluetooth: Audio: Rename BT_AUDIO_LC3_PRESET to BT_BAP... zephyrproject-rtos/zephyr#55704lwm2m_send: deprecated, causing build errors net: lwm2m: add callback for send confirmation zephyrproject-rtos/zephyr#53235z_NmiHandlerSet: renamed toz_arm_nmi_set_handlerarch: arm: NMI cleanup (NMI_INIT, set_handler) zephyrproject-rtos/zephyr#56708 (this breaks memfault-firmware-sdk; issue: zephyr: z_NmiHandlerSet used in port is gone memfault/memfault-firmware-sdk#49)CONFIG_BT_LL_SW_LLCP: removed Bluetooth: controller: remove legacy LLCP code zephyrproject-rtos/zephyr#53896ceiling_fraction: deprecated in favor ofDIV_ROUND_UPsys: util: s/ceiling_fraction/DIV_ROUND_UP zephyrproject-rtos/zephyr#52488void main(void)is nowint main(void)SYS_INIT()takes anint callback(void)instead of anint callback(const struct device*)CONFIG_BT_DEBUG: removed Bluetooth: Logging: RemoveBT_DEBUGzephyrproject-rtos/zephyr#56321test-sdk-nrf: testing-upmerge-2023-04-17