summaryrefslogtreecommitdiff
path: root/src/arch/i386
diff options
context:
space:
mode:
authorStefan Reinauer <stepan@coreboot.org>2010-11-22 08:09:50 +0000
committerStefan Reinauer <stepan@openbios.org>2010-11-22 08:09:50 +0000
commitabc0c8551604933ca54e9eaa48c3f00e4915dc90 (patch)
tree2b8b2b7c07329b72f9adeea737e5049435fe4549 /src/arch/i386
parente9c447326a0ff5565886b0c18c806c77c4a03cb8 (diff)
Printing coreboot debug messages on VGA console is pretty much useless, since
initializing VGA happens pretty much as the last thing before starting the payload. Hence, drop VGA console support, as we did in coreboot v3. - Drop VGA and BTEXT console support. Console is meant to be debugging only, and by the time graphics comes up 99% of the risky stuff has already happened. Note: This patch does not remove hardware init but only the actual output functionality. The ragexl driver needs some extra love, but that's for another day - factor out die() and post() - drop some leftover RAMBASE < 0x100000 checks. Signed-off-by: Stefan Reinauer <stepan@coreboot.org> Acked-by: QingPei Wang<wangqingpei@gmail.com> git-svn-id: svn://svn.coreboot.org/coreboot/trunk@6111 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
Diffstat (limited to 'src/arch/i386')
-rw-r--r--src/arch/i386/boot/coreboot_table.c9
-rw-r--r--src/arch/i386/lib/cbfs_and_run.c10
2 files changed, 3 insertions, 16 deletions
diff --git a/src/arch/i386/boot/coreboot_table.c b/src/arch/i386/boot/coreboot_table.c
index 65510e5471..484340c96a 100644
--- a/src/arch/i386/boot/coreboot_table.c
+++ b/src/arch/i386/boot/coreboot_table.c
@@ -134,18 +134,9 @@ static void lb_console(struct lb_header *header)
#if CONFIG_CONSOLE_SERIAL8250
add_console(header, LB_TAG_CONSOLE_SERIAL8250);
#endif
-#if CONFIG_CONSOLE_VGA
- add_console(header, LB_TAG_CONSOLE_VGA);
-#endif
-#if CONFIG_CONSOLE_BTEXT
- add_console(header, LB_TAG_CONSOLE_BTEXT);
-#endif
#if CONFIG_CONSOLE_LOGBUF
add_console(header, LB_TAG_CONSOLE_LOGBUF);
#endif
-#if CONFIG_CONSOLE_SROM
- add_console(header, LB_TAG_CONSOLE_SROM);
-#endif
#if CONFIG_USBDEBUG
add_console(header, LB_TAG_CONSOLE_EHCI);
#endif
diff --git a/src/arch/i386/lib/cbfs_and_run.c b/src/arch/i386/lib/cbfs_and_run.c
index 1b86f56371..5e3d8fe922 100644
--- a/src/arch/i386/lib/cbfs_and_run.c
+++ b/src/arch/i386/lib/cbfs_and_run.c
@@ -25,14 +25,10 @@ void cbfs_and_run_core(const char *filename, unsigned ebp)
{
u8 *dst;
- print_debug("Loading stage image.\n");
+ print_debug("Loading image.\n");
dst = cbfs_load_stage(filename);
- if (dst == (void *) -1) {
- /* We should use die() here. */
- print_emerg("Loading stage failed!\n");
- for (;;)
- asm("hlt\n");
- }
+ if ((void *)dst == (void *) -1)
+ die("FATAL: Essential component is missing.\n");
print_debug("Jumping to image.\n");
__asm__ volatile (