From 19d69e3bab787f51f2eb9bef48bc49468a635016 Mon Sep 17 00:00:00 2001 From: Nils Jacobs Date: Sun, 26 Dec 2010 05:24:50 +0000 Subject: Move Geode GX2 UMA video memory size to Kconfig Signed-off-by: Nils Jacobs Acked-by: Patrick Georgi Acked-by: Peter Stuge git-svn-id: svn://svn.coreboot.org/coreboot/trunk@6211 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1 --- src/northbridge/amd/gx2/Kconfig | 5 +++++ src/northbridge/amd/gx2/grphinit.c | 5 +---- src/northbridge/amd/gx2/northbridge.c | 3 +-- 3 files changed, 7 insertions(+), 6 deletions(-) (limited to 'src') diff --git a/src/northbridge/amd/gx2/Kconfig b/src/northbridge/amd/gx2/Kconfig index a9ebb3c13b..2267a1df5d 100644 --- 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 6c043fe662..fce1190f17 100644 --- 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 6f3e17abc7..a8043dd144 100644 --- a/src/northbridge/amd/gx2/northbridge.c +++ b/src/northbridge/amd/gx2/northbridge.c @@ -15,7 +15,6 @@ #include #include #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; -- cgit v1.2.3