Merge pull request #20630 from benpicco/core_panic-reboot

core/panic: make reboot on panic configurable
RIOT-OS · Apr 26, 2024 · 420ee3f · 420ee3f
2 parents 70c70e2 + 9e0a32e
commit 420ee3f
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 1 deletion.
diff --git a/core/lib/include/panic.h b/core/lib/include/panic.h
@@ -28,6 +28,19 @@
 extern "C" {
 #endif
 
+/**
+ * @brief Automatically reboot the system on panic()
+ *
+ * By default this is on when @ref DEVELHELP is disabled.
+ */
+#ifndef CONFIG_CORE_REBOOT_ON_PANIC
+#ifdef DEVELHELP
+#define CONFIG_CORE_REBOOT_ON_PANIC (0)
+#else
+#define CONFIG_CORE_REBOOT_ON_PANIC (1)
+#endif
+#endif
+
 /**
  * @brief Definition of available panic modes
  */

diff --git a/core/lib/panic.c b/core/lib/panic.c
@@ -79,7 +79,7 @@ NORETURN void core_panic(core_panic_t crash_code, const char *message)
  /* disable watchdog and all possible sources of interrupts */
  irq_disable();
  panic_arch();
-#if !defined(DEVELHELP) && defined(MODULE_PERIPH_PM)
+#if CONFIG_CORE_REBOOT_ON_PANIC && defined(MODULE_PERIPH_PM)
  /* DEVELHELP not set => reboot system */
  pm_reboot();
 #else