tests: mcuboot_recovery_retention: use UARTE1 for device management

The test requires two UARTs: one for console output and one for device
management. Use UART1 for device management instead of CDC ACM because
the legacy stack is deprecated and it will take some time for MCUboot to
adapt.

Signed-off-by: Johann Fischer <[email protected]>

Author: jfischer-no

tests/boot/mcuboot_recovery_retention/boards/nrf52840dk_nrf52840.overlay

@@ -2,16 +2,12 @@
 
 / {
 	chosen {
-		zephyr,uart-mcumgr = &cdc_acm_uart;
+		zephyr,uart-mcumgr = &uart1;
 	};
 };
 
-&zephyr_udc0 {
+&uart1 {
 	status = "okay";
-
-	cdc_acm_uart: cdc_acm_uart {
-		compatible = "zephyr,cdc-acm-uart";
-	};
 };
 
 /delete-node/ &boot_partition;

tests/boot/mcuboot_recovery_retention/boards/nrf52840dk_nrf52840_mem.overlay

@@ -26,16 +26,12 @@
 
 	chosen {
 		zephyr,boot-mode = &boot_mode0;
-		zephyr,uart-mcumgr = &cdc_acm_uart;
+		zephyr,uart-mcumgr = &uart1;
 	};
 };
 
-&zephyr_udc0 {
+&uart1 {
 	status = "okay";
-
-	cdc_acm_uart: cdc_acm_uart {
-		compatible = "zephyr,cdc-acm-uart";
-	};
 };
 
 /delete-node/ &gpregret1;

tests/boot/mcuboot_recovery_retention/sysbuild/mcuboot/boards/nrf52840dk_nrf52840.overlay

@@ -7,8 +7,6 @@
 	};
 };
 
-&zephyr_udc0 {
-	cdc_acm_uart0 {
-		compatible = "zephyr,cdc-acm-uart";
-	};
+&uart1 {
+	status = "okay";
 };

tests/boot/mcuboot_recovery_retention/sysbuild/mcuboot/boards/nrf52840dk_nrf52840_mem.overlay

@@ -4,11 +4,10 @@
 / {
 	chosen {
 		zephyr,code-partition = &boot_partition;
+		zephyr,uart-mcumgr = &uart1;
 	};
 };
 
-&zephyr_udc0 {
-	cdc_acm_uart0 {
-		compatible = "zephyr,cdc-acm-uart";
-	};
+&uart1 {
+	status = "okay";
 };

tests/boot/mcuboot_recovery_retention/sysbuild/mcuboot/prj.conf

@@ -1,5 +1,5 @@
 CONFIG_MCUBOOT_SERIAL=y
-CONFIG_BOOT_SERIAL_CDC_ACM=y
+CONFIG_BOOT_SERIAL_UART=y
 CONFIG_BOOT_SERIAL_ENTRANCE_GPIO=n
 CONFIG_BOOT_SERIAL_BOOT_MODE=y
 CONFIG_RETAINED_MEM=y
@@ -9,3 +9,4 @@ CONFIG_FLASH=y
 CONFIG_FLASH_MAP=y
 CONFIG_LOG=y
 CONFIG_MCUBOOT_ACTION_HOOKS=y
+CONFIG_MULTITHREADING=y