summaryrefslogtreecommitdiff
path: root/src/include
diff options
context:
space:
mode:
Diffstat (limited to 'src/include')
-rw-r--r--src/include/boot/coreboot_tables.h6
-rw-r--r--src/include/console/btext.h72
-rw-r--r--src/include/console/console.h5
3 files changed, 5 insertions, 78 deletions
diff --git a/src/include/boot/coreboot_tables.h b/src/include/boot/coreboot_tables.h
index cbfe3f3134..c783dc8cdb 100644
--- a/src/include/boot/coreboot_tables.h
+++ b/src/include/boot/coreboot_tables.h
@@ -158,10 +158,10 @@ struct lb_console {
};
#define LB_TAG_CONSOLE_SERIAL8250 0
-#define LB_TAG_CONSOLE_VGA 1
-#define LB_TAG_CONSOLE_BTEXT 2
+#define LB_TAG_CONSOLE_VGA 1 // OBSOLETE
+#define LB_TAG_CONSOLE_BTEXT 2 // OBSOLETE
#define LB_TAG_CONSOLE_LOGBUF 3
-#define LB_TAG_CONSOLE_SROM 4
+#define LB_TAG_CONSOLE_SROM 4 // OBSOLETE
#define LB_TAG_CONSOLE_EHCI 5
#define LB_TAG_FORWARD 0x0011
diff --git a/src/include/console/btext.h b/src/include/console/btext.h
deleted file mode 100644
index 1d2e37e1fc..0000000000
--- a/src/include/console/btext.h
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * This file describes the structure passed from the BootX application
- * (for MacOS) when it is used to boot Linux.
- *
- * Written by Benjamin Herrenschmidt.
- *
- * Move to coreboot by LYH yhlu@tyan.com
- *
- */
-
-
-#ifndef _BTEXT_H__
-#define _BTEXT_H__
-
-#define u32 uint32_t
-#define u16 uint16_t
-#define u8 uint8_t
-
-/* Here are the boot informations that are passed to the bootstrap
- * Note that the kernel arguments and the device tree are appended
- * at the end of this structure. */
-typedef struct boot_infos
-{
-
- /* NEW (vers. 2) this holds the current _logical_ base addr of
- the frame buffer (for use by early boot message) */
- u8* logicalDisplayBase;
-
-
- /* Some infos about the current MacOS display */
- u32 dispDeviceRect[4]; /* left,top,right,bottom */
- u32 dispDeviceDepth; /* (8, 16 or 32) */
- u8* dispDeviceBase; /* base address (physical) */
- u32 dispDeviceRowBytes; /* rowbytes (in bytes) */
- u32 dispDeviceColorsOffset; /* Colormap (8 bits only) or 0 (*) */
-
-
- /* The framebuffer size (optional, currently 0) */
- u32 frameBufferSize; /* Represents a max size, can be 0. */
-
-
-} boot_infos_t;
-
-/* (*) The format of the colormap is 256 * 3 * 2 bytes. Each color index is represented
- * by 3 short words containing a 16 bits (unsigned) color component.
- * Later versions may contain the gamma table for direct-color devices here.
- */
-#define BOOTX_COLORTABLE_SIZE (256UL*3UL*2UL)
-
-
-/*
- * Definitions for using the procedures in btext.c.
- *
- * Benjamin Herrenschmidt <benh@kernel.crashing.org>
- */
-
-extern void btext_clearscreen(void);
-
-extern boot_infos_t disp_bi;
-extern u32 boot_text_mapped;
-
-void btext_setup_display(u32 width, u32 height, u32 depth, u32 pitch,
- unsigned long address);
-void map_boot_text(void);
-void btext_update_display(unsigned long phys, u32 width, u32 height,
- u32 depth, u32 pitch);
-
-void btext_drawchar(char c);
-void btext_drawstring(const char *str);
-void btext_drawhex(u32 v);
-
-#endif /* _BTEXT_H */
diff --git a/src/include/console/console.h b/src/include/console/console.h
index 087e46179a..6953927ff1 100644
--- a/src/include/console/console.h
+++ b/src/include/console/console.h
@@ -28,9 +28,6 @@ void console_tx_byte(unsigned char byte);
void console_tx_flush(void);
unsigned char console_rx_byte(void);
int console_tst_byte(void);
-#if CONFIG_CONSOLE_VGA == 1
-void vga_console_init(void);
-#endif
#if CONFIG_USBDEBUG
#include <usbdebug.h>
#endif
@@ -356,6 +353,8 @@ static void print_spew(const char *str) { __console_tx_string(BIOS_SPEW, str); }
#ifdef __ROMCC__
/* if included by romcc, include the sources, too. romcc can't use prototypes */
#include <console/console.c>
+#include <console/post.c>
+#include <console/die.c>
#endif
#endif /* CONSOLE_CONSOLE_H_ */