[coreboot] [commit] r6211 - trunk/src/northbridge/amd/gx2

[repository service]

Author: stuge
Date: Sun Dec 26 06:24:50 2010
New Revision: 6211
URL: https://tracker.coreboot.org/trac/coreboot/changeset/6211

Log:
Move Geode GX2 UMA video memory size to Kconfig

Signed-off-by: Nils Jacobs <njacobs8 at hetnet.nl>
Acked-by: Patrick Georgi <patrick at georgi-clan.de>
Acked-by: Peter Stuge <peter at stuge.se>

Modified:
   trunk/src/northbridge/amd/gx2/Kconfig
   trunk/src/northbridge/amd/gx2/grphinit.c
   trunk/src/northbridge/amd/gx2/northbridge.c

Modified: trunk/src/northbridge/amd/gx2/Kconfig
==============================================================================
--- trunk/src/northbridge/amd/gx2/Kconfig	Sun Dec 26 06:21:18 2010	(r6210)
+++ trunk/src/northbridge/amd/gx2/Kconfig	Sun Dec 26 06:24:50 2010	(r6211)
@@ -21,6 +21,11 @@
 	bool
 	select GEODE_VSA
 
+config VIDEO_MB
+	int
+	default 8
+	depends on NORTHBRIDGE_AMD_GX2
+
 # The GX2_PROCESSOR_MHZ options let you chose the correct GX2 processor
 # speed in the mainboard's Kconfig file.
 config GX2_PROCESSOR_MHZ_300

Modified: trunk/src/northbridge/amd/gx2/grphinit.c
==============================================================================
--- trunk/src/northbridge/amd/gx2/grphinit.c	Sun Dec 26 06:21:18 2010	(r6210)
+++ trunk/src/northbridge/amd/gx2/grphinit.c	Sun Dec 26 06:24:50 2010	(r6211)
@@ -5,9 +5,6 @@
 #include "chip.h"
 #include "northbridge.h"
 
-/* FIXME handle UMA properly. */
-#define VIDEO_MB	8	/* MB of video memory */
-
 /* This function mirrors the Graphics_Init routine in GeodeROM. */
 void graphics_init(void)
 {
@@ -15,7 +12,7 @@
 
 	/* Call SoftVG with the main configuration parameters. */
 	/* NOTE: SoftVG expects the memory size to be given in 512 KB pages */
-	vrWrite((VRC_VG <<  8) + VG_MEM_SIZE, 0x0100 | (VIDEO_MB * 2));
+	vrWrite((VRC_VG <<  8) + VG_MEM_SIZE, 0x0100 | (CONFIG_VIDEO_MB * 2));
 }
 
 

Modified: trunk/src/northbridge/amd/gx2/northbridge.c
==============================================================================
--- trunk/src/northbridge/amd/gx2/northbridge.c	Sun Dec 26 06:21:18 2010	(r6210)
+++ trunk/src/northbridge/amd/gx2/northbridge.c	Sun Dec 26 06:24:50 2010	(r6211)
@@ -15,7 +15,6 @@
 #include <cpu/amd/vr.h>
 #include <cpu/cpu.h>
 #include "../../../southbridge/amd/cs5536/cs5536.h"
-#define VIDEO_MB 8
 
 #define NORTHBRIDGE_FILE "northbridge.c"
 
@@ -302,7 +301,7 @@
 		graphics_init();
 		dev->ops = &pci_domain_ops;
 		pci_set_method(dev);
-		tomk = ((sizeram() - VIDEO_MB) * 1024) - SMM_SIZE;
+		tomk = ((sizeram() - CONFIG_VIDEO_MB) * 1024) - SMM_SIZE;
 #if CONFIG_WRITE_HIGH_TABLES==1
 		/* Leave some space for ACPI, PIRQ and MP tables */
 		high_tables_base = (tomk * 1024) - HIGH_MEMORY_SIZE;