diff options
| author | arch import user (historical) <svn@openbios.org> | 2005-07-06 17:17:25 +0000 |
|---|---|---|
| committer | arch import user (historical) <svn@openbios.org> | 2005-07-06 17:17:25 +0000 |
| commit | 6ca7636c8f52560e732cdd5b1c7829cda5aa2bde (patch) | |
| tree | cc45ae7c4dea6e2c5338f52b4314106bf07023be /src/pc80 | |
| parent | b2ed53dd5669c2c3839633bd2b3b4af709a5b149 (diff) | |
Revision: linuxbios@linuxbios.org--devel/freebios--devel--2.0--patch-51
Creator: Yinghai Lu <yhlu@tyan.com>
cache_as_ram for AMD and some intel
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@1967 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
Diffstat (limited to 'src/pc80')
| -rw-r--r-- | src/pc80/Config.lb | 7 | ||||
| -rw-r--r-- | src/pc80/serial.c | 27 |
2 files changed, 29 insertions, 5 deletions
diff --git a/src/pc80/Config.lb b/src/pc80/Config.lb index 5b395bd766..3f95bbc325 100644 --- a/src/pc80/Config.lb +++ b/src/pc80/Config.lb @@ -1,10 +1,15 @@ uses CONFIG_IDE +uses CONFIG_LEGACY_VGABIOS +uses CONFIG_CONSOLE_VGA object mc146818rtc.o object isa-dma.o object i8259.o #object udelay_timer2.o CONFIG_UDELAY_TIMER2 -#object beep.o CONFIG_BEEP + +#if CONFIG_CONSOLE_VGA +# object beep.o +#end if CONFIG_IDE dir ide diff --git a/src/pc80/serial.c b/src/pc80/serial.c index 89ac425c56..475c9bccf5 100644 --- a/src/pc80/serial.c +++ b/src/pc80/serial.c @@ -23,6 +23,9 @@ #define UART_LCS TTYS0_LCS + +#if CONFIG_USE_INIT == 0 + /* Data */ #define UART_RBR 0x00 #define UART_TBR 0x00 @@ -48,14 +51,14 @@ static int uart_can_tx_byte(void) static void uart_wait_to_tx_byte(void) { - while(!uart_can_tx_byte()) - ; + while(!uart_can_tx_byte()) + ; } static void uart_wait_until_sent(void) { - while(!(inb(TTYS0_BASE + UART_LSR) & 0x40)) - ; + while(!(inb(TTYS0_BASE + UART_LSR) & 0x40)) + ; } static void uart_tx_byte(unsigned char data) @@ -88,3 +91,19 @@ static void uart_init(void) #endif outb(UART_LCS, TTYS0_BASE + UART_LCR); } +#else +extern void uart8250_init(unsigned base_port, unsigned divisor, unsigned lcs); +static void uart_init(void) +{ +#if USE_OPTION_TABLE == 1 + static const unsigned char divisor[] = { 1,2,3,6,12,24,48,96 }; + unsigned ttys0_div, ttys0_index; + ttys0_index = read_option(CMOS_VSTART_baud_rate, CMOS_VLEN_baud_rate, 0); + ttys0_index &= 7; + ttys0_div = divisor[ttys0_index]; + uart8250_init(TTYS0_BASE, ttys0_div, UART_LCS); +#else + uart8250_init(TTYS0_BASE, TTYS0_DIV, UART_LCS); +#endif +} +#endif |