esp32, esp32s2: move panic handling code to new component

sandsmark · Mar 10, 2020 · 2b10078 · 2b10078
1 parent a3816bc
commit 2b10078
Show file tree

Hide file tree

Showing 41 changed files with 1,264 additions and 1,551 deletions.
diff --git a/Kconfig b/Kconfig
@@ -133,7 +133,7 @@ mainmenu "Espressif IoT Development Framework Configuration"
                     CONFIG_APP_BUILD_TYPE_ELF_RAM=y
                     CONFIG_VFS_SUPPORT_TERMIOS=
                     CONFIG_NEWLIB_NANO_FORMAT=y
-                    CONFIG_ESP32_PANIC_PRINT_HALT=y
+                    CONFIG_ESP_SYSTEM_PANIC_PRINT_HALT=y
                     CONFIG_ESP32_DEBUG_STUBS_ENABLE=
                     CONFIG_ESP_ERR_TO_NAME_LOOKUP=
 

diff --git a/components/bootloader_support/src/esp32/bootloader_esp32.c b/components/bootloader_support/src/esp32/bootloader_esp32.c
@@ -414,7 +414,7 @@ static void bootloader_check_wdt_reset(void)
 
 void abort(void)
 {
-#if !CONFIG_ESP32_PANIC_SILENT_REBOOT
+#if !CONFIG_ESP_SYSTEM_PANIC_SILENT_REBOOT
     ets_printf("abort() was called at PC 0x%08x\r\n", (intptr_t)__builtin_return_address(0) - 3);
 #endif
     if (esp_cpu_in_ocd_debug_mode()) {

diff --git a/components/bootloader_support/src/esp32s2/bootloader_esp32s2.c b/components/bootloader_support/src/esp32s2/bootloader_esp32s2.c
@@ -330,7 +330,7 @@ static void bootloader_check_wdt_reset(void)
 
 void abort(void)
 {
-#if !CONFIG_ESP32S2_PANIC_SILENT_REBOOT
+#if !CONFIG_ESP_SYSTEM_PANIC_SILENT_REBOOT
     ets_printf("abort() was called at PC 0x%08x\r\n", (intptr_t)__builtin_return_address(0) - 3);
 #endif
     if (esp_cpu_in_ocd_debug_mode()) {

diff --git a/components/esp32/CMakeLists.txt b/components/esp32/CMakeLists.txt
@@ -18,12 +18,10 @@ else()
         "cpu_start.c"
         "crosscore_int.c"
         "dport_access.c"
-        "dport_panic_highint_hdl.S"
         "esp_himem.c"
         "hw_random.c"
         "int_wdt.c"
         "intr_alloc.c"
-        "panic.c"
         "pm_esp32.c"
         "pm_trace.c"
         "reset_reason.c"

diff --git a/components/esp32/Kconfig b/components/esp32/Kconfig
@@ -356,38 +356,6 @@ menu "ESP32-specific"
 
             Data is reserved at the beginning of RTC slow memory.
 
-    choice ESP32_PANIC
-        prompt "Panic handler behaviour"
-        default ESP32_PANIC_PRINT_REBOOT
-        help
-            If FreeRTOS detects unexpected behaviour or an unhandled exception, the panic handler is
-            invoked. Configure the panic handlers action here.
-
-        config ESP32_PANIC_PRINT_HALT
-            bool "Print registers and halt"
-            help
-                Outputs the relevant registers over the serial port and halt the
-                processor. Needs a manual reset to restart.
-
-        config ESP32_PANIC_PRINT_REBOOT
-            bool "Print registers and reboot"
-            help
-                Outputs the relevant registers over the serial port and immediately
-                reset the processor.
-
-        config ESP32_PANIC_SILENT_REBOOT
-            bool "Silent reboot"
-            help
-                Just resets the processor without outputting anything
-
-        config ESP32_PANIC_GDBSTUB
-            bool "Invoke GDBStub"
-            select ESP_GDBSTUB_ENABLED
-            help
-                Invoke gdbstub on the serial port, allowing for gdb to attach to it to do a postmortem
-                of the crash.
-    endchoice
-
     config ESP32_DEBUG_OCDAWARE
         bool "Make exception and panic handlers JTAG/OCD aware"
         default y

diff --git a/components/esp32/linker.lf b/components/esp32/linker.lf
@@ -1,8 +1,3 @@
-[mapping:esp32]
-archive: libesp32.a
-entries:
-    panic (noflash)
-
 [mapping:gcc]
 archive: libgcc.a
 entries: