diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2013-10-07 08:00:13 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2013-10-07 08:00:13 +0200 |
| commit | 9aa6dd027012892d14aa53f9c3d6965c37afc001 (patch) | |
| tree | b97a8cb9ee8bf1c154ca52c010c9808d02b4fd85 /common/Kconfig | |
| parent | 408f054247fa7250546bc041b1deb306d0b9fa98 (diff) | |
| parent | 666f12e0c19a19f4431e05f6e5b37e657a62038f (diff) | |
| download | barebox-9aa6dd027012892d14aa53f9c3d6965c37afc001.tar.gz barebox-9aa6dd027012892d14aa53f9c3d6965c37afc001.tar.xz | |
Merge branch 'for-next/login'
Conflicts:
include/console.h
Diffstat (limited to 'common/Kconfig')
| -rw-r--r-- | common/Kconfig | 23 |
1 files changed, 22 insertions, 1 deletions
diff --git a/common/Kconfig b/common/Kconfig index 7b0b0db2cf..13419dc5bd 100644 --- a/common/Kconfig +++ b/common/Kconfig @@ -386,6 +386,11 @@ config PASSWORD help allow you to have password protection framework +config PASSWORD_DEFAULT + string + prompt "Password default" + depends on PASSWORD + if PASSWORD choice @@ -604,7 +609,7 @@ endmenu menu "Debugging" config COMPILE_LOGLEVEL - int "loglevel" + int "compile loglevel" default 6 help This defines the maximum loglevel compiled into the binary. Less important @@ -619,6 +624,22 @@ config COMPILE_LOGLEVEL 6 informational (info) 7 debug-level messages (debug) +config DEFAULT_LOGLEVEL + int "default loglevel" + default 7 + help + This defines the default runtime loglevel. It can be changed using the + global.loglevel variable. Available logelevels are: + + 0 system is unusable (emerg) + 1 action must be taken immediately (alert) + 2 critical conditions (crit) + 3 error conditions (err) + 4 warning conditions (warn) + 5 normal but significant condition (notice) + 6 informational (info) + 7 debug-level messages (debug) + config DEBUG_INFO bool prompt "enable debug symbols" |