Fix the the build of r5494 on Asus A8V-E SE. The K8M890 and K8T890

were not treated separately until now. Fix it. Hope self ack is OK,
compiled tested locally.

Signed-off-by: Rudolf Marek <r.marek@assembler.cz>
Acked-by: Rudolf Marek <r.marek@assembler.cz>



git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5497 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1

5 files changed, 11 insertions, 8 deletions

diff --git a/src/mainboard/asus/a8v-e_se/Kconfig b/src/mainboard/asus/a8v-e_se/Kconfig
index e6f2b7b9d0..d0dfaf50fd 100644
--- a/src/mainboard/asus/a8v-e_se/Kconfig
+++ b/src/mainboard/asus/a8v-e_se/Kconfig
@@ -83,4 +83,3 @@ config MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID
 	hex
 	default 0x1043
 	depends on BOARD_ASUS_A8V_E_SE
-
diff --git a/src/mainboard/asus/m2v-mx_se/Kconfig b/src/mainboard/asus/m2v-mx_se/Kconfig
index 55ad875df0..dda8be775c 100644
--- a/src/mainboard/asus/m2v-mx_se/Kconfig
+++ b/src/mainboard/asus/m2v-mx_se/Kconfig
@@ -25,7 +25,7 @@ config BOARD_ASUS_M2V_MX_SE
 	select NORTHBRIDGE_AMD_AMDK8
 	select NORTHBRIDGE_AMD_AMDK8_ROOT_COMPLEX
 	select SOUTHBRIDGE_VIA_VT8237R
-	select SOUTHBRIDGE_VIA_K8T890
+	select SOUTHBRIDGE_VIA_K8M890
 	select SUPERIO_ITE_IT8712F
 	select USE_PRINTK_IN_CAR
 	select USE_DCACHE_RAM
diff --git a/src/southbridge/via/Makefile.inc b/src/southbridge/via/Makefile.inc
index ca555795b2..a1fb94eda9 100644
--- a/src/southbridge/via/Makefile.inc
+++ b/src/southbridge/via/Makefile.inc
@@ -1,4 +1,5 @@
 subdirs-$(CONFIG_SOUTHBRIDGE_VIA_K8T890) += k8t890
+subdirs-$(CONFIG_SOUTHBRIDGE_VIA_K8M890) += k8t890
 subdirs-$(CONFIG_SOUTHBRIDGE_VIA_VT8231) += vt8231
 subdirs-$(CONFIG_SOUTHBRIDGE_VIA_VT8235) += vt8235
 subdirs-$(CONFIG_SOUTHBRIDGE_VIA_VT8237R) += vt8237r
diff --git a/src/southbridge/via/k8t890/Kconfig b/src/southbridge/via/k8t890/Kconfig
index c921e67e8e..5ba3e5c307 100644
--- a/src/southbridge/via/k8t890/Kconfig
+++ b/src/southbridge/via/k8t890/Kconfig
@@ -1,17 +1,20 @@
+config SOUTHBRIDGE_VIA_K8M890
+	bool
+
 config SOUTHBRIDGE_VIA_K8T890
 	bool
 
-config SOUTHBRIDGE_VIA_K8T890_VGA_EN
+config SOUTHBRIDGE_VIA_K8M890_VGA_EN
 	bool "Enable onboard K8M890 graphics"
 	default y
-	depends on SOUTHBRIDGE_VIA_K8T890
+	depends on SOUTHBRIDGE_VIA_K8M890
 	select VGA
 	select GFXUMA
 
 choice
 	prompt "Framebuffer size"
 	default K8M890_VIDEO_MB_32MB
-	depends on SOUTHBRIDGE_VIA_K8T890_VGA_EN
+	depends on SOUTHBRIDGE_VIA_K8M890_VGA_EN
 
 config K8M890_VIDEO_MB_32MB
 	bool "32MB"
@@ -33,4 +36,4 @@ config VIDEO_MB
 	default 128  if K8M890_VIDEO_MB_128MB
 	default 256 if K8M890_VIDEO_MB_256MB
 	default -1  if K8M890_VIDEO_MB_CMOS
-	depends on SOUTHBRIDGE_VIA_K8T890_VGA_EN
+	depends on SOUTHBRIDGE_VIA_K8M890_VGA_EN
diff --git a/src/southbridge/via/k8t890/k8t890_dram.c b/src/southbridge/via/k8t890/k8t890_dram.c
index 4f99fec155..42c7881e82 100644
--- a/src/southbridge/via/k8t890/k8t890_dram.c
+++ b/src/southbridge/via/k8t890/k8t890_dram.c
@@ -98,7 +98,8 @@ static void dram_enable_k8m890(struct device *dev)
 
 	msr = rdmsr(TOP_MEM);
 	uma_memory_base = msr.lo - uma_memory_size;
-	printk(BIOS_INFO, "K8M890: UMA base is %llx size is %d (MB)\n", uma_memory_base, uma_memory_size / 1024 / 1024);
+	printk(BIOS_INFO, "K8M890: UMA base is %llx size is %u (MB)\n", uma_memory_base,
+				(u32) (uma_memory_size / 1024 / 1024));
 	/* enable VGA, so the bridges gets VGA_EN and resources are set */
 	pci_write_config8(dev, 0xa1, 0x80);
 #endif
@@ -131,7 +132,6 @@ static void dram_init_fb(struct device *dev)
 	 */
 	unsigned int fbbits = 0;
 	u8 tmp;
-	int ret;
 
 	fbbits = ((log2(uma_memory_size >> 20) - 2) << 4);
 	printk(BIOS_INFO, "K8M890: Using a %dMB framebuffer.\n", (unsigned int) (uma_memory_size >> 20));