diff options
| author | Peter Stuge <peter@stuge.se> | 2008-10-08 14:47:41 +0000 |
|---|---|---|
| committer | Jordan Crouse <jordan.crouse@amd.com> | 2008-10-08 14:47:41 +0000 |
| commit | 4b1971cc6274899cf487e255048395342138f601 (patch) | |
| tree | 326eff76699daeddefa9742b6b2860eebc85c955 /payloads/libpayload/drivers/video | |
| parent | ff9350b79869b9247cff8414227fc424883cf4c0 (diff) | |
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
Diffstat (limited to 'payloads/libpayload/drivers/video')
| -rw-r--r-- | payloads/libpayload/drivers/video/geodelx.c (renamed from payloads/libpayload/drivers/video/geode.c) | 22 | ||||
| -rw-r--r-- | payloads/libpayload/drivers/video/video.c | 8 |
2 files changed, 15 insertions, 15 deletions
diff --git a/payloads/libpayload/drivers/video/geode.c b/payloads/libpayload/drivers/video/geodelx.c index c3823ffe18..cb1c4be40b 100644 --- a/payloads/libpayload/drivers/video/geode.c +++ b/payloads/libpayload/drivers/video/geodelx.c @@ -197,13 +197,13 @@ static void init_video_mode(void) 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(color, DC + 0x74); } -static void geode_scroll_up(void) +static void geodelx_scroll_up(void) { unsigned char *dst = FB; 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; 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 *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; int i; @@ -277,15 +277,15 @@ static int geode_init(void) /* Set up the palette */ 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; } -struct video_console geode_video_console = { - .init = geode_init, - .putc = geode_putc, - .clear = geode_clear, - .scroll_up = geode_scroll_up +struct video_console geodelx_video_console = { + .init = geodelx_init, + .putc = geodelx_putc, + .clear = geodelx_clear, + .scroll_up = geodelx_scroll_up }; diff --git a/payloads/libpayload/drivers/video/video.c b/payloads/libpayload/drivers/video/video.c index 23d0c1bb58..6ebc0f8ab6 100644 --- a/payloads/libpayload/drivers/video/video.c +++ b/payloads/libpayload/drivers/video/video.c @@ -31,8 +31,8 @@ #include <libpayload.h> #include <video_console.h> -#ifdef CONFIG_GEODE_VIDEO_CONSOLE -extern struct video_console geode_video_console; +#ifdef CONFIG_GEODELX_VIDEO_CONSOLE +extern struct video_console geodelx_video_console; #endif #ifdef CONFIG_VGA_VIDEO_CONSOLE @@ -41,8 +41,8 @@ extern struct video_console vga_video_console; static struct video_console *console_list[] = { -#ifdef CONFIG_GEODE_VIDEO_CONSOLE - &geode_video_console, +#ifdef CONFIG_GEODELX_VIDEO_CONSOLE + &geodelx_video_console, #endif #ifdef CONFIG_VGA_VIDEO_CONSOLE &vga_video_console, |