Skip to content

manifest: sdk-zephyr: [nrf noup] mgmt: mcumgr: Fix nRF5340 network core hook #21506

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Apr 11, 2025
Merged

manifest: sdk-zephyr: [nrf noup] mgmt: mcumgr: Fix nRF5340 network core hook #21506

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3c80883
manifest: Update sdk-zephyr revision (auto-manifest PR)
NordicBuilder Apr 8, 2025
ff9a2d0
Revert "samples: lwm2m_client: Add missing kconfig to overlay"
nordicjm Apr 10, 2025
f5f7381
samples: cellular: lwm2m_client: Only include FOTA file if enabled
nordicjm Apr 10, 2025
4c43288
samples: Fix abuse of not including bootutil library
nordicjm Apr 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions samples/cellular/lwm2m_client/overlay-mcumgr_client.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,3 @@ CONFIG_UART_MCUMGR_RX_BUF_COUNT=4
CONFIG_LWM2M_RW_SENML_CBOR_RECORDS=55
# Extend System Workqueue stack size
CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=2304

# Enable MCUboot hooks
CONFIG_BOOT_IMAGE_ACCESS_HOOKS=y
9 changes: 5 additions & 4 deletions samples/cellular/lwm2m_client/src/fota_external/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@
# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
#

zephyr_include_directories(include)

target_sources_ifdef(CONFIG_APP_SMP_CLIENT_FOTA_EXTERNAL
app PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/client.c)
if(CONFIG_APP_SMP_CLIENT_FOTA_EXTERNAL)
zephyr_sources(${CMAKE_CURRENT_SOURCE_DIR}/client.c)
zephyr_include_directories(include)
zephyr_library_link_libraries(MCUBOOT_BOOTUTIL)
endif()
15 changes: 9 additions & 6 deletions samples/cellular/lwm2m_client/src/main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,10 @@ LOG_MODULE_REGISTER(app_lwm2m_client, CONFIG_APP_LOG_LEVEL);

#include <zephyr/device.h>
#include <zephyr/devicetree.h>

#if defined(CONFIG_APP_SMP_CLIENT_FOTA_EXTERNAL)
#include "fota_app_external.h"
#endif

#if defined(CONFIG_LWM2M_CLIENT_UTILS_LOCATION_ASSISTANCE)
#include "ui_input.h"
Expand Down Expand Up @@ -571,13 +574,13 @@ int main(void)
return 0;
}

if (IS_ENABLED(CONFIG_APP_SMP_CLIENT_FOTA_EXTERNAL)) {
ret = fota_external_init();
if (ret < 0) {
LOG_ERR("Unable to init Fota external client (%d)", ret);
return 0;
}
#if defined(CONFIG_APP_SMP_CLIENT_FOTA_EXTERNAL)
ret = fota_external_init();
if (ret < 0) {
LOG_ERR("Unable to init Fota external client (%d)", ret);
return 0;
}
#endif

ret = app_event_manager_init();
if (ret) {
Expand Down
10 changes: 8 additions & 2 deletions subsys/dfu/dfu_target/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,18 @@ zephyr_library_sources_ifdef(CONFIG_DFU_TARGET_SMP
src/dfu_target_smp.c
)
zephyr_library_sources(src/dfu_stream_flatten.c)
if (CONFIG_DFU_TARGET_SUIT)

if(CONFIG_DFU_TARGET_SMP OR CONFIG_DFU_TARGET_MCUBOOT)
zephyr_library_link_libraries(MCUBOOT_BOOTUTIL)
endif()

if(CONFIG_DFU_TARGET_SUIT)
zephyr_library_sources(src/dfu_target_suit.c)
zephyr_library_link_libraries(suit_memory_layout_interface)
zephyr_library_link_libraries(suit_envelope_info)
zephyr_library_link_libraries_ifdef(CONFIG_SUIT_CACHE_RW suit_cache_interface)
if (CONFIG_SSF_SUIT_SERVICE_ENABLED)

if(CONFIG_SSF_SUIT_SERVICE_ENABLED)
zephyr_library_link_libraries(suit_utils)
endif()
endif()
4 changes: 4 additions & 0 deletions subsys/net/lib/fota_download/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,3 +30,7 @@ zephyr_include_directories_ifdef(CONFIG_SECURE_BOOT
${ZEPHYR_NRF_MODULE_DIR}/subsys/dfu/include)
zephyr_include_directories_ifdef(CONFIG_DOWNLOADER
${ZEPHYR_NRF_MODULE_DIR}/subsys/net/lib/downloader/include)

if(CONFIG_MCUBOOT_IMG_MANAGER)
zephyr_library_link_libraries(MCUBOOT_BOOTUTIL)
endif()
3 changes: 2 additions & 1 deletion subsys/net/lib/mcumgr_smp_client/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,5 @@ zephyr_library_sources_ifdef(CONFIG_NRF_MCUMGR_SMP_CLIENT_SHELL
src/mcumgr_smp_client_shell.c
)

zephyr_include_directories(./include)
zephyr_library_link_libraries(MCUBOOT_BOOTUTIL)
zephyr_include_directories(include)
2 changes: 1 addition & 1 deletion west.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ manifest:
# https://developer.nordicsemi.com/nRF_Connect_SDK/doc/latest/zephyr/guides/modules.html
- name: zephyr
repo-path: sdk-zephyr
revision: 7af92582ecab16df529fbb4d77aad92ccf105352
revision: 8dbca43a6a9d332c62457789780c569e907aa7f7
import:
# In addition to the zephyr repository itself, NCS also
# imports the contents of zephyr/west.yml at the above
Expand Down