Skip to content
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

treewide: update thingy91x bootloader setup #18137

Closed
wants to merge 1 commit into from
Closed

treewide: update thingy91x bootloader setup #18137

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 2 additions & 0 deletions applications/asset_tracker_v2/sysbuild/mcuboot/boards/thingy91x_nrf9151.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,3 +17,5 @@ CONFIG_BOOT_SERIAL_IMG_GRP_IMAGE_STATE=y

CONFIG_PM_EXTERNAL_FLASH_MCUBOOT_SECONDARY=y
CONFIG_PM_OVERRIDE_EXTERNAL_DRIVER_CHECK=y

CONFIG_FW_INFO_FIRMWARE_VERSION=2
4 changes: 4 additions & 0 deletions applications/asset_tracker_v2/sysbuild/mcuboot/boards/thingy91x_nrf9151.overlay
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
&uart0 {
status = "okay";
current-speed = < 1000000 >;
};
2 changes: 2 additions & 0 deletions applications/connectivity_bridge/sysbuild/mcuboot/boards/thingy91x_nrf5340_cpuapp.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,3 +60,5 @@ CONFIG_BOOT_SERIAL_IMG_GRP_IMAGE_STATE=y
CONFIG_MCUBOOT_VERIFY_IMG_ADDRESS=n

CONFIG_BOOT_SERIAL_NO_APPLICATION=y

CONFIG_FW_INFO_FIRMWARE_VERSION=2
5 changes: 5 additions & 0 deletions applications/serial_lte_modem/sysbuild/mcuboot/boards/thingy91x_nrf9151.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,3 +14,8 @@ CONFIG_UART_CONSOLE=n
CONFIG_MCUBOOT_SERIAL=y
CONFIG_MCUBOOT_SERIAL_DIRECT_IMAGE_UPLOAD=y
CONFIG_BOOT_SERIAL_IMG_GRP_IMAGE_STATE=y

CONFIG_PM_EXTERNAL_FLASH_MCUBOOT_SECONDARY=y
CONFIG_PM_OVERRIDE_EXTERNAL_DRIVER_CHECK=y

CONFIG_FW_INFO_FIRMWARE_VERSION=2
4 changes: 4 additions & 0 deletions applications/serial_lte_modem/sysbuild/mcuboot/boards/thingy91x_nrf9151.overlay
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
&uart0 {
status = "okay";
current-speed = < 1000000 >;
};
5 changes: 5 additions & 0 deletions samples/cellular/nrf_cloud_multi_service/sysbuild/mcuboot/boards/thingy91x_nrf9151.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,3 +14,8 @@ CONFIG_UART_CONSOLE=n
CONFIG_MCUBOOT_SERIAL=y
CONFIG_MCUBOOT_SERIAL_DIRECT_IMAGE_UPLOAD=y
CONFIG_BOOT_SERIAL_IMG_GRP_IMAGE_STATE=y

Copy link
Contributor

Choose a reason for hiding this comment

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

Seems ok. @tony-le-24 can you check if the various additional nightly and weekly tests still work with this change -- any of them that run on the Thingy:91X?

Copy link
Contributor

Choose a reason for hiding this comment

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

I will, thanks

Copy link
Contributor

Choose a reason for hiding this comment

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

I ran it on my PR for Thingy91:X testing, things seem green. LGTM!

CONFIG_PM_EXTERNAL_FLASH_MCUBOOT_SECONDARY=y
CONFIG_PM_OVERRIDE_EXTERNAL_DRIVER_CHECK=y

CONFIG_FW_INFO_FIRMWARE_VERSION=2
4 changes: 4 additions & 0 deletions samples/cellular/nrf_cloud_multi_service/sysbuild/mcuboot/boards/thingy91x_nrf9151.overlay
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
&uart0 {
status = "okay";
current-speed = < 1000000 >;
};
5 changes: 5 additions & 0 deletions samples/net/aws_iot/sysbuild/mcuboot/boards/thingy91x_nrf9151.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,3 +14,8 @@ CONFIG_UART_CONSOLE=n
CONFIG_MCUBOOT_SERIAL=y
CONFIG_MCUBOOT_SERIAL_DIRECT_IMAGE_UPLOAD=y
CONFIG_BOOT_SERIAL_IMG_GRP_IMAGE_STATE=y

CONFIG_PM_EXTERNAL_FLASH_MCUBOOT_SECONDARY=y
CONFIG_PM_OVERRIDE_EXTERNAL_DRIVER_CHECK=y

CONFIG_FW_INFO_FIRMWARE_VERSION=2
4 changes: 4 additions & 0 deletions samples/net/aws_iot/sysbuild/mcuboot/boards/thingy91x_nrf9151.overlay
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
&uart0 {
status = "okay";
current-speed = < 1000000 >;
};
14 changes: 5 additions & 9 deletions samples/wifi/shell/sysbuild/mcuboot/boards/thingy91x_nrf9151.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,3 @@
#
# Copyright (c) 2024 Nordic Semiconductor ASA
#
# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
#

# unmodified copy from mcuboot

# MCUBoot settings
CONFIG_BOOT_MAX_IMG_SECTORS=512

Expand All @@ -20,6 +12,10 @@ CONFIG_CONSOLE=n
CONFIG_CONSOLE_HANDLER=n
CONFIG_UART_CONSOLE=n
CONFIG_MCUBOOT_SERIAL=y

CONFIG_MCUBOOT_SERIAL_DIRECT_IMAGE_UPLOAD=y
CONFIG_BOOT_SERIAL_IMG_GRP_IMAGE_STATE=y

CONFIG_PM_EXTERNAL_FLASH_MCUBOOT_SECONDARY=y
CONFIG_PM_OVERRIDE_EXTERNAL_DRIVER_CHECK=y

CONFIG_FW_INFO_FIRMWARE_VERSION=2
4 changes: 4 additions & 0 deletions samples/wifi/shell/sysbuild/mcuboot/boards/thingy91x_nrf9151.overlay
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
&uart0 {
status = "okay";
current-speed = < 1000000 >;
};
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 @@ -132,7 +132,7 @@ manifest:
compare-by-default: true
- name: mcuboot
repo-path: sdk-mcuboot
revision: 68b96b802cdeef77ce4200e776afa46f6d3cfb66
revision: pull/358/head
path: bootloader/mcuboot
- name: qcbor
url: https://github.com/laurencelundblade/QCBOR
Expand Down
Loading