Skip to content

DFU Runner for Thingy:91 X #17412

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

Closed
wants to merge 3 commits into from
Closed

DFU Runner for Thingy:91 X #17412

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
029588f
manifest: update west.yml to include nrfutil-dfu
maxd-nordic Sep 20, 2024
b7a68a6
sysbuild: add support for ZIP files in runners
maxd-nordic Sep 20, 2024
b6ae9c2
boards: thingy91x: use DFU runner
maxd-nordic Sep 20, 2024
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
6 changes: 6 additions & 0 deletions boards/nordic/thingy91x/Kconfig.sysbuild
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,9 @@ config NETCORE_APP_UPDATE
config NRF_DEFAULT_EMPTY
default y

config BUILD_OUTPUT_ZIP
default y

endif # BOARD_THINGY91X_NRF5340_CPUAPP || BOARD_THINGY91X_NRF5340_CPUAPP_NS

if BOARD_THINGY91X_NRF5340_CPUAPP || BOARD_THINGY91X_NRF5340_CPUAPP_NS || BOARD_THINGY91X_NRF5340_CPUNET
Expand All @@ -69,6 +72,9 @@ config PM_OVERRIDE_EXTERNAL_DRIVER_CHECK
config SECURE_BOOT_SIGNING_KEY_FILE
default "$(ZEPHYR_NRF_MODULE_DIR)/boards/nordic/thingy91x/nsib_signing_key.pem"

config BUILD_OUTPUT_ZIP
default y

endif # BOARD_THINGY91X_NRF9151 || BOARD_THINGY91X_NRF9151_NS

if THINGY91X_STATIC_PARTITIONS_NRF53_EXTERNAL_FLASH
Expand Down
25 changes: 16 additions & 9 deletions boards/nordic/thingy91x/board.cmake
View file
Open in desktop
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why has indentation been removed in the if-blocks?

Original file line number Diff line number Diff line change
Expand Up @@ -2,19 +2,26 @@
# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause

if(CONFIG_BOARD_THINGY91X_NRF9151 OR CONFIG_BOARD_THINGY91X_NRF9151_NS)
board_runner_args(nrfjprog)
board_runner_args(nrfutil "--nrf-family=NRF91")
board_runner_args(jlink "--device=nRF9160_xxAA" "--speed=4000")
board_runner_args(nrfjprog)
board_runner_args(nrfutil "--nrf-family=NRF91")
board_runner_args(jlink "--device=nRF9160_xxAA" "--speed=4000")
board_runner_args(pyocd "--target=nrf91" "--frequency=4000000")
elseif(BOARD_THINGY91X_NRF5340_CPUAPP OR BOARD_THINGY91X_NRF5340_CPUAPP_NS)
board_runner_args(nrfjprog)
board_runner_args(nrfutil "--nrf-family=NRF53")
board_runner_args(jlink "--device=nrf5340_xxaa_app" "--speed=4000")
board_runner_args(nrfjprog)
board_runner_args(nrfutil "--nrf-family=NRF53")
board_runner_args(jlink "--device=nrf5340_xxaa_app" "--speed=4000")
board_runner_args(pyocd "--target=nrf5340_xxaa" "--frequency=4000000")
elseif(BOARD_THINGY91X_NRF5340_CPUNET)
board_runner_args(nrfjprog)
board_runner_args(nrfutil "--nrf-family=NRF53")
board_runner_args(jlink "--device=nrf5340_xxaa_net" "--speed=4000")
board_runner_args(nrfjprog)
board_runner_args(nrfutil "--nrf-family=NRF53")
board_runner_args(jlink "--device=nrf5340_xxaa_net" "--speed=4000")
board_runner_args(pyocd "--target=nrf5340_xxaa" "--frequency=4000000")
endif()

set_property(TARGET runners_yaml_props_target PROPERTY zip_file "${PROJECT_BINARY_DIR}/../../dfu_application.zip")

include(${ZEPHYR_BASE}/boards/common/nrfutil_dfu.board.cmake)
include(${ZEPHYR_BASE}/boards/common/pyocd.board.cmake)
include(${ZEPHYR_BASE}/boards/common/nrfutil.board.cmake)
include(${ZEPHYR_BASE}/boards/common/nrfjprog.board.cmake)
include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)
6 changes: 6 additions & 0 deletions sysbuild/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,12 @@ function(${SYSBUILD_CURRENT_MODULE_NAME}_pre_cmake)
else()
set_config_bool(${image} CONFIG_BUILD_OUTPUT_HEX n)
endif()

if(SB_CONFIG_BUILD_OUTPUT_ZIP)
set_config_bool(${image} CONFIG_BUILD_OUTPUT_ZIP y)
else()
set_config_bool(${image} CONFIG_BUILD_OUTPUT_ZIP n)
endif()
endforeach()

if(SB_CONFIG_PARTITION_MANAGER AND SB_CONFIG_BOOTLOADER_MCUBOOT)
Expand Down
5 changes: 5 additions & 0 deletions sysbuild/Kconfig.sysbuild
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,11 @@ config BUILD_OUTPUT_HEX
The name of this file can be customized with CONFIG_KERNEL_BIN_NAME.
This will be applied to all target images.

config BUILD_OUTPUT_ZIP
bool "Build a binary in ZIP format"
help
Build a ZIP file with a manifest and DFU binaries.

# TODO: NCSDK-28330
# This check will fail for variants
BOARD_NS_QUALIFIER_CHECK := $(substring,$(BOARD_QUALIFIERS),-3)
Expand Down
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 @@ -72,7 +72,7 @@ manifest:
# https://developer.nordicsemi.com/nRF_Connect_SDK/doc/latest/zephyr/guides/modules.html
- name: zephyr
repo-path: sdk-zephyr
revision: 2fb756ef5c417b0f3348e18c1bffb245e3d10963
revision: refs/pull/2036/head
import:
# In addition to the zephyr repository itself, NCS also
# imports the contents of zephyr/west.yml at the above
Expand Down
Loading