[nrf noup] boards: thingy91x: enable serial recovery

This patch disbales MCUBoot logging and enables serial recovery for the Thingy:91. Signed-off-by: Maximilian Deubel <[email protected]> Signed-off-by: Bernt Johan Damslora <[email protected]> (cherry picked from commit f67a11a)
voxelbotics · Jun 28, 2024 · 152f641 · 152f641
1 parent 0656a67
commit 152f641
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 2 deletions.
diff --git a/boot/zephyr/boards/thingy91x_nrf5340_cpuapp.conf b/boot/zephyr/boards/thingy91x_nrf5340_cpuapp.conf
@@ -32,7 +32,7 @@ CONFIG_USB_COMPOSITE_DEVICE=y
 CONFIG_USB_MASS_STORAGE=n
 CONFIG_USB_DEVICE_MANUFACTURER="Nordic Semiconductor"
 CONFIG_USB_DEVICE_VID=0x1915
-CONFIG_USB_DEVICE_PID=0x520F
+CONFIG_USB_DEVICE_PID=0x910A
 
 CONFIG_BOOT_SERIAL_BOOT_MODE=y
 
@@ -49,6 +49,12 @@ CONFIG_FLASH_SIMULATOR_DOUBLE_WRITES=y
 CONFIG_FLASH_SIMULATOR_STATS=n
 
 CONFIG_BOOT_IMAGE_ACCESS_HOOKS=y
-CONFIG_MCUBOOT_SERIAL_DIRECT_IMAGE_UPLOAD=y
 
+# Makes it possible to update the network core using the flash simulator
 CONFIG_NRF53_RECOVERY_NETWORK_CORE=y
+
+CONFIG_MCUBOOT_SERIAL_DIRECT_IMAGE_UPLOAD=y
+CONFIG_BOOT_SERIAL_IMG_GRP_IMAGE_STATE=y
+
+# Skip checks on the secondary image to make it possible to update MCUBoot on S1/S0
+CONFIG_MCUBOOT_VERIFY_IMG_ADDRESS=n
diff --git a/boot/zephyr/boards/thingy91x_nrf9151.conf b/boot/zephyr/boards/thingy91x_nrf9151.conf
@@ -6,3 +6,12 @@ CONFIG_SPI_NOR=y
 CONFIG_SPI_NOR_FLASH_LAYOUT_PAGE_SIZE=4096
 CONFIG_SPI_NOR_SFDP_DEVICETREE=y
 CONFIG_MULTITHREADING=y
+
+# Disable Zephyr console and use UART for MCUboot serial recovery instead
+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