Skip to content

Conversation

@seov-nordic
Copy link

By applying shields only to the main image

jukkar and others added 30 commits September 12, 2025 16:26
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]>
By applying shields only to the main image

Signed-off-by: Sergei Ovchinnikov <[email protected]>
@jukkar jukkar force-pushed the upmerge-08-08-2025 branch 9 times, most recently from 184a98c to e15928b Compare September 22, 2025 14:04
@jukkar jukkar force-pushed the upmerge-08-08-2025 branch 3 times, most recently from 1473d01 to ba02135 Compare September 23, 2025 13:18
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.