Upmerge 16.05.2024 #15351
Merged
Upmerge 16.05.2024 #15351
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
github-actions
bot
added
manifest
changelog-entry-required
Test specificationCI/Jenkins/NRF
CI/Jenkins/integration
test-fw-nrfconnect-boot: 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 |
github-actions
bot
added
the
doc-required
rlubos
force-pushed
the
upmerge-16-05-2024
branch
3 times, most recently
from
f6fc4a9
to
f475937
Compare
rlubos
requested review from
frkv,
Vge0rge,
vili-nordic,
SebastianBoe and
mswarowsky
as code owners
rlubos
force-pushed
the
upmerge-16-05-2024
branch
from
0f404fd
to
f475937
Compare
|
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. |
rlubos
force-pushed
the
upmerge-16-05-2024
branch
from
1a969ed
to
f475937
Compare
|
Spotted a BLE VS commands related issue while testing nRF Desktop (BLE TX power set/get returned with unsupported error). Aligned here: rlubos#20 |
rlubos
requested review from
SeppoTakalo,
juhaylinen and
muraliThokala
as code owners
Boot banner must be disabled for nRF2220 and nRF2240 front-end modules to avoid conflicts between TWIM and UART instances on initialization. Signed-off-by: Jędrzej Ciupis <jedrzej.ciupis@nordicsemi.no>
Upstream commit 4760aad changed CPU idle handler from asm to C, so align with that change. Signed-off-by: Robert Lubos <robert.lubos@nordicsemi.no>
Reduce WPA supplicant stack size to accommodate RAM requirements for nRF52840. Signed-off-by: Chaitanya Tata <Chaitanya.Tata@nordicsemi.no>
nRF54L15 has low RAM, so, till we optimize Wi-Fi RAM requirements, temporarily quarantine this twister combination. Signed-off-by: Chaitanya Tata <Chaitanya.Tata@nordicsemi.no>
Change aligns RRAM configuration for nRF54L15 PDK. The application does not use cpuflpr core, so whole memory can be used by cpuapp. Jira: NCSDK-27508 Signed-off-by: Marek Pieta <Marek.Pieta@nordicsemi.no>
OCT-3020 Resolved build issues Signed-off-by: Kristoffer Rist Skøien <kristoffer.skoien@nordicsemi.no>
See comments along the quarantine entries for reasoning. Signed-off-by: Robert Lubos <robert.lubos@nordicsemi.no>
Despite increasing the timeout, sometimes we still see failures in pushing a net management event, so, increase the queue size to fix such scenarios. Fixes SHEL-2773. Signed-off-by: Chaitanya Tata <Chaitanya.Tata@nordicsemi.no>
After some reorganization this file is no longer in use. Signed-off-by: Sebastian Bøe <sebastian.boe@nordicsemi.no>
OCT-3020 Resolved BIS+ACL tester upmerge issues Signed-off-by: Kristoffer Rist Skøien <kristoffer.skoien@nordicsemi.no>
Pylint requires min version 3 to work Signed-off-by: Maciej Perkowski <Maciej.Perkowski@nordicsemi.no> Signed-off-by: Robert Lubos <robert.lubos@nordicsemi.no>
Enable CONFIG_CRC, which is a dependency for mcumgr UART transport. Signed-off-by: Robert Lubos <robert.lubos@nordicsemi.no>
Revision 0.3.0 is now the default revision of nrf54l15pdk/nrf54l15/cpuapp board, hence no longer recognisable by twister if provided explicitly. Update yaml files accordingly to reflect that. Signed-off-by: Robert Lubos <robert.lubos@nordicsemi.no>
The default watchdog instance for nrf54l15 is now wdt31. Signed-off-by: Robert Lubos <robert.lubos@nordicsemi.no>
This needs a revised memory layout for Wi-Fi to easily extend RAM and FLAH, so, on hold for now to unblock upmerge. Fixes SHEL-2777. Signed-off-by: Chaitanya Tata <Chaitanya.Tata@nordicsemi.no>
From the upstream migration guide: The SMF_CREATE_STATE macro now always takes 5 arguments. The amount of arguments is now independent of the values of CONFIG_SMF_ANCESTOR_SUPPORT and CONFIG_SMF_INITIAL_TRANSITION. If the additional arguments are not used, they have to be set to NULL Signed-off-by: Robert Lubos <robert.lubos@nordicsemi.no>
Adjust Kconfigs to match the new set of options and dependencies. Ref: NCSDK-NONE Signed-off-by: Tomasz Chyrowicz <tomasz.chyrowicz@nordicsemi.no>
Disabled NCS boot banner for the sysbuild mcuboot config to decrease the flash usage and fit the assumed partition size. Signed-off-by: Kamil Kasperczyk <kamil.kasperczyk@nordicsemi.no>
Switch to POSIX_API instead. Fix build issues corresponding to this change. Signed-off-by: Robert Lubos <robert.lubos@nordicsemi.no>
Change brings back hci_ipc configuration used for child images to fix build errors on nRF5340 DK. Jira: NCSDK-27508 Signed-off-by: Marek Pieta <Marek.Pieta@nordicsemi.no>
The adv options to automatically add the name in the advertising and scan response data are deprecated. Update the samples that used those options to explicitly include the name in the advertising and scan response data. Signed-off-by: Michał Grochala <michal.grochala@nordicsemi.no> Signed-off-by: Robert Lubos <robert.lubos@nordicsemi.no>
Update upstream Zephyr SHA to ea02b93. Signed-off-by: Robert Lubos <robert.lubos@nordicsemi.no>
GPIOTE cannot be used with LED0 on nrf54l15pdk/nrf54l15/cpuapp in version 0.3.0. Signed-off-by: Robert Lubos <robert.lubos@nordicsemi.no>
rlubos
force-pushed
the
upmerge-16-05-2024
branch
from
2171611
to
cf31f50
Compare
jfischer-no
approved these changes
May 28, 2024
The stack size needs to be increased after the upmerge, as the sample reports stack overflow when printing logs. Signed-off-by: Robert Lubos <robert.lubos@nordicsemi.no>
| @@ -29,6 +29,7 @@ tests: | |||
| extra_configs: | |||
| - CONFIG_NET_TX_STACK_SIZE=3700 | |||
| - CONFIG_NET_RX_STACK_SIZE=3700 | |||
| - CONFIG_WPA_SUPP_THREAD_STACK_SIZE=6144 | |||
There was a problem hiding this comment.
Should this also be applied to a prj.conf somewhere?
There was a problem hiding this comment.
@krish2718 Should it? I guess it'd make sense?
There was a problem hiding this comment.
Ideally yes, but this was mainly a hot fix for nRF52840, I will check if this is applicable to other boards as well and update modules/hostap if its only nRF52840 then will need to add a board specific overlay. Thanks @glarsennordic .
| @@ -798,22 +798,24 @@ static void reset_entry(void *o) | |||
| static const struct smf_state state[] = { | |||
| [STATE_INIT] = SMF_CREATE_STATE(init_entry, | |||
| init_run, | |||
| NULL), | |||
| NULL, NULl, NULl), | |||
There was a problem hiding this comment.
Argh. Sorry. I was reviewing as you merged, just noticed this.
It seems these NULLs have a lower-case L
There was a problem hiding this comment.
How in the world CI didn't catch this... Will fix
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.
Pull upmerged sdk-zephyr and sdk-mcuboot repositories.
test-sdk-nrf: sdk-nrf-pr-15351
test_ble: DRGN-22017_upmerge-16-05-2024
test_rs: KRKNWK-19014-upmerge-20240516
test-sdk-sidewalk: sdk-nrf-pr-15351