Author: ruik Date: Sun Apr 25 22:24:09 2010 New Revision: 5497 URL: https://tracker.coreboot.org/trac/coreboot/changeset/5497
Log: 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 <[email protected]> Acked-by: Rudolf Marek <[email protected]> Modified: trunk/src/mainboard/asus/a8v-e_se/Kconfig trunk/src/mainboard/asus/m2v-mx_se/Kconfig trunk/src/southbridge/via/Makefile.inc trunk/src/southbridge/via/k8t890/Kconfig trunk/src/southbridge/via/k8t890/k8t890_dram.c Modified: trunk/src/mainboard/asus/a8v-e_se/Kconfig ============================================================================== --- trunk/src/mainboard/asus/a8v-e_se/Kconfig Sun Apr 25 20:06:32 2010 (r5496) +++ trunk/src/mainboard/asus/a8v-e_se/Kconfig Sun Apr 25 22:24:09 2010 (r5497) @@ -83,4 +83,3 @@ hex default 0x1043 depends on BOARD_ASUS_A8V_E_SE - Modified: trunk/src/mainboard/asus/m2v-mx_se/Kconfig ============================================================================== --- trunk/src/mainboard/asus/m2v-mx_se/Kconfig Sun Apr 25 20:06:32 2010 (r5496) +++ trunk/src/mainboard/asus/m2v-mx_se/Kconfig Sun Apr 25 22:24:09 2010 (r5497) @@ -25,7 +25,7 @@ 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 Modified: trunk/src/southbridge/via/Makefile.inc ============================================================================== --- trunk/src/southbridge/via/Makefile.inc Sun Apr 25 20:06:32 2010 (r5496) +++ trunk/src/southbridge/via/Makefile.inc Sun Apr 25 22:24:09 2010 (r5497) @@ -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 Modified: trunk/src/southbridge/via/k8t890/Kconfig ============================================================================== --- trunk/src/southbridge/via/k8t890/Kconfig Sun Apr 25 20:06:32 2010 (r5496) +++ trunk/src/southbridge/via/k8t890/Kconfig Sun Apr 25 22:24:09 2010 (r5497) @@ -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 @@ 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 Modified: trunk/src/southbridge/via/k8t890/k8t890_dram.c ============================================================================== --- trunk/src/southbridge/via/k8t890/k8t890_dram.c Sun Apr 25 20:06:32 2010 (r5496) +++ trunk/src/southbridge/via/k8t890/k8t890_dram.c Sun Apr 25 22:24:09 2010 (r5497) @@ -98,7 +98,8 @@ 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 @@ */ 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)); -- coreboot mailing list: [email protected] http://www.coreboot.org/mailman/listinfo/coreboot
