commit 35941feacd0650bc3e7dc72e7490d589367d553c
author Jamie McCrae <jamie.mccrae@nordicsemi.no> Tue Mar 28 10:04:18 2023 +0100
committer Dominik Ermel <56024351+de-nordic@users.noreply.github.com> Thu Apr 13 20:07:55 2023 +0200
tree 798bcfeffd308ba7b7f2caab884ecf6757f9c965
parent fd79db3a9f5c057ceadb3fe6ef52479636ab4cda

boot: zephyr: Add pin reset serial recovery entrance method

Adds an optional method for entering serial recovery mode by use
of a pin reset.

Signed-off-by: Jamie McCrae <jamie.mccrae@nordicsemi.no>

boot/zephyr/main.c

diff --git a/boot/zephyr/main.c b/boot/zephyr/main.c
index 4a672fd..3f6a87b 100644
--- a/boot/zephyr/main.c
+++ b/boot/zephyr/main.c
@@ -64,6 +64,10 @@
 #include <arm_cleanup.h>
 #endif
 
+#ifdef CONFIG_BOOT_SERIAL_PIN_RESET
+#include <zephyr/drivers/hwinfo.h>
+#endif
+
 /* CONFIG_LOG_MINIMAL is the legacy Kconfig property,
  * replaced by CONFIG_LOG_MODE_MINIMAL.
  */
@@ -129,7 +133,8 @@
 #if !defined(CONFIG_BOOT_SERIAL_ENTRANCE_GPIO) && \
     !defined(CONFIG_BOOT_SERIAL_WAIT_FOR_DFU) && \
     !defined(CONFIG_BOOT_SERIAL_BOOT_MODE) && \
-    !defined(CONFIG_BOOT_SERIAL_NO_APPLICATION)
+    !defined(CONFIG_BOOT_SERIAL_NO_APPLICATION) && \
+    !defined(CONFIG_BOOT_SERIAL_PIN_RESET)
 #error "Serial recovery selected without an entrance mode set"
 #endif
 #endif
@@ -481,6 +486,10 @@
     int32_t boot_mode;
 #endif
 
+#ifdef CONFIG_BOOT_SERIAL_PIN_RESET
+    uint32_t reset_cause;
+#endif
+
     MCUBOOT_WATCHDOG_FEED();
 
 #if !defined(MCUBOOT_DIRECT_XIP)
@@ -519,6 +528,25 @@
     }
 #endif
 
+#ifdef CONFIG_BOOT_SERIAL_PIN_RESET
+    rc = hwinfo_get_reset_cause(&reset_cause);
+
+    if (rc == 0 && reset_cause == RESET_PIN) {
+#ifdef CONFIG_MCUBOOT_INDICATION_LED
+        gpio_pin_set_dt(&led0, 1);
+#endif
+
+        mcuboot_status_change(MCUBOOT_STATUS_SERIAL_DFU_ENTERED);
+        (void)hwinfo_clear_reset_cause();
+
+        BOOT_LOG_INF("Enter the serial recovery mode");
+        rc = boot_console_init();
+        __ASSERT(rc == 0, "Error initializing boot console.\n");
+        boot_serial_start(&boot_funcs);
+        __ASSERT(0, "Bootloader serial process was terminated unexpectedly.\n");
+    }
+#endif
+
 #if defined(CONFIG_BOOT_USB_DFU_GPIO)
     if (detect_pin()) {
 #ifdef CONFIG_MCUBOOT_INDICATION_LED