Please ack and commit. I can not commit to the libpayload repo, so whoever acks it gets to commit too. After applying the patch, please also run:
svn mv drivers/video/geode.c drivers/video/geodelx.c
//Peter
On 08/10/08 02:27 +0200, Peter Stuge wrote:
Please ack and commit. I can not commit to the libpayload repo, so whoever acks it gets to commit too. After applying the patch, please also run:
svn mv drivers/video/geode.c drivers/video/geodelx.c
//Peter
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
r3642.
Index: configs/defconfig
--- configs/defconfig (revision 3640) +++ configs/defconfig (working copy) @@ -20,7 +20,7 @@ # CONFIG_SERIAL_ACS_FALLBACK is not set CONFIG_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_LAYOUT_US=y # CONFIG_PC_KEYBOARD_LAYOUT_DE is not set Index: Config.in =================================================================== --- Config.in (revision 3640) +++ Config.in (working copy) @@ -91,8 +91,8 @@ depends on VIDEO_CONSOLE default y
-config GEODE_VIDEO_CONSOLE
- bool "Geode video console driver"
+config GEODELX_VIDEO_CONSOLE
- bool "Geode LX video console driver" depends on VIDEO_CONSOLE default n
Index: drivers/Makefile.inc
--- drivers/Makefile.inc (revision 3640) +++ drivers/Makefile.inc (working copy) @@ -44,9 +44,9 @@ TARGETS-$(CONFIG_VIDEO_CONSOLE) += drivers/video/video.o TARGETS-$(CONFIG_VGA_VIDEO_CONSOLE) += drivers/video/vga.o
-# Geode console drivers -TARGETS-$(CONFIG_GEODE_VIDEO_CONSOLE) += drivers/video/geode.o -TARGETS-$(CONFIG_GEODE_VIDEO_CONSOLE) += drivers/video/font8x16.o +# Geode LX console drivers +TARGETS-$(CONFIG_GEODELX_VIDEO_CONSOLE) += drivers/video/geodelx.o +TARGETS-$(CONFIG_GEODELX_VIDEO_CONSOLE) += drivers/video/font8x16.o
# USB stack TARGETS-$(CONFIG_USB) += drivers/usb/usbinit.o Index: drivers/video/geode.c =================================================================== --- drivers/video/geode.c (revision 3640) +++ drivers/video/geode.c (working copy) @@ -197,13 +197,13 @@ 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_clear(void) +static void geodelx_clear(void) { int row; unsigned char *ptr = FB; @@ -235,7 +235,7 @@ } }
-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 int geode_init(void) +static int geodelx_init(void) { pcidev_t dev; int i; @@ -277,15 +277,15 @@ /* 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
};
Index: drivers/video/video.c
--- drivers/video/video.c (revision 3640) +++ drivers/video/video.c (working copy) @@ -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 @@
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,
-- coreboot mailing list: coreboot@coreboot.org http://www.coreboot.org/mailman/listinfo/coreboot