kopia lustrzana https://github.com/espressif/esp-idf
Merge branch 'bugfix/hal_assert_spelling' into 'master'
HAL: fix kconfig HAL_ASSERTION typo See merge request espressif/esp-idf!18482pull/9179/head
commit
3cb6abee3c
|
@ -4,4 +4,4 @@ CONFIG_RMT_ISR_IRAM_SAFE=y
|
||||||
# silent the error check, as the error string are stored in rodata, causing RTL check failure
|
# silent the error check, as the error string are stored in rodata, causing RTL check failure
|
||||||
CONFIG_COMPILER_OPTIMIZATION_CHECKS_SILENT=y
|
CONFIG_COMPILER_OPTIMIZATION_CHECKS_SILENT=y
|
||||||
CONFIG_COMPILER_OPTIMIZATION_ASSERTIONS_SILENT=y
|
CONFIG_COMPILER_OPTIMIZATION_ASSERTIONS_SILENT=y
|
||||||
CONFIG_HAL_ASSERTION_SILIENT=y
|
CONFIG_HAL_ASSERTION_SILENT=y
|
||||||
|
|
|
@ -16,7 +16,7 @@ menu "Hardware Abstraction Layer (HAL) and Low Level (LL)"
|
||||||
config HAL_ASSERTION_DISABLE
|
config HAL_ASSERTION_DISABLE
|
||||||
bool "Disabled"
|
bool "Disabled"
|
||||||
depends on COMPILER_OPTIMIZATION_ASSERTION_LEVEL >= 0
|
depends on COMPILER_OPTIMIZATION_ASSERTION_LEVEL >= 0
|
||||||
config HAL_ASSERTION_SILIENT
|
config HAL_ASSERTION_SILENT
|
||||||
bool "Silent"
|
bool "Silent"
|
||||||
depends on COMPILER_OPTIMIZATION_ASSERTION_LEVEL >= 1
|
depends on COMPILER_OPTIMIZATION_ASSERTION_LEVEL >= 1
|
||||||
config HAL_ASSERTION_ENABLE
|
config HAL_ASSERTION_ENABLE
|
||||||
|
@ -28,7 +28,7 @@ menu "Hardware Abstraction Layer (HAL) and Low Level (LL)"
|
||||||
int
|
int
|
||||||
default COMPILER_OPTIMIZATION_ASSERTION_LEVEL if HAL_ASSERTION_EQUALS_SYSTEM
|
default COMPILER_OPTIMIZATION_ASSERTION_LEVEL if HAL_ASSERTION_EQUALS_SYSTEM
|
||||||
default 0 if HAL_ASSERTION_DISABLE
|
default 0 if HAL_ASSERTION_DISABLE
|
||||||
default 1 if HAL_ASSERTION_SILIENT
|
default 1 if HAL_ASSERTION_SILENT
|
||||||
default 2 if HAL_ASSERTION_ENABLE
|
default 2 if HAL_ASSERTION_ENABLE
|
||||||
|
|
||||||
choice HAL_LOG_LEVEL
|
choice HAL_LOG_LEVEL
|
||||||
|
|
|
@ -0,0 +1,4 @@
|
||||||
|
# sdkconfig replacement configurations for deprecated options formatted as
|
||||||
|
# CONFIG_DEPRECATED_OPTION CONFIG_NEW_OPTION
|
||||||
|
|
||||||
|
CONFIG_HAL_ASSERTION_SILIENT CONFIG_HAL_ASSERTION_SILENT
|
Ładowanie…
Reference in New Issue