Patchwork [6/6] Geode GX2 cleanup patch

login
register
about
Submitter Nils
Date 2010-12-23 00:05:55
Message ID <201012230105.55125.njacobs8@hetnet.nl>
Download mbox | patch
Permalink /patch/2450/
State Accepted
Commit r6211
Headers show

Comments

Nils - 2010-12-23 00:05:55
Move VIDEO_MB to Kconfig.

Signed-off-by: Nils Jacobs <njacobs8@hetnet.nl>

Thanks, Nils.
Peter Stuge - 2010-12-26 05:25:53
Nils wrote:
> Move VIDEO_MB to Kconfig.

> +++ src/northbridge/amd/gx2/Kconfig	(working copy)
> @@ -21,6 +21,11 @@
>  	bool
>  	select GEODE_VSA
>  
> +config VIDEO_MB
> +	int
> +	default 8
> +	depends on NORTHBRIDGE_AMD_GX2
> +

Acked-by: Peter Stuge <peter@stuge.se>

r6211

But only on the condition that you send a followup patch to change
this option into a choice in the user interface. Please see e.g. how
src/southbridge/via/k8t890/Kconfig implements this. Thanks!

Patch

Index: src/northbridge/amd/gx2/Kconfig
===================================================================
--- src/northbridge/amd/gx2/Kconfig	(revision 6205)
+++ src/northbridge/amd/gx2/Kconfig	(working copy)
@@ -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
Index: src/northbridge/amd/gx2/grphinit.c
===================================================================
--- src/northbridge/amd/gx2/grphinit.c	(revision 6205)
+++ src/northbridge/amd/gx2/grphinit.c	(working copy)
@@ -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));
 }
 
 
Index: src/northbridge/amd/gx2/northbridge.c
===================================================================
--- src/northbridge/amd/gx2/northbridge.c	(revision 6205)
+++ src/northbridge/amd/gx2/northbridge.c	(working copy)
@@ -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 +302,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;