Skip to content

Conversation

nordic-segl
Copy link
Contributor

@nordic-segl nordic-segl commented Sep 19, 2025

Please completely ignore this PR

jukkar and others added 30 commits September 18, 2025 21:08
Regular upmerge.

Signed-off-by: Jukka Rissanen <[email protected]>
Use HAS_BT_CTLR instead of the deprecated BT_CTLR.

Relates to zephyrproject-rtos/zephyr#94287

Signed-off-by: Vinayak Kariappa Chettimada <[email protected]>
In Zephyr the current USB driver used in CLI and coprocessor
samples has been deprecated, and we need to switch to the new
usbd one.

Signed-off-by: Arkadiusz Balys <[email protected]>
The state_execution() function signature changed.

Signed-off-by: Robert Lubos <[email protected]>
We need to provide some alignments to the Coprocessor sample after
switching to the new USB stack.

Signed-off-by: Arkadiusz Balys <[email protected]>
CONFIG_DEBUG_INFO has been renamed to CONFIG_X86_DEBUG_INFO. It is an
X86 specific option and should never have been used.

Signed-off-by: Tommi Kangas <[email protected]>
nrf52840dongle uses CDC ACM serial backend by default.
Disable logging as is not used in the sample.

Signed-off-by: Johann Fischer <[email protected]>
Use CDC ACM serial backend from the new USB device support.

There seems to be an issue with the sample that it does not always work
and crashes somewhere between UART configuration and Bluetooth
initialization.

Signed-off-by: Johann Fischer <[email protected]>
Use CDC ACM serial backend from the new USB device support.

Signed-off-by: Johann Fischer <[email protected]>
The clear_attrs() function signature changed.

Signed-off-by: Juha Ylinen <[email protected]>
In the hci_internal_msg_get() there is a call to sdc_hci_get()
that second parameter is uint8_t pointer.
The provided msg_type_out argument is an enum sdc_hci_msg_type_t
pointer that must fit into the uint8_t. Durign build compiler
generates an error about incompatible pointer types.

The commit adds a cast to uint8_t to fix the compilation error.

Note: the enum sdc_hci_msg_type_t is defined in SoftDevice
Controller headers. It is SoftDevice responsibility to make
sure the enum doesn't contain values that don't fit into
uint8_t.

Signed-off-by: Piotr Pryga <[email protected]>
SMF run functions now returns SMF_EVENT_HANDLED or SMF_EVENT_PROPAGATE.
Fix this for all occurances in memfault_lte_coredump.c

Signed-off-by: Simen S. Røstad <[email protected]>
Removed use of deprecated NFCT_PINS_AS_GPIOS Kconfig option and
added the NFCT pin configuration into devicetree instead.

Signed-off-by: Tommi Kangas <[email protected]>
Removed a few Kconfig options which were in comments, because those
no longer exist and caused an error.

Signed-off-by: Tommi Kangas <[email protected]>
Removed commented out TinyCrypt related Kconfig options from
conf files. The Kconfig options no longer exist and even
if the options are in comments, those still cause an error.

Signed-off-by: Tommi Kangas <[email protected]>
There was a change in sdk-zephyr Bluetooth host implementation
that combined main and sub CS mode steps.

Not all combinations of main mode and sub mode are valid, so to make it
harder to select incorrect parameters, the main mode and sub mode
enums are combined into one.

With that change names of some CS related enums were changed.
The commit aligns sdk-nrf to use the new names.

Signed-off-by: Piotr Pryga <[email protected]>
The CONFIG_NFCT_PINS_AS_GPIOS Kconfig option no longer exists and the
configuration is done through devicetree. The feature is enabled by
default by the board, so there's no need to enable it.

Signed-off-by: Tommi Kangas <[email protected]>
Correct the return type for `.run` functions of SMF. Enable
SETTINGS which is required for wifi_credentials support.

Signed-off-by: Ravi Dondaputi <[email protected]>
Manual handling of global power domains using gpd has been
made redundant by power domain and pinctrl refactoring, and gpd
has thus been removed. Remove gpd handling from mspi driver, as
this is automatically done by pinctrl_apply_state() now.

Signed-off-by: Bjarki Arge Andreasen <[email protected]>
The board overlay in bootloader/mcuboot for the
nrf54h20dk/nrf54h20/cpuapp platform is required, but ignored as
FILE_SUFFIX="merged_slot" matches the mcuboot_merged_slot.overlay
in this sample instead.

Copy the missing contents of the board overlay from
bootloader/mcuboot to mcuboot_merged_slot.overlay

Signed-off-by: Bjarki Arge Andreasen <[email protected]>
Adjust nrf54h20dk/nrf54h20/cpuapp overlay and conf to include
required props from the overlay in bootloader/mcuboot. Specifically
disabling power domains.

Signed-off-by: Bjarki Arge Andreasen <[email protected]>
The global power domains require PM_DEVICE to be power managed.
Enable PM_DEVICE, and unselect the default, optional, not required
PM_DEVICE_RUNTIME_ASYNC feature.

Signed-off-by: Bjarki Arge Andreasen <[email protected]>
Switched to the new USB stack.

Signed-off-by: Arkadiusz Balys <[email protected]>
Test configurations will added to quarantine due to
RAM overflow.

Signed-off-by: Katarzyna Giądła <[email protected]>
Fixed a compilation warning from configure_power_pin_interrupt().

Signed-off-by: Tommi Kangas <[email protected]>
Use CDC ACM serial backend from the new USB device support.

Signed-off-by: Johann Fischer <[email protected]>
Use CDC ACM serial backend from the new USB device support.

Signed-off-by: Johann Fischer <[email protected]>
Add CONFIG_DEPRECATION_TEST=y to sample configuration.

Signed-off-by: Johann Fischer <[email protected]>
Add Kconfig with sourcing main Kconfig file.

Signed-off-by: Karol Lasończyk <[email protected]>
The BT_LE_ADV_OPT_USE_NAME option was deprecated. There is no
automatic add of a name to advertising params. It must be done
manually by call to bt_le_ext_adv_set_data() in case of extended
advertising.

The commit changes the ISO test code that was still using the
deprecated option.

Signed-off-by: Piotr Pryga <[email protected]>
MarekPieta and others added 18 commits September 18, 2025 21:08
Change suppresses build warnings related to deprecated APIs of USB
legacy stack if USB next stack is chosen.

Jira: NCSDK-35440

Signed-off-by: Marek Pieta <[email protected]>
Add CONFIG_DEPRECATION_TEST=y to sample configuration.
Application uses deprecated code and needs to be ported to the new USB
device stack.

Signed-off-by: Johann Fischer <[email protected]>
Add CONFIG_DEPRECATION_TEST=y to test configuration.

Signed-off-by: Johann Fischer <[email protected]>
sets MODE_SWAP_USING_MOVE as an default for NORDIC chips

Signed-off-by: Mateusz Michalek <[email protected]>
TinyCrypt library is no longer supported by Zephyr.

Jira: NCSDK-35445

Signed-off-by: Marek Pieta <[email protected]>
TinyCrypt library is no longer supported by Zephyr.

Jira: NCSDK-35445

Signed-off-by: Marek Pieta <[email protected]>
Remove override for (now promptless) Kconfig.
Remove the override to ROM_START_OFFSET, which is already changed if the
partition manager is enabled.

Signed-off-by: Tomasz Chyrowicz <[email protected]>
The sample in Kconfig sets default ZMS to 'y', but ZMS also must select
CRC. It is done in different place, but because how Kconfig works
it must be also set here.

Jira: NCSDK-35447
Jira: NCSDK-35446
Signed-off-by: Dominik Kilian <[email protected]>
Add this missing dependency which is used in the Zephyr doc build.

Signed-off-by: Carles Cufi <[email protected]>
L2 variant is not needed in coprocessor sample. We can use there
only the raw nrf-radio version.

Signed-off-by: Arkadiusz Balys <[email protected]>
On LLVM toolchain, the lack of cast produces an error of incompatible
pointer types.

Ref. NCSDK-35444

Signed-off-by: Michał Grochala <[email protected]>
PERIPHCONF generation based on devicetree is being added in a script
in upstream zephyr. The new script script replaces nrf-regtool and the
temporary "periphconf migration" solution.

Ref: NCSDK-35206

Signed-off-by: Jonathan Nilsen <[email protected]>
Temporarily remove Thingy53 support as it doesn't build after the
USB stack change in Zephyr.
TODO: migrate to the new USB stack.

Signed-off-by: Michał Grochala <[email protected]>
The BT_RPC uses dynamic callbacks for serialization
and it always requres it. This commit contains Kconfig
changes that enables BT_CONN_DYNAMIC_CALLBACKS
always when BT_RPC is enabled.

Jira: NCSDK-35443

Signed-off-by: Dominik Kilian <[email protected]>
Some test configurations report FLASH overflow.
This change adds these for qurantine.

Signed-off-by: Katarzyna Giądła <[email protected]>
The separate main_mode_type and sub_mode_type fields
in the CS configuration have been replaced by a single mode field.

Updates the logging in the config_create_cb callback to reflect this change.
This aligns the sample with the updated API.

Signed-off-by: Aleksandr Mirlenko <[email protected]>
Required by upstream Zephyr.

Signed-off-by: Carles Cufi <[email protected]>
Copy link

Since quarantine was modified, please make sure you are following the process described in Quarantine Process.

@NordicBuilder NordicBuilder added doc-required PR must not be merged without tech writer approval. manifest changelog-entry-required Update changelog before merge. Remove label if entry is not needed or already added. labels Sep 19, 2025
@NordicBuilder
Copy link
Contributor

The following west manifest projects have changed revision in this Pull Request:

Name Old Revision New Revision Diff
mbedtls nrfconnect/sdk-mbedtls@c5115ab (main,ncs-v3.1-branch,ncs-v3.1.1,ncs-v3.1.0,ncs-v3.1.0-rc2,ncs-v3.1.0-rc1) nrfconnect/sdk-mbedtls#44 nrfconnect/sdk-mbedtls#44/files
mcuboot nrfconnect/sdk-mcuboot@c390295 nrfconnect/sdk-mcuboot#513 nrfconnect/sdk-mcuboot#513/files
zephyr nrfconnect/sdk-zephyr@d32b794 (main) nrfconnect/sdk-zephyr#3290 nrfconnect/sdk-zephyr#3290/files

Additional metadata changed:

Name URL Submodules West cmds module.yml
mbedtls
mcuboot

DNM label due to: 3 projects with PR revision and 2 projects with metadata changes

Note: This message is automatically posted and updated by the Manifest GitHub Action.

@NordicBuilder
Copy link
Contributor

CI Information

To view the history of this post, clich the 'edited' button above
Build number: 1

Inputs:

Sources:

more details

Github labels

Enabled Name Description
ci-disabled Disable the ci execution
ci-all-test Run all of ci, no test spec filtering will be done
ci-force-downstream Force execution of downstream even if twister fails
ci-run-twister Force run twister
ci-run-zephyr-twister Force run zephyr twister
List of changed files detected by CI (0)

Outputs:

Toolchain

Version:
Build docker image:

Test Spec & Results: ✅ Success; ❌ Failure; 🟠 Queued; 🟡 Progress; ◻️ Skipped; ⚠️ Quarantine

  • ❌ Toolchain
  • ❌ Build twister
  • ❌ Integration tests

Note: This message is automatically posted and updated by the CI

@nordic-segl nordic-segl deleted the DNM-test-upmerge branch September 22, 2025 11:19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

changelog-entry-required Update changelog before merge. Remove label if entry is not needed or already added. DNM doc-required PR must not be merged without tech writer approval. manifest manifest-mbedtls manifest-mcuboot manifest-zephyr

Projects

None yet

Development

Successfully merging this pull request may close these issues.