Move Geode GX2 UMA video memory size to Kconfig

Signed-off-by: Nils Jacobs <njacobs8@hetnet.nl>
Acked-by: Patrick Georgi <patrick@georgi-clan.de>
Acked-by: Peter Stuge <peter@stuge.se>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@6211 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1

diff --git a/src/northbridge/amd/gx2/Kconfig b/src/northbridge/amd/gx2/Kconfig
index a9ebb3c13bc0434fc2a187a8b6440405670f5430..2267a1df5d7265d7210fc472ee32bd1373188b77 100644 (file)
--- a/src/northbridge/amd/gx2/Kconfig
+++ b/src/northbridge/amd/gx2/Kconfig
@@ -21,6 +21,11 @@ config NORTHBRIDGE_AMD_GX2
        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

diff --git a/src/northbridge/amd/gx2/grphinit.c b/src/northbridge/amd/gx2/grphinit.c
index 6c043fe66214378722fed763bec2dc126946ba0c..fce1190f179564f04aa84bf2461d1aa64f332478 100644 (file)
--- a/src/northbridge/amd/gx2/grphinit.c
+++ b/src/northbridge/amd/gx2/grphinit.c
@@ -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 @@ void graphics_init(void)
 
        /* 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));
 }
 
 

diff --git a/src/northbridge/amd/gx2/northbridge.c b/src/northbridge/amd/gx2/northbridge.c
index 6f3e17abc7bc7115bbc4e64859d5037b71a7b518..a8043dd14455f5a3eccd7ee89eb7b6988e6de2bd 100644 (file)
--- a/src/northbridge/amd/gx2/northbridge.c
+++ b/src/northbridge/amd/gx2/northbridge.c
@@ -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 @@ static void enable_dev(struct device *dev)
                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;