From patchwork Thu Oct  8 14:56:17 2009
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: kconfig: fix via boards
Date: Thu, 08 Oct 2009 14:56:17 -0000
From: Patrick Georgi <patrick@georgi-clan.de>
X-Patchwork-Id: 369
Message-Id: <1255013777.5054.15.camel@tetris>
To: coreboot@coreboot.org

Hi,

the changes to VGA_RUN_ROM and PCI_RUN_ROM broke boards using certain
via chipsets, as they use their own vgabios handling.

The real fix would be to eliminate those copies and move their via
support code (if there is any) to x86emu or so, but this is good enough
for now: x86emu is disabled, and vgabios.c (of the board or northbridge)
can take over.


Signed-off-by: Patrick Georgi <patrick.georgi@coresystems.de>
Acked-by: Myles Watson <mylesgw@gmail.com>


Index: src/southbridge/via/vt8237r/Kconfig
===================================================================
--- src/southbridge/via/vt8237r/Kconfig	(Revision 4742)
+++ src/southbridge/via/vt8237r/Kconfig	(Arbeitskopie)
@@ -21,3 +21,6 @@
 	bool
 	default n
 
+config EPIA_VT8237R_INIT
+	bool
+	default n
Index: src/mainboard/via/epia-m/Kconfig
===================================================================
--- src/mainboard/via/epia-m/Kconfig	(Revision 4742)
+++ src/mainboard/via/epia-m/Kconfig	(Arbeitskopie)
@@ -37,3 +37,15 @@
 	int
 	default 5
 	depends on BOARD_VIA_EPIA_M
+
+# this is done by this board's vgabios.c already
+config VGA_ROM_RUN
+	bool
+	default n
+	depends on BOARD_VIA_EPIA_M
+
+config PCI_ROM_RUN
+	bool
+	default n
+	depends on BOARD_VIA_EPIA_M
+
Index: src/northbridge/via/cx700/Kconfig
===================================================================
--- src/northbridge/via/cx700/Kconfig	(Revision 4742)
+++ src/northbridge/via/cx700/Kconfig	(Arbeitskopie)
@@ -1,3 +1,15 @@
 config NORTHBRIDGE_VIA_CX700
 	bool
 	default n
+
+# this is done by the northbridge's vgabios.c already
+config VGA_ROM_RUN
+	bool
+	default n
+	depends on NORTHBRIDGE_VIA_CX700
+
+config PCI_ROM_RUN
+	bool
+	default n
+	depends on NORTHBRIDGE_VIA_CX700
+
Index: src/northbridge/via/cn400/Kconfig
===================================================================
--- src/northbridge/via/cn400/Kconfig	(Revision 4742)
+++ src/northbridge/via/cn400/Kconfig	(Arbeitskopie)
@@ -6,3 +6,15 @@
 	int
 	default 0
 	depends on NORTHBRIDGE_VIA_CN400
+
+# this is done by the northbridge's vgabios.c already
+config VGA_ROM_RUN
+	bool
+	default n
+	depends on NORTHBRIDGE_VIA_CN400
+
+config PCI_ROM_RUN
+	bool
+	default n
+	depends on NORTHBRIDGE_VIA_CN400
+
Index: src/northbridge/via/vx800/Kconfig
===================================================================
--- src/northbridge/via/vx800/Kconfig	(Revision 4742)
+++ src/northbridge/via/vx800/Kconfig	(Arbeitskopie)
@@ -6,3 +6,15 @@
 	int
 	default 0
 	depends on NORTHBRIDGE_VIA_VX800
+
+# this is done by the northbridge's vgabios.c already
+config VGA_ROM_RUN
+	bool
+	default n
+	depends on NORTHBRIDGE_VIA_VX800
+
+config PCI_ROM_RUN
+	bool
+	default n
+	depends on NORTHBRIDGE_VIA_VX800
+
Index: src/northbridge/via/cn700/Kconfig
===================================================================
--- src/northbridge/via/cn700/Kconfig	(Revision 4742)
+++ src/northbridge/via/cn700/Kconfig	(Arbeitskopie)
@@ -7,3 +7,14 @@
 	int
 	default 0
 	depends on NORTHBRIDGE_VIA_CN700
+
+# this is done by the northbridge's vgabios.c already
+config VGA_ROM_RUN
+	bool
+	default n
+	depends on NORTHBRIDGE_VIA_CN700
+
+config PCI_ROM_RUN
+	bool
+	default n
+	depends on NORTHBRIDGE_VIA_CN700