diff --git a/console/Kconfig b/console/Kconfig index 1e2be1ff43..4c017c4fa1 100644 --- a/console/Kconfig +++ b/console/Kconfig @@ -1,24 +1,81 @@ menu "Console" -config DEFAULT_CONSOLE_LOGLEVEL - int "Console log level" - default "8" - ---help--- - The level of log messages that gets printed. Possible values: +config CONSOLE + bool "Console support" + default y + help + Support for various types of (debugging) consoles. - #define BIOS_EMERG 0 /* system is unusable */ - #define BIOS_ALERT 1 /* action must be taken immediately */ - #define BIOS_CRIT 2 /* critical conditions */ - #define BIOS_ERR 3 /* error conditions */ - #define BIOS_WARNING 4 /* warning conditions */ - #define BIOS_NOTICE 5 /* normal but significant condition */ - #define BIOS_INFO 6 /* informational */ - #define BIOS_DEBUG 7 /* debug-level messages */ - #define BIOS_SPEW 8 /* way too many details */ +choice + prompt "Console log level" + default CONSOLE_LOGLEVEL_8 + depends CONSOLE + +config CONSOLE_LOGLEVEL_8 + bool "BIOS_SPEW" + help + Way too many details. + +config CONSOLE_LOGLEVEL_7 + bool "BIOS_DEBUG" + help + Debug-level messages. + +config CONSOLE_LOGLEVEL_6 + bool "BIOS_INFO" + help + Informational messages. + +config CONSOLE_LOGLEVEL_5 + bool "BIOS_NOTICE" + help + Normal but significant conditions. + +config CONSOLE_LOGLEVEL_4 + bool "BIOS_WARNING" + help + Warning conditions. + +config CONSOLE_LOGLEVEL_3 + bool "BIOS_ERR" + help + Error conditions. + +config CONSOLE_LOGLEVEL_2 + bool "BIOS_CRIT" + help + Critical conditions. + +config CONSOLE_LOGLEVEL_1 + bool "BIOS_ALERT" + help + Action must be taken immediately. + +config CONSOLE_LOGLEVEL_0 + bool "BIOS_EMERG" + help + System is unusable. + +endchoice + +config DEFAULT_CONSOLE_LOGLEVEL + int + default 0 if CONSOLE_LOGLEVEL_0 + default 1 if CONSOLE_LOGLEVEL_1 + default 2 if CONSOLE_LOGLEVEL_2 + default 3 if CONSOLE_LOGLEVEL_3 + default 4 if CONSOLE_LOGLEVEL_4 + default 5 if CONSOLE_LOGLEVEL_5 + default 6 if CONSOLE_LOGLEVEL_6 + default 7 if CONSOLE_LOGLEVEL_7 + default 8 if CONSOLE_LOGLEVEL_8 + ---help--- + Map the log level config names to an integer. config CONSOLE_SERIAL boolean "Serial console support" default y + depends CONSOLE ---help--- Send LinuxBIOS output to serial console. @@ -73,11 +130,13 @@ endchoice config CONSOLE_VGA boolean "VGA console support" + depends CONSOLE ---help--- Send LinuxBIOS output to VGA console as soon as VGA is initialized. config CONSOLE_USB boolean "USB2 console support" + depends CONSOLE ---help--- Send LinuxBIOS output to USB2 (EHCI) console. diff --git a/util/kconfig/mconf.c b/util/kconfig/mconf.c index 6ea7cf8675..3a154b2ea1 100644 --- a/util/kconfig/mconf.c +++ b/util/kconfig/mconf.c @@ -188,7 +188,7 @@ setmod_text[] = N_( "This feature depends on another which has been configured as a module.\n" "As a result, this feature will be built as a module."), nohelp_text[] = N_( - "There is no help available for this firmware option.\n"), + "There is no help available for this option.\n"), load_config_text[] = N_( "Enter the name of the configuration file you wish to load. " "Accept the name shown to restore the configuration you "