Merge branch 'bugfix/hal_assert_spelling' into 'master'

HAL: fix kconfig HAL_ASSERTION typo

See merge request espressif/esp-idf!18482
pull/9179/head
Jiang Jiang Jian 2022-06-14 16:24:25 +08:00
commit 3cb6abee3c
3 zmienionych plików z 7 dodań i 3 usunięć

Wyświetl plik

@ -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
CONFIG_COMPILER_OPTIMIZATION_CHECKS_SILENT=y
CONFIG_COMPILER_OPTIMIZATION_ASSERTIONS_SILENT=y
CONFIG_HAL_ASSERTION_SILIENT=y
CONFIG_HAL_ASSERTION_SILENT=y

Wyświetl plik

@ -16,7 +16,7 @@ menu "Hardware Abstraction Layer (HAL) and Low Level (LL)"
config HAL_ASSERTION_DISABLE
bool "Disabled"
depends on COMPILER_OPTIMIZATION_ASSERTION_LEVEL >= 0
config HAL_ASSERTION_SILIENT
config HAL_ASSERTION_SILENT
bool "Silent"
depends on COMPILER_OPTIMIZATION_ASSERTION_LEVEL >= 1
config HAL_ASSERTION_ENABLE
@ -28,7 +28,7 @@ menu "Hardware Abstraction Layer (HAL) and Low Level (LL)"
int
default COMPILER_OPTIMIZATION_ASSERTION_LEVEL if HAL_ASSERTION_EQUALS_SYSTEM
default 0 if HAL_ASSERTION_DISABLE
default 1 if HAL_ASSERTION_SILIENT
default 1 if HAL_ASSERTION_SILENT
default 2 if HAL_ASSERTION_ENABLE
choice HAL_LOG_LEVEL

Wyświetl plik

@ -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