Re-add panic.o to IRAM/DRAM.

diff --git a/components/esp32/ld/esp32.common.ld b/components/esp32/ld/esp32.common.ld
index 2226e9882542442bf29664a4523c84019dba0397..7b14b6da1f98152cca7b95abf05b291a543c39e8 100644 (file)
--- a/components/esp32/ld/esp32.common.ld
+++ b/components/esp32/ld/esp32.common.ld
@@ -47,6 +47,7 @@ SECTIONS
     _iram_text_start = ABSOLUTE(.);
     *(.iram1 .iram1.*)
     *libfreertos.a:(.literal .text .literal.* .text.*)
+    *libesp32.a:panic.o(.literal .text .literal.* .text.*)
     *libphy.a:(.literal .text .literal.* .text.*)
     *librtc.a:(.literal .text .literal.* .text.*)
     *libpp.a:(.literal .text .literal.* .text.*)
@@ -92,7 +93,7 @@ SECTIONS
     KEEP(*(.gnu.linkonce.s2.*))
     KEEP(*(.jcr))
     *(.dram1 .dram1.*)
-    *libfreertos.a:panic.o(.rodata .rodata.*)
+    *libesp32.a:panic.o(.rodata .rodata.*)
     _data_end = ABSOLUTE(.);
     . = ALIGN(4);
     _heap_start = ABSOLUTE(.);

diff --git a/components/esp32/panic.c b/components/esp32/panic.c
index c806dace2a0d667527f95751730076f6427eb8c9..c5d8aa669ea5f6805f846d18bf854d2ff230b73e 100644 (file)
--- a/components/esp32/panic.c
+++ b/components/esp32/panic.c
@@ -30,7 +30,7 @@
 
 #include "esp_gdbstub.h"
 #include "esp_panic.h"
-
+#include "esp_attr.h"
 
 /*
 Panic handlers; these get called when an unhandled exception occurs or the assembly-level
@@ -38,6 +38,10 @@ task switching / interrupt code runs into an unrecoverable error. The default ta
 overflow handler also is in here.
 */
 
+/*
+Note: The linker script will put everything in this file in IRAM/DRAM, so it also works with flash cache disabled.
+*/
+
 #if !CONFIG_ESP32_PANIC_SILENT_REBOOT
 //printf may be broken, so we fix our own printing fns...
 inline static void panicPutchar(char c) {