Skip to content

Commit 96e581d

Browse files
maxd-nordicnordicjm
maxd-nordic
authored and
nordicjm
committed
treewide: update thingy91x bootloader setup
Use production setup of thingy91x bootloader configuration. Signed-off-by: Maximilian Deubel <[email protected]>
1 parent ade6f3b commit 96e581d

File tree

11 files changed

+44
-9
lines changed

11 files changed

+44
-9
lines changed

‎applications/asset_tracker_v2/sysbuild/mcuboot/boards/thingy91x_nrf9151.conf‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,3 +17,5 @@ CONFIG_BOOT_SERIAL_IMG_GRP_IMAGE_STATE=y
1717

1818
CONFIG_PM_EXTERNAL_FLASH_MCUBOOT_SECONDARY=y
1919
CONFIG_PM_OVERRIDE_EXTERNAL_DRIVER_CHECK=y
20+
21+
CONFIG_FW_INFO_FIRMWARE_VERSION=2

‎applications/asset_tracker_v2/sysbuild/mcuboot/boards/thingy91x_nrf9151.overlay‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
&uart0 {
2+
status = "okay";
3+
current-speed = < 1000000 >;
4+
};

‎applications/connectivity_bridge/sysbuild/mcuboot/boards/thingy91x_nrf5340_cpuapp.conf‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,3 +60,5 @@ CONFIG_BOOT_SERIAL_IMG_GRP_IMAGE_STATE=y
6060
CONFIG_MCUBOOT_VERIFY_IMG_ADDRESS=n
6161

6262
CONFIG_BOOT_SERIAL_NO_APPLICATION=y
63+
64+
CONFIG_FW_INFO_FIRMWARE_VERSION=2

‎applications/serial_lte_modem/sysbuild/mcuboot/boards/thingy91x_nrf9151.conf‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,3 +14,8 @@ CONFIG_UART_CONSOLE=n
1414
CONFIG_MCUBOOT_SERIAL=y
1515
CONFIG_MCUBOOT_SERIAL_DIRECT_IMAGE_UPLOAD=y
1616
CONFIG_BOOT_SERIAL_IMG_GRP_IMAGE_STATE=y
17+
18+
CONFIG_PM_EXTERNAL_FLASH_MCUBOOT_SECONDARY=y
19+
CONFIG_PM_OVERRIDE_EXTERNAL_DRIVER_CHECK=y
20+
21+
CONFIG_FW_INFO_FIRMWARE_VERSION=2

‎applications/serial_lte_modem/sysbuild/mcuboot/boards/thingy91x_nrf9151.overlay‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
&uart0 {
2+
status = "okay";
3+
current-speed = < 1000000 >;
4+
};

‎samples/cellular/nrf_cloud_multi_service/sysbuild/mcuboot/boards/thingy91x_nrf9151.conf‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,3 +14,8 @@ CONFIG_UART_CONSOLE=n
1414
CONFIG_MCUBOOT_SERIAL=y
1515
CONFIG_MCUBOOT_SERIAL_DIRECT_IMAGE_UPLOAD=y
1616
CONFIG_BOOT_SERIAL_IMG_GRP_IMAGE_STATE=y
17+
18+
CONFIG_PM_EXTERNAL_FLASH_MCUBOOT_SECONDARY=y
19+
CONFIG_PM_OVERRIDE_EXTERNAL_DRIVER_CHECK=y
20+
21+
CONFIG_FW_INFO_FIRMWARE_VERSION=2

‎samples/cellular/nrf_cloud_multi_service/sysbuild/mcuboot/boards/thingy91x_nrf9151.overlay‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
&uart0 {
2+
status = "okay";
3+
current-speed = < 1000000 >;
4+
};

‎samples/net/aws_iot/sysbuild/mcuboot/boards/thingy91x_nrf9151.conf‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,3 +14,8 @@ CONFIG_UART_CONSOLE=n
1414
CONFIG_MCUBOOT_SERIAL=y
1515
CONFIG_MCUBOOT_SERIAL_DIRECT_IMAGE_UPLOAD=y
1616
CONFIG_BOOT_SERIAL_IMG_GRP_IMAGE_STATE=y
17+
18+
CONFIG_PM_EXTERNAL_FLASH_MCUBOOT_SECONDARY=y
19+
CONFIG_PM_OVERRIDE_EXTERNAL_DRIVER_CHECK=y
20+
21+
CONFIG_FW_INFO_FIRMWARE_VERSION=2

‎samples/net/aws_iot/sysbuild/mcuboot/boards/thingy91x_nrf9151.overlay‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
&uart0 {
2+
status = "okay";
3+
current-speed = < 1000000 >;
4+
};

‎samples/wifi/shell/sysbuild/mcuboot/boards/thingy91x_nrf9151.conf‎

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,3 @@
1-
#
2-
# Copyright (c) 2024 Nordic Semiconductor ASA
3-
#
4-
# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
5-
#
6-
7-
# unmodified copy from mcuboot
8-
91
# MCUBoot settings
102
CONFIG_BOOT_MAX_IMG_SECTORS=512
113

@@ -20,6 +12,10 @@ CONFIG_CONSOLE=n
2012
CONFIG_CONSOLE_HANDLER=n
2113
CONFIG_UART_CONSOLE=n
2214
CONFIG_MCUBOOT_SERIAL=y
23-
2415
CONFIG_MCUBOOT_SERIAL_DIRECT_IMAGE_UPLOAD=y
2516
CONFIG_BOOT_SERIAL_IMG_GRP_IMAGE_STATE=y
17+
18+
CONFIG_PM_EXTERNAL_FLASH_MCUBOOT_SECONDARY=y
19+
CONFIG_PM_OVERRIDE_EXTERNAL_DRIVER_CHECK=y
20+
21+
CONFIG_FW_INFO_FIRMWARE_VERSION=2

0 commit comments

Comments
 (0)