Crash_Override/OVMS3-idf
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch 'bugfix/esp32s2beta_uxTopUsedPriority' into 'master'

Browse source 
freertos: fix defining uxTopUsedPriority for esp32s2beta

See merge request espressif/esp-idf!6378
This commit is contained in:
Ivan Grokhotkov 2019-11-01 18:51:00 +08:00
parent d7e9d87aef faa219acdb
commit 28b10e633d
6 changed files with 15 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
components/esp32/Kconfig
View file

@ -381,6 +381,7 @@ menu "ESP32-specific"
config ESP32_DEBUG_OCDAWARE
bool "Make exception and panic handlers JTAG/OCD aware"
default y
select FREERTOS_DEBUG_OCDAWARE
help
The FreeRTOS panic and unhandled exception handers can detect a JTAG OCD debugger and
instead of panicking, have the debugger stop on the offending instruction.

1
components/esp32s2beta/Kconfig
View file

@ -346,6 +346,7 @@ menu "ESP32S2-specific"
config ESP32S2_DEBUG_OCDAWARE
bool "Make exception and panic handlers JTAG/OCD aware"
default y
select FREERTOS_DEBUG_OCDAWARE
help
The FreeRTOS panic and unhandled exception handers can detect a JTAG OCD debugger and
instead of panicking, have the debugger stop on the offending instruction.

4
components/freertos/CMakeLists.txt
View file

@ -31,7 +31,9 @@ idf_component_register(SRCS "${srcs}"
REQUIRES app_trace
PRIV_REQUIRES soc)
target_link_libraries(${COMPONENT_LIB} INTERFACE "-Wl,--undefined=uxTopUsedPriority")
if(CONFIG_FREERTOS_DEBUG_OCDAWARE)
target_link_libraries(${COMPONENT_LIB} INTERFACE "-Wl,--undefined=uxTopUsedPriority")
endif()
set_source_files_properties(
tasks.c

2
components/freertos/FreeRTOS-openocd.c
View file

@ -19,6 +19,6 @@
#define USED
#endif
#ifdef CONFIG_ESP32_DEBUG_OCDAWARE
#ifdef CONFIG_FREERTOS_DEBUG_OCDAWARE
const int USED DRAM_ATTR uxTopUsedPriority = configMAX_PRIORITIES - 1;
#endif

5
components/freertos/Kconfig
View file

@ -435,4 +435,9 @@ menu "FreeRTOS"
would be checked to be in compliance with Vanilla FreeRTOS.
e.g Calling port*_CRITICAL from ISR context would cause assert failure
config FREERTOS_DEBUG_OCDAWARE
bool
help
Hidden option, gets selected by CONFIG_ESPxx_DEBUG_OCDAWARE
endmenu

5
components/freertos/component.mk
View file

@ -2,7 +2,10 @@
# Component Makefile
#
COMPONENT_ADD_LDFLAGS += -Wl,--undefined=uxTopUsedPriority
ifdef CONFIG_FREERTOS_DEBUG_OCDAWARE
COMPONENT_ADD_LDFLAGS += -Wl,--undefined=uxTopUsedPriority
endif
COMPONENT_ADD_INCLUDEDIRS := include
COMPONENT_PRIV_INCLUDEDIRS := include/freertos .