Merge pull request #1951 from armink/fix_kconfig

[component] fix Kconfig warning in at and ulog.
This commit is contained in:
Bernard Xiong 2018-11-07 12:05:40 +08:00 committed by GitHub
commit ddd7343b0c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 9 deletions

View File

@ -78,7 +78,7 @@ if RT_USING_AT
endif endif
config AT_SW_VERSION_NUM config AT_SW_VERSION_NUM
int hex
default 0x10200 default 0x10200
help help
sfotware module version number sfotware module version number

View File

@ -54,20 +54,20 @@ config RT_USING_ULOG
if !ULOG_USING_SYSLOG if !ULOG_USING_SYSLOG
choice choice
prompt "The static output log level." prompt "The static output log level."
default ULOG_OUTPUT_LVL_DEBUG default ULOG_OUTPUT_LVL_D
help help
When the log level is less than this option and it will stop output. When the log level is less than this option and it will stop output.
These log will not compile into ROM when using LOG_X api. These log will not compile into ROM when using LOG_X api.
NOTE: It's not available on syslog mode. NOTE: It's not available on syslog mode.
config ULOG_OUTPUT_LVL_ASSERT config ULOG_OUTPUT_LVL_A
bool "Assert" bool "Assert"
config ULOG_OUTPUT_LVL_ERROR config ULOG_OUTPUT_LVL_E
bool "Error" bool "Error"
config ULOG_OUTPUT_LVL_WARNING config ULOG_OUTPUT_LVL_W
bool "Warning" bool "Warning"
config ULOG_OUTPUT_LVL_INFO config ULOG_OUTPUT_LVL_I
bool "Information" bool "Information"
config ULOG_OUTPUT_LVL_DEBUG config ULOG_OUTPUT_LVL_D
bool "Debug" bool "Debug"
endchoice endchoice
endif endif
@ -101,14 +101,18 @@ config RT_USING_ULOG
config ULOG_OUTPUT_LVL config ULOG_OUTPUT_LVL
int int
default 0 if ULOG_OUTPUT_LVL_ASSERT default 0 if ULOG_OUTPUT_LVL_A
default 0 if ULOG_OUTPUT_LVL_EMERG default 0 if ULOG_OUTPUT_LVL_EMERG
default 1 if ULOG_OUTPUT_LVL_ALERT default 1 if ULOG_OUTPUT_LVL_ALERT
default 2 if ULOG_OUTPUT_LVL_CRIT default 2 if ULOG_OUTPUT_LVL_CRIT
default 3 if ULOG_OUTPUT_LVL_E
default 3 if ULOG_OUTPUT_LVL_ERROR default 3 if ULOG_OUTPUT_LVL_ERROR
default 4 if ULOG_OUTPUT_LVL_W
default 4 if ULOG_OUTPUT_LVL_WARNING default 4 if ULOG_OUTPUT_LVL_WARNING
default 5 if ULOG_OUTPUT_LVL_NOTICE default 5 if ULOG_OUTPUT_LVL_NOTICE
default 6 if ULOG_OUTPUT_LVL_I
default 6 if ULOG_OUTPUT_LVL_INFO default 6 if ULOG_OUTPUT_LVL_INFO
default 7 if ULOG_OUTPUT_LVL_D
default 7 if ULOG_OUTPUT_LVL_DEBUG default 7 if ULOG_OUTPUT_LVL_DEBUG
default 7 default 7
@ -220,7 +224,7 @@ config RT_USING_ULOG
default n default n
config ULOG_SW_VERSION_NUM config ULOG_SW_VERSION_NUM
int hex
default 0x00100 default 0x00100
help help
sfotware module version number sfotware module version number