diff options
| author | Yinghai Lu <yinghailu@gmail.com> | 2004-12-16 02:44:25 +0000 |
|---|---|---|
| committer | Yinghai Lu <yinghailu@gmail.com> | 2004-12-16 02:44:25 +0000 |
| commit | 970990800ee2862119a012615a51c4ff3554e34e (patch) | |
| tree | 2d8c6ee1bbbe4acb4b44bd28a348324fd05c4817 | |
| parent | 42b37443ac4f66042a8472938b876e87f66270b4 (diff) | |
btext fix
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@1822 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
| -rw-r--r-- | src/console/btext_console.c | 2 | ||||
| -rw-r--r-- | src/console/font-8x16.c | 2 | ||||
| -rw-r--r-- | src/mainboard/tyan/s2850/Config.lb | 3 | ||||
| -rw-r--r-- | src/mainboard/tyan/s2850/Options.lb | 4 | ||||
| -rw-r--r-- | targets/tyan/s2850/Config.lb | 6 |
5 files changed, 13 insertions, 4 deletions
diff --git a/src/console/btext_console.c b/src/console/btext_console.c index fc6b6deea5..ae8dc8ca10 100644 --- a/src/console/btext_console.c +++ b/src/console/btext_console.c @@ -56,7 +56,7 @@ static u32 g_max_loc_Y; #define cmapsz (16*96) #endif -static unsigned char vga_font[cmapsz]; +extern unsigned char vga_font[cmapsz]; u32 boot_text_mapped; diff --git a/src/console/font-8x16.c b/src/console/font-8x16.c index 9404ffe809..f7901482cb 100644 --- a/src/console/font-8x16.c +++ b/src/console/font-8x16.c @@ -13,7 +13,7 @@ #define cmapsz (16*96) #endif -static unsigned char vga_font[cmapsz] = { +unsigned char vga_font[cmapsz] = { #if CHAR_256==1 /* 0 0x00 '^@' */ 0x00, /* 00000000 */ diff --git a/src/mainboard/tyan/s2850/Config.lb b/src/mainboard/tyan/s2850/Config.lb index ca890c8ded..24578722b8 100644 --- a/src/mainboard/tyan/s2850/Config.lb +++ b/src/mainboard/tyan/s2850/Config.lb @@ -139,6 +139,9 @@ chip northbridge/amd/amdk8/root_complex device pci 0.1 on end device pci 0.2 off end device pci 1.0 off end + chip drivers/ati/ragexl + device pci b.0 on end + end end device pci 1.0 on chip superio/winbond/w83627hf diff --git a/src/mainboard/tyan/s2850/Options.lb b/src/mainboard/tyan/s2850/Options.lb index 7b2043eeff..d161e165c1 100644 --- a/src/mainboard/tyan/s2850/Options.lb +++ b/src/mainboard/tyan/s2850/Options.lb @@ -43,6 +43,7 @@ uses DEFAULT_CONSOLE_LOGLEVEL uses MAXIMUM_CONSOLE_LOGLEVEL uses MAINBOARD_POWER_ON_AFTER_POWER_FAIL uses CONFIG_CONSOLE_SERIAL8250 +uses CONFIG_CONSOLE_BTEXT uses HAVE_INIT_TIMER uses CONFIG_GDB_STUB uses CROSS_COMPILE @@ -113,6 +114,9 @@ default LB_CKS_LOC=123 default CONFIG_SMP=1 default CONFIG_MAX_CPUS=1 +#BTEXT CONSOLE +default CONFIG_CONSOLE_BTEXT=1 + ## ## Build code to setup a generic IOAPIC ## diff --git a/targets/tyan/s2850/Config.lb b/targets/tyan/s2850/Config.lb index 45fb62622a..a3a0ef6f62 100644 --- a/targets/tyan/s2850/Config.lb +++ b/targets/tyan/s2850/Config.lb @@ -23,7 +23,8 @@ romimage "normal" # payload ../../../payloads/tg3--filo.zelf # payload ../../../payloads/e1000--filo.zelf # payload ../../../payloads/tg3--e1000--filo.zelf - payload ../../../payloads/tg3--eepro100--e1000--filo_hda2.zelf +# payload ../../../payloads/tg3--eepro100--e1000--filo_hda2.zelf + payload ../../../payloads/tg3--filo_btext_hda2.zelf end romimage "fallback" @@ -37,7 +38,8 @@ romimage "fallback" # payload ../../../payloads/tg3--filo.zelf # payload ../../../payloads/e1000--filo.zelf # payload ../../../payloads/tg3--e1000--filo.zelf - payload ../../../payloads/tg3--eepro100--e1000--filo_hda2.zelf +# payload ../../../payloads/tg3--eepro100--e1000--filo_hda2.zelf + payload ../../../payloads/tg3--filo_btext_hda2.zelf end buildrom ./linuxbios.rom ROM_SIZE "normal" "fallback" |