Skip to content

[DNM] Bt upmerge fixes#22125

Closed
weeTike wants to merge 18 commits into
nrfconnect:mainfrom
weeTike:bt_upmerge_fixes
Closed

[DNM] Bt upmerge fixes#22125
weeTike wants to merge 18 commits into
nrfconnect:mainfrom
weeTike:bt_upmerge_fixes

Conversation

@weeTike
Copy link
Copy Markdown
Contributor

@weeTike weeTike commented May 1, 2025

No description provided.

tmon-nordic and others added 15 commits April 30, 2025 18:14
Run migrate_posix_kconfigs.py to rename deprecated POSIX API Kconfig
options.
GETOPT was replaced by POSIX_C_LIB_EXT which default to n. Remove the
obsolete default value change and use the replacement POSIX_C_LIB_EXT.

Signed-off-by: Tomasz Moń <tomasz.mon@nordicsemi.no>
Signed-off-by: Johann Fischer <johann.fischer@nordicsemi.no>
Update version to upmerged sdk-zephyr and sdk-mcuboot.

Signed-off-by: Johann Fischer <johann.fischer@nordicsemi.no>
Update Matter SDK revision.

Signed-off-by: Adrian Gielniewski <adrian.gielniewski@nordicsemi.no>
The combination of AF_PACKET and IPPROTO_RAW is not correct as packet
sockets should only be used with IEEE 802.3 protocol numbers. As the
support for this combination will likely be soon removed from Zephyr,
switch to use DGRAM packet socket instead.

Using ETH_P_ALL is fine in this case, as OpenThread interface only
provides IPv6 packets anyway.

Signed-off-by: Robert Lubos <robert.lubos@nordicsemi.no>
The combination of AF_PACKET and IPPROTO_RAW is not correct as packet
sockets should only be used with IEEE 802.3 protocol numbers. As the
support for this combination will likely be soon removed from Zephyr,
switch to use DGRAM packet socket instead.

As PPP L2 only supports IP/IPv6 packets, specify the L2 protocol type
field accordingly so that the L2 can interpret the packet data
correctly.

Signed-off-by: Robert Lubos <robert.lubos@nordicsemi.no>
The combination of AF_PACKET and IPPROTO_RAW is not correct as packet
sockets should only be used with IEEE 802.3 protocol numbers. As the
support for this combination will likely be soon removed from Zephyr,
switch to use DGRAM packet socket instead.

As PPP L2 only supports IP/IPv6 packets, specify the L2 protocol type
field accordingly so that the L2 can interpret the packet data
correctly.

Signed-off-by: Robert Lubos <robert.lubos@nordicsemi.no>
Totally unexpected, the exact same Kconfig options and C designators are
introduced in the upstream Zephyr repository. Prefix the Kconfig options
of the NCS implementation with NRF to resolve the conflicts.

Signed-off-by: Johann Fischer <johann.fischer@nordicsemi.no>
Refer to commit zephyrproject-rtos/zephyr@d382fca

Signed-off-by: Vinayak Kariappa Chettimada <vich@nordicsemi.no>
last_erased_page_start_offset has been removed by
zephyrproject-rtos/zephyr#82326.

Need to change accordingly to not break the build.

Signed-off-by: Maximilian Deubel <maximilian.deubel@nordicsemi.no>
This has been renamed upstream.

Signed-off-by: Timothy Keys <timothy.keys@nordicsemi.no>
BT_ISO_CHAN_TYPE_CONNECTED has been refactored into
BT_ISO_CHAN_TYPE_CENTRAL and BT_ISO_CHAN_TYPE_PERIPHERAL.

Signed-off-by: Timothy Keys <timothy.keys@nordicsemi.no>
Signature was changed to have const bt_conn upstream.

Signed-off-by: Timothy Keys <timothy.keys@nordicsemi.no>
This is needed after changes in upstream zephyr.

Signed-off-by: Timothy Keys <timothy.keys@nordicsemi.no>
Adjust for new net_linkaddr definition.

Signed-off-by: Maximilian Deubel <maximilian.deubel@nordicsemi.no>
Moved OpenThread-related Kconfigs from L2 layer to
modules/openthread. All of those configs were not strictly related
to the L2 layer, so they fits better to OpenThread module.
This operation allows using OpenThread Kconfigs even if L2 layer is
disabled.

Enabling NET_L2_OPENTHREAD also configures those configs by
selecting the OPENTHREAD kconfig, so there is no change regarding
backwards compatibility. The only change is that the Kconfigs
related to Thread were moved to the modules space, so their
location in the menuconfig also changed.

Once it is done, a choice for setting different L2 implementations
seems to be redundant.

Signed-off-by: Arkadiusz Balys <arkadiusz.balys@nordicsemi.no>
Signed-off-by: Adrian Gielniewski <adrian.gielniewski@nordicsemi.no>
@github-actions github-actions Bot 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 May 1, 2025
@NordicBuilder
Copy link
Copy Markdown
Contributor

NordicBuilder commented May 1, 2025

CI Information

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

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

@NordicBuilder
Copy link
Copy Markdown
Contributor

NordicBuilder commented May 1, 2025

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

Name Old Revision New Revision Diff
matter nrfconnect/sdk-connectedhomeip@0539fd4 nrfconnect/sdk-connectedhomeip#603 nrfconnect/sdk-connectedhomeip#603/files
mcuboot nrfconnect/sdk-mcuboot@9d9d524 (main) nrfconnect/sdk-mcuboot#425 nrfconnect/sdk-mcuboot#425/files
zephyr nrfconnect/sdk-zephyr@ca2af2f nrfconnect/sdk-zephyr#2817 nrfconnect/sdk-zephyr#2817/files

DNM label due to: 3 projects with PR revision

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

weeTike added 3 commits May 2, 2025 11:43
The signature of bt_conn_get_remote_info changed upstream to use const conn *,
but in this usecase conn * should not be const.

Signed-off-by: Timothy Keys <timothy.keys@nordicsemi.no>
BT_GATT_CCC_INITIALIZER was renamed upstream. It is now called
BT_GATT_CCC_MANAGED_USER_DATA_INIT.

Signed-off-by: Timothy Keys <timothy.keys@nordicsemi.no>
Upstream refactor means it is no longer needed by default.

Signed-off-by: Timothy Keys <timothy.keys@nordicsemi.no>
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-matter manifest-mcuboot manifest-zephyr

Projects

None yet

Development

Successfully merging this pull request may close these issues.

9 participants