Merge branch 'fix/esp32c2-gdbstub-runtime' into 'master'

fix(freertos): enable esp32c2 runtime-gdbstub

See merge request espressif/esp-idf!24858
This commit is contained in:
Alexey Lapshin 2023-07-28 15:41:07 +08:00
commit 5f07ed87f6
4 changed files with 7 additions and 10 deletions

View File

@ -43,9 +43,13 @@ menu "ESP System Settings"
config ESP_SYSTEM_GDBSTUB_RUNTIME config ESP_SYSTEM_GDBSTUB_RUNTIME
bool "GDBStub at runtime" bool "GDBStub at runtime"
select ESP_GDBSTUB_ENABLED select ESP_GDBSTUB_ENABLED
depends on !IDF_TARGET_ESP32C2
help help
Invoke gdbstub on the serial port, allowing for gdb to attach to it and to do a debug on runtime. Enable GDBStub inclusion into firmware.
This allows to debug the target device using serial port:
- Run 'idf.py monitor'.
- Wait for the device to initialize.
- Press Ctrl+C to interrupt the execution and enter GDB attached to your device for debugging.
NOTE: all UART input will be handled by GDBStub.
endchoice endchoice
config ESP_SYSTEM_PANIC_REBOOT_DELAY_SECONDS config ESP_SYSTEM_PANIC_REBOOT_DELAY_SECONDS

View File

@ -75,7 +75,7 @@ void esp_startup_start_app(void)
// Initialize the cross-core interrupt on CPU0 // Initialize the cross-core interrupt on CPU0
esp_crosscore_int_init(); esp_crosscore_int_init();
#if CONFIG_ESP_SYSTEM_GDBSTUB_RUNTIME && !CONFIG_IDF_TARGET_ESP32C2 #if CONFIG_ESP_SYSTEM_GDBSTUB_RUNTIME
void esp_gdbstub_init(void); void esp_gdbstub_init(void);
esp_gdbstub_init(); esp_gdbstub_init();
#endif // CONFIG_ESP_SYSTEM_GDBSTUB_RUNTIME #endif // CONFIG_ESP_SYSTEM_GDBSTUB_RUNTIME

View File

@ -130,12 +130,6 @@ tools/test_apps/system/gdb_loadable_elf:
temporary: true temporary: true
reason: target esp32c6, esp32h2 is not supported yet reason: target esp32c6, esp32h2 is not supported yet
tools/test_apps/system/gdbstub_runtime:
disable_test:
- if: IDF_TARGET in ["esp32c2", "esp32h2"]
temporary: true
reason: resolve IDF-7264
tools/test_apps/system/longjmp_test: tools/test_apps/system/longjmp_test:
enable: enable:
- if: IDF_TARGET in ["esp32", "esp32s2", "esp32s3"] - if: IDF_TARGET in ["esp32", "esp32s2", "esp32s3"]

View File

@ -11,7 +11,6 @@ from test_panic_util import PanicTestDut # noqa: E402
@pytest.mark.supported_targets @pytest.mark.supported_targets
@pytest.mark.temp_skip_ci(targets=['esp32c2', 'esp32h2'], reason='resolve IDF-7264')
@pytest.mark.generic @pytest.mark.generic
def test_gdbstub_runtime(dut: PanicTestDut) -> None: def test_gdbstub_runtime(dut: PanicTestDut) -> None:
dut.expect_exact('tested app is runnig.') dut.expect_exact('tested app is runnig.')