bluetooth: upmerge alignments #1
Open
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
jukkar
force-pushed
the
upmerge-08-08-2025
branch
from
4a72f2e to
6caef6a
Compare
ppryga-nordic
force-pushed
the
bluetooth-fixes-umperge-08-08-2025
branch
from
f3f7a96 to
4f07858
Compare
jukkar
force-pushed
the
upmerge-08-08-2025
branch
from
6caef6a to
618441c
Compare
ppryga-nordic
force-pushed
the
bluetooth-fixes-umperge-08-08-2025
branch
from
4f07858 to
6241e64
Compare
ppryga-nordic
changed the title
jukkar
force-pushed
the
upmerge-08-08-2025
branch
2 times, most recently
from
0534720 to
f2c830b
Compare
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]>
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]>
By applying shields only to the main image Signed-off-by: Sergei Ovchinnikov <[email protected]>
The nRF Desktop still uses USB legacy stack in some configurations. Disable deprecation warnings to workaround build failures in CI. Jira: NCSDK-35440 Signed-off-by: Marek Pieta <[email protected]>
The MCUboot serial recovery over USB CDC ACM still uses USB legacy stack. Disable deprecation warnings to workaround build failures in CI. Jira: NCSDK-35440 Signed-off-by: Marek Pieta <[email protected]>
As using the deprecated USB stack, must turn off deprecation warnings with CONFIG_DEPRECATION_TEST=y. Change to the endpoint structure. Signed-off-by: Graham Wacey <[email protected]>
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]>
Rewrite the periphconf CMake code to have each individual Zephyr image generate periphconf instead of doing it from the sysbuild image. This aligns better with how upstream has moved gen_uicr.py out of SYSBUILD. Also, add a sample that uses this infrastructure. Signed-off-by: Sebastian Bøe <[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]>
jukkar
force-pushed
the
upmerge-08-08-2025
branch
from
f2c830b to
39e6a01
Compare
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]>
There was used an err variable to store return from bt_le_ext_adv_set_data(). That variable was not declared. The commit fixes compilation error. Signed-off-by: Piotr Pryga <[email protected]>
ppryga-nordic
force-pushed
the
bluetooth-fixes-umperge-08-08-2025
branch
from
6241e64 to
b5b33e7
Compare
jukkar
force-pushed
the
upmerge-08-08-2025
branch
6 times, most recently
from
184a98c to
e15928b
Compare
carlescufi
force-pushed
the
upmerge-08-08-2025
branch
from
47d86a0 to
f9eb432
Compare
jukkar
force-pushed
the
upmerge-08-08-2025
branch
3 times, most recently
from
1473d01 to
ba02135
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
21 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.
The PR holds commits that has to be added to most recent version of upmerge branch.