espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-07-31 11:17:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

Coredump config option rename throughout IDF

Browse Source
This commit is contained in:
Mahavir Jain
2020-09-29 21:02:17 +05:30
parent bd19088125
commit 20af94ff53
18 changed files with 37 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
components/esp_system/panic.c
View File

@ -294,23 +294,23 @@ void esp_panic_handler(panic_info_t *info)
panic_print_str("Entering gdb stub now.\r\n"); panic_print_str("Entering gdb stub now.\r\n");
esp_gdbstub_panic_handler((XtExcFrame*) info->frame); esp_gdbstub_panic_handler((XtExcFrame*) info->frame);
#else #else
#if CONFIG_ESP32_ENABLE_COREDUMP #if CONFIG_ESP_COREDUMP_ENABLE
static bool s_dumping_core; static bool s_dumping_core;
if (s_dumping_core) { if (s_dumping_core) {
panic_print_str("Re-entered core dump! Exception happened during core dump!\r\n"); panic_print_str("Re-entered core dump! Exception happened during core dump!\r\n");
} else { } else {
disable_all_wdts(); disable_all_wdts();
s_dumping_core = true; s_dumping_core = true;
#if CONFIG_ESP32_ENABLE_COREDUMP_TO_FLASH #if CONFIG_ESP_COREDUMP_ENABLE_TO_FLASH
esp_core_dump_to_flash(info); esp_core_dump_to_flash(info);
#endif #endif
#if CONFIG_ESP32_ENABLE_COREDUMP_TO_UART && !CONFIG_ESP_SYSTEM_PANIC_SILENT_REBOOT #if CONFIG_ESP_COREDUMP_ENABLE_TO_UART && !CONFIG_ESP_SYSTEM_PANIC_SILENT_REBOOT
esp_core_dump_to_uart(info); esp_core_dump_to_uart(info);
#endif #endif
s_dumping_core = false; s_dumping_core = false;
reconfigure_all_wdts(); reconfigure_all_wdts();
} }
#endif /* CONFIG_ESP32_ENABLE_COREDUMP */ #endif /* CONFIG_ESP_COREDUMP_ENABLE */
wdt_hal_write_protect_disable(&rtc_wdt_ctx); wdt_hal_write_protect_disable(&rtc_wdt_ctx);
wdt_hal_disable(&rtc_wdt_ctx); wdt_hal_disable(&rtc_wdt_ctx);
wdt_hal_write_protect_enable(&rtc_wdt_ctx); wdt_hal_write_protect_enable(&rtc_wdt_ctx);

2
components/esp_system/startup.c
View File

@ -373,7 +373,7 @@ IRAM_ATTR ESP_SYSTEM_INIT_FN(init_components0, BIT(0))
esp_pm_impl_init(); esp_pm_impl_init();
#endif #endif
#if CONFIG_ESP_ENABLE_COREDUMP #if CONFIG_ESP_COREDUMP_ENABLE
esp_core_dump_init(); esp_core_dump_init();
#endif #endif

2
components/esptool_py/Makefile.projbuild
View File

@ -149,7 +149,7 @@ simple_monitor: $(call prereq_if_explicit,%flash) | check_python_dependencies
PRINT_FILTER ?= PRINT_FILTER ?=
MONITOR_CORE_DUMP_DECODE_ARG ?= MONITOR_CORE_DUMP_DECODE_ARG ?=
MONITOR_CORE_DUMP_DECODE = $(call dequote,$(CONFIG_ESP32_CORE_DUMP_DECODE)) MONITOR_CORE_DUMP_DECODE = $(call dequote,$(CONFIG_ESP_COREDUMP_DECODE))
ifneq ("$(MONITOR_CORE_DUMP_DECODE)","") ifneq ("$(MONITOR_CORE_DUMP_DECODE)","")
MONITOR_CORE_DUMP_DECODE_ARG = --decode-coredumps $(MONITOR_CORE_DUMP_DECODE) MONITOR_CORE_DUMP_DECODE_ARG = --decode-coredumps $(MONITOR_CORE_DUMP_DECODE)
endif endif

4
components/freertos/Kconfig
View File

@ -174,8 +174,8 @@ menu "FreeRTOS"
config FREERTOS_ISR_STACKSIZE config FREERTOS_ISR_STACKSIZE
int "ISR stack size" int "ISR stack size"
range 2096 32768 if ESP32_COREDUMP_DATA_FORMAT_ELF range 2096 32768 if ESP_COREDUMP_DATA_FORMAT_ELF
default 2096 if ESP32_COREDUMP_DATA_FORMAT_ELF default 2096 if ESP_COREDUMP_DATA_FORMAT_ELF
range 1536 32768 range 1536 32768
default 1536 default 1536
help help

2
components/freertos/xtensa/include/freertos/FreeRTOSConfig.h
View File

@ -319,7 +319,7 @@ extern void vPortCleanUpTCB ( void *pxTCB );
#define configXT_BOARD 1 /* Board mode */ #define configXT_BOARD 1 /* Board mode */
#define configXT_SIMULATOR 0 #define configXT_SIMULATOR 0
#if CONFIG_ESP32_ENABLE_COREDUMP #if CONFIG_ESP_COREDUMP_ENABLE
#define configENABLE_TASK_SNAPSHOT 1 #define configENABLE_TASK_SNAPSHOT 1
#endif #endif
#ifndef configENABLE_TASK_SNAPSHOT #ifndef configENABLE_TASK_SNAPSHOT

2
components/mdns/test_afl_fuzz_host/sdkconfig.h
View File

@ -151,7 +151,7 @@
#define CONFIG_ESP32_PHY_CALIBRATION_AND_DATA_STORAGE 1 #define CONFIG_ESP32_PHY_CALIBRATION_AND_DATA_STORAGE 1
#define CONFIG_ESP32_PHY_MAX_WIFI_TX_POWER 20 #define CONFIG_ESP32_PHY_MAX_WIFI_TX_POWER 20
#define CONFIG_ESP32_PHY_MAX_TX_POWER 20 #define CONFIG_ESP32_PHY_MAX_TX_POWER 20
#define CONFIG_ESP32_ENABLE_COREDUMP_TO_NONE 1 #define CONFIG_ESP_COREDUMP_ENABLE_TO_NONE 1
#define CONFIG_FATFS_CODEPAGE_437 1 #define CONFIG_FATFS_CODEPAGE_437 1
#define CONFIG_FATFS_CODEPAGE 437 #define CONFIG_FATFS_CODEPAGE 437
#define CONFIG_FATFS_LFN_NONE 1 #define CONFIG_FATFS_LFN_NONE 1

8
components/partition_table/Kconfig.projbuild
View File

@ -29,10 +29,10 @@ menu "Partition Table"
config PARTITION_TABLE_FILENAME config PARTITION_TABLE_FILENAME
string string
default "partitions_singleapp.csv" if PARTITION_TABLE_SINGLE_APP && !ESP32_ENABLE_COREDUMP_TO_FLASH default "partitions_singleapp.csv" if PARTITION_TABLE_SINGLE_APP && !ESP_COREDUMP_ENABLE_TO_FLASH
default "partitions_singleapp_coredump.csv" if PARTITION_TABLE_SINGLE_APP && ESP32_ENABLE_COREDUMP_TO_FLASH default "partitions_singleapp_coredump.csv" if PARTITION_TABLE_SINGLE_APP && ESP_COREDUMP_ENABLE_TO_FLASH
default "partitions_two_ota.csv" if PARTITION_TABLE_TWO_OTA && !ESP32_ENABLE_COREDUMP_TO_FLASH default "partitions_two_ota.csv" if PARTITION_TABLE_TWO_OTA && !ESP_COREDUMP_ENABLE_TO_FLASH
default "partitions_two_ota_coredump.csv" if PARTITION_TABLE_TWO_OTA && ESP32_ENABLE_COREDUMP_TO_FLASH default "partitions_two_ota_coredump.csv" if PARTITION_TABLE_TWO_OTA && ESP_COREDUMP_ENABLE_TO_FLASH
default PARTITION_TABLE_CUSTOM_FILENAME if PARTITION_TABLE_CUSTOM default PARTITION_TABLE_CUSTOM_FILENAME if PARTITION_TABLE_CUSTOM
config PARTITION_TABLE_OFFSET config PARTITION_TABLE_OFFSET

4
docs/en/api-guides/core_dump.rst
View File

@ -122,7 +122,7 @@ Supported notations and RAM regions
Example Example
^^^^^^^ ^^^^^^^
1. In :ref:`project-configuration-menu`, enable :ref:`COREDUMP TO FLASH <CONFIG_ESP32_COREDUMP_TO_FLASH_OR_UART>`, then save and exit. 1. In :ref:`project-configuration-menu`, enable :ref:`COREDUMP TO FLASH <CONFIG_ESP_COREDUMP_TO_FLASH_OR_UART>`, then save and exit.
2. In your project, create a global variable in DRAM area as such as: 2. In your project, create a global variable in DRAM area as such as:
@ -175,4 +175,4 @@ Generic command syntax:
* --save-core,-s SAVE_CORE. Save core to file. Othwerwise temporary core file will be deleted. Ignored with "-c". * --save-core,-s SAVE_CORE. Save core to file. Othwerwise temporary core file will be deleted. Ignored with "-c".
* --rom-elf,-r ROM_ELF. Path to ROM ELF file to use (if skipped "esp32_rom.elf" is used). * --rom-elf,-r ROM_ELF. Path to ROM ELF file to use (if skipped "esp32_rom.elf" is used).
* --print-mem,-m Print memory dump. Used only with "info_corefile". * --print-mem,-m Print memory dump. Used only with "info_corefile".
* <prog> Path to program ELF file. * <prog> Path to program ELF file.

2
docs/zh_CN/api-guides/fatal-errors.rst
View File

@ -62,7 +62,7 @@
- 如果 :ref:`CONFIG_{IDF_TARGET_CFG_PREFIX}_DEBUG_OCDAWARE` 被使能了（默认），紧急处理程序会检测 {IDF_TARGET_NAME} 是否已经连接 JTAG 调试器。如果检测成功，程序会暂停运行，并将控制权交给调试器。在这种情况下，寄存器和回溯不会被打印到控制台，并且也不会使用 GDB Stub 和 Core Dump 的功能。 - 如果 :ref:`CONFIG_{IDF_TARGET_CFG_PREFIX}_DEBUG_OCDAWARE` 被使能了（默认），紧急处理程序会检测 {IDF_TARGET_NAME} 是否已经连接 JTAG 调试器。如果检测成功，程序会暂停运行，并将控制权交给调试器。在这种情况下，寄存器和回溯不会被打印到控制台，并且也不会使用 GDB Stub 和 Core Dump 的功能。
- 如果使能了 :doc:`Core Dump <core_dump>` 功能（``CONFIG_ESP32_ENABLE_COREDUMP_TO_FLASH`` 或者 ``CONFIG_ESP32_ENABLE_COREDUMP_TO_UART`` 选项），系统状态（任务堆栈和寄存器）会被转储到 Flash 或者 UART 以供后续分析。 - 如果使能了 :doc:`Core Dump <core_dump>` 功能（``CONFIG_ESP_COREDUMP_ENABLE_TO_FLASH`` 或者 ``CONFIG_ESP_COREDUMP_ENABLE_TO_UART`` 选项），系统状态（任务堆栈和寄存器）会被转储到 Flash 或者 UART 以供后续分析。
下图展示了紧急处理程序的行为： 下图展示了紧急处理程序的行为：

2
examples/bluetooth/bluedroid/ble/ble_throughput/throughput_client/sdkconfig.defaults
View File

@ -18,5 +18,5 @@ CONFIG_ESPTOOLPY_MONITOR_BAUD=921600
# ESP32-specific # ESP32-specific
# #
CONFIG_ESP32_TRACEMEM_RESERVE_DRAM=0x0 CONFIG_ESP32_TRACEMEM_RESERVE_DRAM=0x0
CONFIG_ESP32_ENABLE_COREDUMP_TO_NONE=y CONFIG_ESP_COREDUMP_ENABLE_TO_NONE=y
CONFIG_ESP_CONSOLE_UART_BAUDRATE=921600 CONFIG_ESP_CONSOLE_UART_BAUDRATE=921600

2
examples/bluetooth/bluedroid/ble/ble_throughput/throughput_server/sdkconfig.defaults
View File

@ -18,5 +18,5 @@ CONFIG_ESPTOOLPY_MONITOR_BAUD=921600
# ESP32-specific # ESP32-specific
# #
CONFIG_ESP32_TRACEMEM_RESERVE_DRAM=0x0 CONFIG_ESP32_TRACEMEM_RESERVE_DRAM=0x0
CONFIG_ESP32_ENABLE_COREDUMP_TO_NONE=y CONFIG_ESP_COREDUMP_ENABLE_TO_NONE=y
CONFIG_ESP_CONSOLE_UART_BAUDRATE=921600 CONFIG_ESP_CONSOLE_UART_BAUDRATE=921600

2
tools/idf_py_actions/serial_ext.py
View File

@ -90,7 +90,7 @@ def action_extensions(base_actions, project_path):
monitor_args += ["-b", monitor_baud] monitor_args += ["-b", monitor_baud]
monitor_args += ["--toolchain-prefix", project_desc["monitor_toolprefix"]] monitor_args += ["--toolchain-prefix", project_desc["monitor_toolprefix"]]
coredump_decode = get_sdkconfig_value(project_desc["config_file"], "CONFIG_ESP32_CORE_DUMP_DECODE") coredump_decode = get_sdkconfig_value(project_desc["config_file"], "CONFIG_ESP_COREDUMP_DECODE")
if coredump_decode is not None: if coredump_decode is not None:
monitor_args += ["--decode-coredumps", coredump_decode] monitor_args += ["--decode-coredumps", coredump_decode]

8
tools/ldgen/samples/sdkconfig
View File

@ -139,10 +139,10 @@ CONFIG_ESP32_MEMMAP_TRACEMEM=
CONFIG_ESP32_MEMMAP_TRACEMEM_TWOBANKS= CONFIG_ESP32_MEMMAP_TRACEMEM_TWOBANKS=
CONFIG_ESP32_TRAX= CONFIG_ESP32_TRAX=
CONFIG_ESP32_TRACEMEM_RESERVE_DRAM=0x0 CONFIG_ESP32_TRACEMEM_RESERVE_DRAM=0x0
CONFIG_ESP32_ENABLE_COREDUMP_TO_FLASH= CONFIG_ESP_COREDUMP_ENABLE_TO_FLASH=
CONFIG_ESP32_ENABLE_COREDUMP_TO_UART= CONFIG_ESP_COREDUMP_ENABLE_TO_UART=
CONFIG_ESP32_ENABLE_COREDUMP_TO_NONE=y CONFIG_ESP_COREDUMP_ENABLE_TO_NONE=y
CONFIG_ESP32_ENABLE_COREDUMP= CONFIG_ESP_COREDUMP_ENABLE=
CONFIG_ESP32_UNIVERSAL_MAC_ADDRESSES_TWO= CONFIG_ESP32_UNIVERSAL_MAC_ADDRESSES_TWO=
CONFIG_ESP32_UNIVERSAL_MAC_ADDRESSES_FOUR=y CONFIG_ESP32_UNIVERSAL_MAC_ADDRESSES_FOUR=y
CONFIG_ESP32_UNIVERSAL_MAC_ADDRESSES=4 CONFIG_ESP32_UNIVERSAL_MAC_ADDRESSES=4

2
tools/test_apps/system/monitor_ide_integration/sdkconfig.ci.coredump
View File

@ -1 +1 @@
CONFIG_ESP32_ENABLE_COREDUMP_TO_UART=y CONFIG_ESP_COREDUMP_ENABLE_TO_UART=y

6
tools/test_apps/system/panic/sdkconfig.ci.coredump_flash_bin_crc
View File

@ -1,3 +1,3 @@
CONFIG_ESP32_ENABLE_COREDUMP_TO_FLASH=y CONFIG_ESP_COREDUMP_ENABLE_TO_FLASH=y
CONFIG_ESP32_COREDUMP_DATA_FORMAT_BIN=y CONFIG_ESP_COREDUMP_DATA_FORMAT_BIN=y
CONFIG_ESP32_COREDUMP_CHECKSUM_CRC32=y CONFIG_ESP_COREDUMP_CHECKSUM_CRC32=y

6
tools/test_apps/system/panic/sdkconfig.ci.coredump_flash_elf_sha
View File

@ -1,4 +1,4 @@
CONFIG_IDF_TARGET="esp32" CONFIG_IDF_TARGET="esp32"
CONFIG_ESP32_ENABLE_COREDUMP_TO_FLASH=y CONFIG_ESP_COREDUMP_ENABLE_TO_FLASH=y
CONFIG_ESP32_COREDUMP_DATA_FORMAT_ELF=y CONFIG_ESP_COREDUMP_DATA_FORMAT_ELF=y
CONFIG_ESP32_COREDUMP_CHECKSUM_SHA256=y CONFIG_ESP_COREDUMP_CHECKSUM_SHA256=y

6
tools/test_apps/system/panic/sdkconfig.ci.coredump_uart_bin_crc
View File

@ -1,3 +1,3 @@
CONFIG_ESP32_ENABLE_COREDUMP_TO_UART=y CONFIG_ESP_COREDUMP_ENABLE_TO_UART=y
CONFIG_ESP32_COREDUMP_DATA_FORMAT_BIN=y CONFIG_ESP_COREDUMP_DATA_FORMAT_BIN=y
CONFIG_ESP32_COREDUMP_CHECKSUM_CRC32=y CONFIG_ESP_COREDUMP_CHECKSUM_CRC32=y

6
tools/test_apps/system/panic/sdkconfig.ci.coredump_uart_elf_crc
View File

@ -1,3 +1,3 @@
CONFIG_ESP32_ENABLE_COREDUMP_TO_UART=y CONFIG_ESP_COREDUMP_ENABLE_TO_UART=y
CONFIG_ESP32_COREDUMP_DATA_FORMAT_ELF=y CONFIG_ESP_COREDUMP_DATA_FORMAT_ELF=y
CONFIG_ESP32_COREDUMP_CHECKSUM_CRC32=y CONFIG_ESP_COREDUMP_CHECKSUM_CRC32=y