Revert "CMOS: Add set_option and rework get_option."
This reverts commit eb7bb49eb5b48c39baf7a256b7c74e23e3da5660. Stepan pointed out that "s" means string, which makes the following statement in this commit message invalid: "Since we either have reserved space (which we shouldn't do anything with in these two functions), an enum or a hexadecimal value, unsigned int seemed like the way to go." Signed-off-by: Luc Verhaegen <libv@skynet.be> Acked-by: Luc Verhaegen <libv@skynet.be> git-svn-id: svn://svn.coreboot.org/coreboot/trunk@4335 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
This commit is contained in:
@ -14,10 +14,9 @@ static int initialized;
|
||||
void console_init(void)
|
||||
{
|
||||
struct console_driver *driver;
|
||||
|
||||
if (get_option("debug_level", &console_loglevel))
|
||||
console_loglevel = DEFAULT_CONSOLE_LOGLEVEL;
|
||||
|
||||
if(get_option(&console_loglevel, "debug_level"))
|
||||
console_loglevel=DEFAULT_CONSOLE_LOGLEVEL;
|
||||
|
||||
for(driver = console_drivers; driver < econsole_drivers; driver++) {
|
||||
if (!driver->init)
|
||||
continue;
|
||||
|
@ -9,9 +9,18 @@
|
||||
#include <smp/spinlock.h>
|
||||
#include <console/console.h>
|
||||
|
||||
/* printk's without a loglevel use this.. */
|
||||
#define DEFAULT_MESSAGE_LOGLEVEL 4 /* BIOS_WARNING */
|
||||
|
||||
/* We show everything that is MORE important than this.. */
|
||||
#define MINIMUM_CONSOLE_LOGLEVEL 1 /* Minimum loglevel we let people use */
|
||||
|
||||
/* Keep together for sysctl support */
|
||||
|
||||
unsigned int console_loglevel = DEFAULT_CONSOLE_LOGLEVEL;
|
||||
int console_loglevel = DEFAULT_CONSOLE_LOGLEVEL;
|
||||
int default_message_loglevel = DEFAULT_MESSAGE_LOGLEVEL;
|
||||
int minimum_console_loglevel = MINIMUM_CONSOLE_LOGLEVEL;
|
||||
int default_console_loglevel = DEFAULT_CONSOLE_LOGLEVEL;
|
||||
|
||||
void display(char*);
|
||||
extern int vtxprintf(void (*)(unsigned char), const char *, va_list);
|
||||
|
@ -29,10 +29,10 @@
|
||||
static void ttyS0_init(void)
|
||||
{
|
||||
static const unsigned char div[8]={1,2,3,6,12,24,48,96};
|
||||
unsigned int b_index=0;
|
||||
int b_index=0;
|
||||
unsigned int divisor=TTYS0_DIV;
|
||||
|
||||
if(!get_option("baud_rate", &b_index)) {
|
||||
if(get_option(&b_index,"baud_rate")==0) {
|
||||
divisor=div[b_index];
|
||||
}
|
||||
uart8250_init(TTYS0_BASE, divisor, TTYS0_LCS);
|
||||
|
Reference in New Issue
Block a user