[v2] r4354 - in trunk/coreboot-v2/src: mainboard/via/epia-m700 northbridge/via/vx800

Author: stepan
Date: 2009-06-09 17:22:47 +0200 (Tue, 09 Jun 2009)
New Revision: 4354

Modified:
   trunk/coreboot-v2/src/mainboard/via/epia-m700/Options.lb
   trunk/coreboot-v2/src/northbridge/via/vx800/dram_init.h
Log:
this port is horribly broken and should not have been checked in. This patch
gets us through config, but it fails during build because the original patch
duplicated some files for VIA systems.

Signed-off-by: Stefan Reinauer 
Acked-by: Stefan Reinauer

Modified: trunk/coreboot-v2/src/mainboard/via/epia-m700/Options.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/via/epia-m700/Options.lb	2009-06-09 14:44:37 UTC (rev 4353)
+++ trunk/coreboot-v2/src/mainboard/via/epia-m700/Options.lb	2009-06-09 15:22:47 UTC (rev 4354)
@@ -72,17 +72,17 @@
 uses DCACHE_RAM_BASE
 uses DCACHE_RAM_SIZE
 uses CONFIG_USE_INIT
-uses MAX_RAM_SLOTS
-uses USB_ENABLE
-uses EHCI_ENABLE
-uses HPET_ENABLE
-uses USB_PORTNUM
-uses FULL_ROM_SIZE
-uses FULL_ROM_BASE
-uses PAYLOAD_IS_SEABIOS
-uses VIACONFIG_TOP_SM_SIZE_MB
-uses VIACONFIG_VGA_PCI_10
-uses VIACONFIG_VGA_PCI_14
+#uses MAX_RAM_SLOTS
+#uses USB_ENABLE
+#uses EHCI_ENABLE
+#uses HPET_ENABLE
+#uses USB_PORTNUM
+#uses FULL_ROM_SIZE
+#uses FULL_ROM_BASE
+#uses PAYLOAD_IS_SEABIOS
+#uses VIACONFIG_TOP_SM_SIZE_MB
+#uses VIACONFIG_VGA_PCI_10
+#uses VIACONFIG_VGA_PCI_14

## New options
 default USE_DCACHE_RAM = 1
@@ -91,18 +91,18 @@
 # default DCACHE_RAM_BASE = 0xfec00000 # HPET may use this.
 default DCACHE_RAM_SIZE = 8 * 1024
 default CONFIG_USE_INIT = 0
-default MAX_RAM_SLOTS = 2
-default USB_ENABLE = 1
-default EHCI_ENABLE = 1
-default HPET_ENABLE = 1
-default USB_PORTNUM = 2
-default FULL_ROM_SIZE = 512 * 1024
-default FULL_ROM_BASE = (0xffffffff - FULL_ROM_SIZE + 1)
-default VIACONFIG_TOP_SM_SIZE_MB = 0
+#default MAX_RAM_SLOTS = 2
+#default USB_ENABLE = 1
+#default EHCI_ENABLE = 1
+#default HPET_ENABLE = 1
+#default USB_PORTNUM = 2
+#default FULL_ROM_SIZE = 512 * 1024
+#default FULL_ROM_BASE = (0xffffffff - FULL_ROM_SIZE + 1)
+#default VIACONFIG_TOP_SM_SIZE_MB = 0
 # default VIACONFIG_VGA_PCI_10 = 0xd0000008
 # default VIACONFIG_VGA_PCI_14 = 0xfd000000
-default VIACONFIG_VGA_PCI_10 = 0xf8000008
-default VIACONFIG_VGA_PCI_14 = 0xfc000000
+#default VIACONFIG_VGA_PCI_10 = 0xf8000008
+#default VIACONFIG_VGA_PCI_14 = 0xfc000000

default ROM_SIZE = 512 * 1024
 default CONFIG_IOAPIC = 1

Modified: trunk/coreboot-v2/src/northbridge/via/vx800/dram_init.h
===================================================================
--- trunk/coreboot-v2/src/northbridge/via/vx800/dram_init.h	2009-06-09 14:44:37 UTC (rev 4353)
+++ trunk/coreboot-v2/src/northbridge/via/vx800/dram_init.h	2009-06-09 15:22:47 UTC (rev 4354)
@@ -110,7 +110,8 @@
 #define  SPD_DATA_SIZE 44
 //Dram cofig are
 /*the most number of socket*/
-//#define  MAX_RAM_SLOTS  2
+#define  MAX_RAM_SLOTS  2
+
 #define MAX_SOCKETS MAX_RAM_SLOTS
 #define  MAX_DIMMS     MAX_SOCKETS	/*every sockets can plug one DIMM */
 /*the most number of RANKs on a DIMM*/