From 633ead5dcbe14577c93b857702bc04fd5043dbb0 Mon Sep 17 00:00:00 2001 From: Renz Bagaporo Date: Tue, 9 Feb 2021 18:09:09 +0800 Subject: [PATCH] esp32: move coredump sections and schemes to espcoredump --- components/esp32/ld/esp32_fragments.lf | 20 --------------- components/esp32c3/ld/esp32c3_fragments.lf | 20 --------------- components/esp32s2/ld/esp32s2_fragments.lf | 15 ----------- components/esp32s3/ld/esp32s3_fragments.lf | 20 --------------- components/espcoredump/linker.lf | 30 ++++++++++++++++++++++ 5 files changed, 30 insertions(+), 75 deletions(-) diff --git a/components/esp32/ld/esp32_fragments.lf b/components/esp32/ld/esp32_fragments.lf index b4e1570f91..48e15baca5 100644 --- a/components/esp32/ld/esp32_fragments.lf +++ b/components/esp32/ld/esp32_fragments.lf @@ -48,22 +48,6 @@ entries: entries: .rtc.bss -[sections:rtc_fast_coredump] -entries: - .rtc.fast.coredump+ - -[sections:rtc_coredump] -entries: - .rtc.coredump+ - -[sections:dram_coredump] -entries: - .dram1.coredump+ - -[sections:iram_coredump] -entries: - .iram.data.coredump+ - [sections:iram] entries: .iram1+ @@ -108,10 +92,6 @@ entries: rtc_data -> rtc_data rtc_rodata -> rtc_data rtc_bss -> rtc_bss - dram_coredump -> dram_coredump - iram_coredump -> iram_coredump - rtc_coredump -> rtc_coredump - rtc_fast_coredump -> rtc_fast_coredump [scheme:rtc] entries: diff --git a/components/esp32c3/ld/esp32c3_fragments.lf b/components/esp32c3/ld/esp32c3_fragments.lf index c00feb474d..feea1ec538 100644 --- a/components/esp32c3/ld/esp32c3_fragments.lf +++ b/components/esp32c3/ld/esp32c3_fragments.lf @@ -36,22 +36,6 @@ entries: entries: .rtc.bss -[sections:rtc_fast_coredump] -entries: - .rtc.fast.coredump+ - -[sections:rtc_coredump] -entries: - .rtc.coredump+ - -[sections:dram_coredump] -entries: - .dram1.coredump+ - -[sections:iram_coredump] -entries: - .iram.data.coredump+ - [sections:iram] entries: .iram1+ @@ -87,10 +71,6 @@ entries: rtc_data -> rtc_data rtc_rodata -> rtc_data rtc_bss -> rtc_bss - dram_coredump -> dram_coredump - iram_coredump -> iram_coredump - rtc_coredump -> rtc_coredump - rtc_fast_coredump -> rtc_fast_coredump [scheme:rtc] entries: diff --git a/components/esp32s2/ld/esp32s2_fragments.lf b/components/esp32s2/ld/esp32s2_fragments.lf index bbd338305a..65f93737a9 100644 --- a/components/esp32s2/ld/esp32s2_fragments.lf +++ b/components/esp32s2/ld/esp32s2_fragments.lf @@ -36,18 +36,6 @@ entries: entries: .rtc.bss -[sections:rtc_fast_coredump] -entries: - .rtc.fast.coredump+ - -[sections:rtc_coredump] -entries: - .rtc.coredump+ - -[sections:dram_coredump] -entries: - .dram1.coredump+ - [sections:iram] entries: .iram1+ @@ -73,9 +61,6 @@ entries: rtc_data -> rtc_data rtc_rodata -> rtc_data rtc_bss -> rtc_bss - dram_coredump -> dram_coredump - rtc_coredump -> rtc_coredump - rtc_fast_coredump -> rtc_fast_coredump [scheme:rtc] entries: diff --git a/components/esp32s3/ld/esp32s3_fragments.lf b/components/esp32s3/ld/esp32s3_fragments.lf index c00feb474d..feea1ec538 100644 --- a/components/esp32s3/ld/esp32s3_fragments.lf +++ b/components/esp32s3/ld/esp32s3_fragments.lf @@ -36,22 +36,6 @@ entries: entries: .rtc.bss -[sections:rtc_fast_coredump] -entries: - .rtc.fast.coredump+ - -[sections:rtc_coredump] -entries: - .rtc.coredump+ - -[sections:dram_coredump] -entries: - .dram1.coredump+ - -[sections:iram_coredump] -entries: - .iram.data.coredump+ - [sections:iram] entries: .iram1+ @@ -87,10 +71,6 @@ entries: rtc_data -> rtc_data rtc_rodata -> rtc_data rtc_bss -> rtc_bss - dram_coredump -> dram_coredump - iram_coredump -> iram_coredump - rtc_coredump -> rtc_coredump - rtc_fast_coredump -> rtc_fast_coredump [scheme:rtc] entries: diff --git a/components/espcoredump/linker.lf b/components/espcoredump/linker.lf index 690a9d9aef..89b9dbcd50 100644 --- a/components/espcoredump/linker.lf +++ b/components/espcoredump/linker.lf @@ -1,3 +1,33 @@ +[sections:rtc_fast_coredump] +entries: + .rtc.fast.coredump+ + +[sections:rtc_coredump] +entries: + .rtc.coredump+ + +[sections:dram_coredump] +entries: + .dram1.coredump+ + +if IDF_TARGET_ESP32S2 = n: + [sections:iram_coredump] + entries: + .iram.data.coredump+ + +[scheme:coredump_default] +entries: + dram_coredump -> dram_coredump + rtc_coredump -> rtc_coredump + rtc_fast_coredump -> rtc_fast_coredump + if IDF_TARGET_ESP32S2 = n: + iram_coredump -> iram_coredump + +[mapping:coredump_default] +archive: * +entries: + * (coredump_default) + [mapping:espcoredump] archive: libespcoredump.a entries: