From e8b184fe576e5b1263f2e72f0c71b3f4bb158e82 Mon Sep 17 00:00:00 2001 From: Nils Date: Sat, 14 Jan 2012 12:13:34 -0500 Subject: [PATCH] vgabios: Some little geode cleanup. Signed-off-by: Nils Jacobs --- src/Kconfig | 4 ++-- vgasrc/geodevga.h | 14 ++++++-------- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/src/Kconfig b/src/Kconfig index 100ab92..8fb9a66 100644 --- a/src/Kconfig +++ b/src/Kconfig @@ -335,13 +335,13 @@ menu "VGA ROM" bool "Bochs DISPI interface VGA BIOS" default n help - Build support for Bochs DISPI interface + Build support for Bochs DISPI interface. config VGA_GEODELX bool "GeodeLX interface VGA BIOS" default n help - Build support for Geode LX vga + Build support for Geode LX vga. config VGA_PCI bool "PCI ROM Headers" diff --git a/vgasrc/geodevga.h b/vgasrc/geodevga.h index 1e51e1c..65e698c 100644 --- a/vgasrc/geodevga.h +++ b/vgasrc/geodevga.h @@ -26,11 +26,11 @@ #define OEM_BAR2 0x58 #define OEM_BAR3 0x5C -#define GEODE_PCI_ADDR 0x80000900 -#define GEODE_PCI_CMD (GEODE_PCI_ADDR + 0x04) -#define GEODE_PCI_FB (GEODE_PCI_ADDR + 0x10) -#define GEODE_PCI_DC (GEODE_PCI_ADDR + 0x18) -#define GEODE_PCI_VP (GEODE_PCI_ADDR + 0x1c) +#define GEODE_PCI_ADDR 0x80000900 +#define GEODE_PCI_CMD (GEODE_PCI_ADDR + 0x04) +#define GEODE_PCI_FB (GEODE_PCI_ADDR + 0x10) +#define GEODE_PCI_DC (GEODE_PCI_ADDR + 0x18) +#define GEODE_PCI_VP (GEODE_PCI_ADDR + 0x1c) #define DC_LOCK_LOCK 0x00000000 #define DC_LOCK_UNLOCK 0x00004758 @@ -47,7 +47,6 @@ #define DC_UNLOCK 0x0 #define DC_GENERAL_CFG 0x4 #define DC_DISPLAY_CFG 0x8 -#define DC_ARB_CFG 0xc #define DC_FB_ST_OFFSET 0x10 #define DC_CB_ST_OFFSET 0x14 #define DC_CURS_ST_OFFSET 0x18 @@ -72,8 +71,7 @@ #define VP_CRT_SKEW (1 << 16) #define VP_BYP_BOTH (1 << 0) -/* Masks */ -#define VP_MSR_CFG_MSK 0x0 +/* Mask */ #define DC_CFG_MSK 0xf000a6 int geodevga_init(); -- 2.25.1