diff options
Diffstat (limited to 'src/arch/i386')
| -rw-r--r-- | src/arch/i386/boot/coreboot_table.c | 9 | ||||
| -rw-r--r-- | src/arch/i386/lib/cbfs_and_run.c | 10 |
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 ( |