From 9cd9fa55b5c6c02044d79d55c52f54eeca88c6df Mon Sep 17 00:00:00 2001 From: Maximilian Deubel Date: Wed, 23 Oct 2024 17:02:10 +0200 Subject: [PATCH] treewide: update thingy91x bootloader setup Use production setup of thingy91x bootloader configuration. Signed-off-by: Maximilian Deubel --- .../sysbuild/mcuboot/boards/thingy91x_nrf9151.conf | 2 ++ .../mcuboot/boards/thingy91x_nrf9151.overlay | 4 ++++ .../mcuboot/boards/thingy91x_nrf5340_cpuapp.conf | 2 ++ .../sysbuild/mcuboot/boards/thingy91x_nrf9151.conf | 5 +++++ .../mcuboot/boards/thingy91x_nrf9151.overlay | 4 ++++ .../sysbuild/mcuboot/boards/thingy91x_nrf9151.conf | 5 +++++ .../mcuboot/boards/thingy91x_nrf9151.overlay | 4 ++++ .../sysbuild/mcuboot/boards/thingy91x_nrf9151.conf | 5 +++++ .../mcuboot/boards/thingy91x_nrf9151.overlay | 4 ++++ .../sysbuild/mcuboot/boards/thingy91x_nrf9151.conf | 14 +++++--------- .../mcuboot/boards/thingy91x_nrf9151.overlay | 4 ++++ west.yml | 2 +- 12 files changed, 45 insertions(+), 10 deletions(-) create mode 100644 applications/asset_tracker_v2/sysbuild/mcuboot/boards/thingy91x_nrf9151.overlay create mode 100644 applications/serial_lte_modem/sysbuild/mcuboot/boards/thingy91x_nrf9151.overlay create mode 100644 samples/cellular/nrf_cloud_multi_service/sysbuild/mcuboot/boards/thingy91x_nrf9151.overlay create mode 100644 samples/net/aws_iot/sysbuild/mcuboot/boards/thingy91x_nrf9151.overlay create mode 100644 samples/wifi/shell/sysbuild/mcuboot/boards/thingy91x_nrf9151.overlay diff --git a/applications/asset_tracker_v2/sysbuild/mcuboot/boards/thingy91x_nrf9151.conf b/applications/asset_tracker_v2/sysbuild/mcuboot/boards/thingy91x_nrf9151.conf index 5558a0e48d4..7c2042de649 100644 --- a/applications/asset_tracker_v2/sysbuild/mcuboot/boards/thingy91x_nrf9151.conf +++ b/applications/asset_tracker_v2/sysbuild/mcuboot/boards/thingy91x_nrf9151.conf @@ -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 diff --git a/applications/asset_tracker_v2/sysbuild/mcuboot/boards/thingy91x_nrf9151.overlay b/applications/asset_tracker_v2/sysbuild/mcuboot/boards/thingy91x_nrf9151.overlay new file mode 100644 index 00000000000..7f2818c0d28 --- /dev/null +++ b/applications/asset_tracker_v2/sysbuild/mcuboot/boards/thingy91x_nrf9151.overlay @@ -0,0 +1,4 @@ +&uart0 { + status = "okay"; + current-speed = < 1000000 >; +}; diff --git a/applications/connectivity_bridge/sysbuild/mcuboot/boards/thingy91x_nrf5340_cpuapp.conf b/applications/connectivity_bridge/sysbuild/mcuboot/boards/thingy91x_nrf5340_cpuapp.conf index 8bbd4ddf945..b2d427d17a8 100644 --- a/applications/connectivity_bridge/sysbuild/mcuboot/boards/thingy91x_nrf5340_cpuapp.conf +++ b/applications/connectivity_bridge/sysbuild/mcuboot/boards/thingy91x_nrf5340_cpuapp.conf @@ -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 diff --git a/applications/serial_lte_modem/sysbuild/mcuboot/boards/thingy91x_nrf9151.conf b/applications/serial_lte_modem/sysbuild/mcuboot/boards/thingy91x_nrf9151.conf index d8ebd794fa1..7c2042de649 100644 --- a/applications/serial_lte_modem/sysbuild/mcuboot/boards/thingy91x_nrf9151.conf +++ b/applications/serial_lte_modem/sysbuild/mcuboot/boards/thingy91x_nrf9151.conf @@ -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 diff --git a/applications/serial_lte_modem/sysbuild/mcuboot/boards/thingy91x_nrf9151.overlay b/applications/serial_lte_modem/sysbuild/mcuboot/boards/thingy91x_nrf9151.overlay new file mode 100644 index 00000000000..7f2818c0d28 --- /dev/null +++ b/applications/serial_lte_modem/sysbuild/mcuboot/boards/thingy91x_nrf9151.overlay @@ -0,0 +1,4 @@ +&uart0 { + status = "okay"; + current-speed = < 1000000 >; +}; diff --git a/samples/cellular/nrf_cloud_multi_service/sysbuild/mcuboot/boards/thingy91x_nrf9151.conf b/samples/cellular/nrf_cloud_multi_service/sysbuild/mcuboot/boards/thingy91x_nrf9151.conf index d8ebd794fa1..7c2042de649 100644 --- a/samples/cellular/nrf_cloud_multi_service/sysbuild/mcuboot/boards/thingy91x_nrf9151.conf +++ b/samples/cellular/nrf_cloud_multi_service/sysbuild/mcuboot/boards/thingy91x_nrf9151.conf @@ -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 diff --git a/samples/cellular/nrf_cloud_multi_service/sysbuild/mcuboot/boards/thingy91x_nrf9151.overlay b/samples/cellular/nrf_cloud_multi_service/sysbuild/mcuboot/boards/thingy91x_nrf9151.overlay new file mode 100644 index 00000000000..7f2818c0d28 --- /dev/null +++ b/samples/cellular/nrf_cloud_multi_service/sysbuild/mcuboot/boards/thingy91x_nrf9151.overlay @@ -0,0 +1,4 @@ +&uart0 { + status = "okay"; + current-speed = < 1000000 >; +}; diff --git a/samples/net/aws_iot/sysbuild/mcuboot/boards/thingy91x_nrf9151.conf b/samples/net/aws_iot/sysbuild/mcuboot/boards/thingy91x_nrf9151.conf index d8ebd794fa1..7c2042de649 100644 --- a/samples/net/aws_iot/sysbuild/mcuboot/boards/thingy91x_nrf9151.conf +++ b/samples/net/aws_iot/sysbuild/mcuboot/boards/thingy91x_nrf9151.conf @@ -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 diff --git a/samples/net/aws_iot/sysbuild/mcuboot/boards/thingy91x_nrf9151.overlay b/samples/net/aws_iot/sysbuild/mcuboot/boards/thingy91x_nrf9151.overlay new file mode 100644 index 00000000000..7f2818c0d28 --- /dev/null +++ b/samples/net/aws_iot/sysbuild/mcuboot/boards/thingy91x_nrf9151.overlay @@ -0,0 +1,4 @@ +&uart0 { + status = "okay"; + current-speed = < 1000000 >; +}; diff --git a/samples/wifi/shell/sysbuild/mcuboot/boards/thingy91x_nrf9151.conf b/samples/wifi/shell/sysbuild/mcuboot/boards/thingy91x_nrf9151.conf index 1d0e3fb5273..7c2042de649 100644 --- a/samples/wifi/shell/sysbuild/mcuboot/boards/thingy91x_nrf9151.conf +++ b/samples/wifi/shell/sysbuild/mcuboot/boards/thingy91x_nrf9151.conf @@ -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 @@ -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 diff --git a/samples/wifi/shell/sysbuild/mcuboot/boards/thingy91x_nrf9151.overlay b/samples/wifi/shell/sysbuild/mcuboot/boards/thingy91x_nrf9151.overlay new file mode 100644 index 00000000000..7f2818c0d28 --- /dev/null +++ b/samples/wifi/shell/sysbuild/mcuboot/boards/thingy91x_nrf9151.overlay @@ -0,0 +1,4 @@ +&uart0 { + status = "okay"; + current-speed = < 1000000 >; +}; diff --git a/west.yml b/west.yml index 8edce323fb3..254690e40ab 100644 --- a/west.yml +++ b/west.yml @@ -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