GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

libpayload: Rename Geode video driver to Geode LX video driver. 

This is simply wrong, the "Geode" video driver is only good for LX and one of
our users got bit by this just now.

Signed-off-by: Peter Stuge <peter@stuge.se>
Acked-by: Jordan Crouse <jordan.crouse@amd.com>



git-svn-id: svn://svn.coreboot.org/coreboot/trunk@3642 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
This commit is contained in:
Peter Stuge 2008-10-08 14:47:41 +00:00 committed by Jordan Crouse
parent ff9350b798
commit 4b1971cc62
5 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
payloads/libpayload/Config.in
View File

@ -91,8 +91,8 @@ config VGA_VIDEO_CONSOLE
depends on VIDEO_CONSOLE depends on VIDEO_CONSOLE
default y default y
config GEODE_VIDEO_CONSOLE config GEODELX_VIDEO_CONSOLE
bool "Geode video console driver" bool "Geode LX video console driver"
depends on VIDEO_CONSOLE depends on VIDEO_CONSOLE
default n default n

2
payloads/libpayload/configs/defconfig
View File

@ -20,7 +20,7 @@ CONFIG_SERIAL_IOBASE=0x3f8
# CONFIG_SERIAL_ACS_FALLBACK is not set # CONFIG_SERIAL_ACS_FALLBACK is not set
CONFIG_VIDEO_CONSOLE=y CONFIG_VIDEO_CONSOLE=y
CONFIG_VGA_VIDEO_CONSOLE=y CONFIG_VGA_VIDEO_CONSOLE=y
# CONFIG_GEODE_VIDEO_CONSOLE is not set # CONFIG_GEODELX_VIDEO_CONSOLE is not set
CONFIG_PC_KEYBOARD=y CONFIG_PC_KEYBOARD=y
CONFIG_PC_KEYBOARD_LAYOUT_US=y CONFIG_PC_KEYBOARD_LAYOUT_US=y
# CONFIG_PC_KEYBOARD_LAYOUT_DE is not set # CONFIG_PC_KEYBOARD_LAYOUT_DE is not set

6
payloads/libpayload/drivers/Makefile.inc
View File

@ -44,9 +44,9 @@ TARGETS-$(CONFIG_NVRAM) += drivers/options.o
TARGETS-$(CONFIG_VIDEO_CONSOLE) += drivers/video/video.o TARGETS-$(CONFIG_VIDEO_CONSOLE) += drivers/video/video.o
TARGETS-$(CONFIG_VGA_VIDEO_CONSOLE) += drivers/video/vga.o TARGETS-$(CONFIG_VGA_VIDEO_CONSOLE) += drivers/video/vga.o
# Geode console drivers # Geode LX console drivers
TARGETS-$(CONFIG_GEODE_VIDEO_CONSOLE) += drivers/video/geode.o TARGETS-$(CONFIG_GEODELX_VIDEO_CONSOLE) += drivers/video/geodelx.o
TARGETS-$(CONFIG_GEODE_VIDEO_CONSOLE) += drivers/video/font8x16.o TARGETS-$(CONFIG_GEODELX_VIDEO_CONSOLE) += drivers/video/font8x16.o
# USB stack # USB stack
TARGETS-$(CONFIG_USB) += drivers/usb/usbinit.o TARGETS-$(CONFIG_USB) += drivers/usb/usbinit.o

22
payloads/libpayload/drivers/video/geode.c → payloads/libpayload/drivers/video/geodelx.c
View File

@ -197,13 +197,13 @@ static void init_video_mode(void)
writel(0x2B601, DC + 0x04); writel(0x2B601, DC + 0x04);
} }
static void geode_set_palette(int entry, unsigned int color) static void geodelx_set_palette(int entry, unsigned int color)
{ {
writel(entry, DC + 0x70); writel(entry, DC + 0x70);
writel(color, DC + 0x74); writel(color, DC + 0x74);
} }
static void geode_scroll_up(void) static void geodelx_scroll_up(void)
{ {
unsigned char *dst = FB; unsigned char *dst = FB;
unsigned char *src = FB + vga_mode.hactive; unsigned char *src = FB + vga_mode.hactive;
@ -224,7 +224,7 @@ static void geode_scroll_up(void)
} }
} }
static void geode_clear(void) static void geodelx_clear(void)
{ {
int row; int row;
unsigned char *ptr = FB; unsigned char *ptr = FB;
@ -235,7 +235,7 @@ static void geode_clear(void)
} }
} }
static void geode_putc(u8 row, u8 col, unsigned int ch) static void geodelx_putc(u8 row, u8 col, unsigned int ch)
{ {
unsigned char *dst; unsigned char *dst;
unsigned char *glyph = font8x16 + ((ch & 0xFF) * FONT_HEIGHT); unsigned char *glyph = font8x16 + ((ch & 0xFF) * FONT_HEIGHT);
@ -259,7 +259,7 @@ static void geode_putc(u8 row, u8 col, unsigned int ch)
} }
} }
static int geode_init(void) static int geodelx_init(void)
{ {
pcidev_t dev; pcidev_t dev;
int i; int i;
@ -277,15 +277,15 @@ static int geode_init(void)
/* Set up the palette */ /* Set up the palette */
for(i = 0; i < ARRAY_SIZE(vga_colors); i++) { for(i = 0; i < ARRAY_SIZE(vga_colors); i++) {
geode_set_palette(i, vga_colors[i]); geodelx_set_palette(i, vga_colors[i]);
} }
return 0; return 0;
} }
struct video_console geode_video_console = { struct video_console geodelx_video_console = {
.init = geode_init, .init = geodelx_init,
.putc = geode_putc, .putc = geodelx_putc,
.clear = geode_clear, .clear = geodelx_clear,
.scroll_up = geode_scroll_up .scroll_up = geodelx_scroll_up
}; };

8
payloads/libpayload/drivers/video/video.c
View File

@ -31,8 +31,8 @@
#include <libpayload.h> #include <libpayload.h>
#include <video_console.h> #include <video_console.h>
#ifdef CONFIG_GEODE_VIDEO_CONSOLE #ifdef CONFIG_GEODELX_VIDEO_CONSOLE
extern struct video_console geode_video_console; extern struct video_console geodelx_video_console;
#endif #endif
#ifdef CONFIG_VGA_VIDEO_CONSOLE #ifdef CONFIG_VGA_VIDEO_CONSOLE
@ -41,8 +41,8 @@ extern struct video_console vga_video_console;
static struct video_console *console_list[] = static struct video_console *console_list[] =
{ {
#ifdef CONFIG_GEODE_VIDEO_CONSOLE #ifdef CONFIG_GEODELX_VIDEO_CONSOLE
&geode_video_console, &geodelx_video_console,
#endif #endif
#ifdef CONFIG_VGA_VIDEO_CONSOLE #ifdef CONFIG_VGA_VIDEO_CONSOLE
&vga_video_console, &vga_video_console,