New patch to review for coreboot: e6fe83c AMD Agesa and GFXUMA: drop use of uma_memory_base

[Kyösti Mälkki]

Kyösti Mälkki ([e-mail]) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/1247

-gerrit

commit e6fe83cf469724481f35c9ae05bf94a23d5d7ae0
Author: Kyösti Mälkki 
Date:   Fri Jul 20 08:31:37 2012 +0300

AMD Agesa and GFXUMA: drop use of uma_memory_base

Without GFXUMA, variables were not referenced anywhere.
    Fail builds on Family10 if GFXUMA is selected, because the northbridge
    code does not set UMA base or size.

Change-Id: I15b91cf6241e9a890398eed03824b753828a0a51
    Signed-off-by: Kyösti Mälkki 
---
 src/northbridge/amd/agesa/family10/northbridge.c |    4 ++++
 src/northbridge/amd/agesa/family12/northbridge.c |    3 ---
 src/northbridge/amd/agesa/family14/northbridge.c |    3 ---
 src/northbridge/amd/agesa/family15/northbridge.c |    3 ---
 4 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/src/northbridge/amd/agesa/family10/northbridge.c b/src/northbridge/amd/agesa/family10/northbridge.c
index c4acedf..831aec0 100644
--- a/src/northbridge/amd/agesa/family10/northbridge.c
+++ b/src/northbridge/amd/agesa/family10/northbridge.c
@@ -923,6 +923,10 @@ static void amdfam10_domain_set_resources(device_t dev)
    u32 reset_memhole = 1;
 #endif

+#if CONFIG_GFXUMA
+#error Northbridge does not set uma_memory_base or uma_memory_size.
+#endif
+
 #if CONFIG_PCI_64BIT_PREF_MEM

for (link = dev->link_list; link; link = link->next) {
diff --git a/src/northbridge/amd/agesa/family12/northbridge.c b/src/northbridge/amd/agesa/family12/northbridge.c
index d7458ff..7ac8996 100644
--- a/src/northbridge/amd/agesa/family12/northbridge.c
+++ b/src/northbridge/amd/agesa/family12/northbridge.c
@@ -508,9 +508,6 @@ void setup_uma_memory(void)
         __func__, uma_memory_size, uma_memory_base);

/* TODO: TOP_MEM2 */
-#else
-  uma_memory_size = 0x10000000; /* 256M recommended UMA */
-  uma_memory_base = 0x30000000; /* 1GB  system memory supported */
 #endif
 }

diff --git a/src/northbridge/amd/agesa/family14/northbridge.c b/src/northbridge/amd/agesa/family14/northbridge.c
index dbc432a..6cdff27 100644
--- a/src/northbridge/amd/agesa/family14/northbridge.c
+++ b/src/northbridge/amd/agesa/family14/northbridge.c
@@ -553,9 +553,6 @@ void setup_uma_memory(void)
    		__func__, uma_memory_size, uma_memory_base);

/* TODO: TOP_MEM2 */
-#else
-	uma_memory_size = 0x10000000;	/* 256M recommended UMA */
-	uma_memory_base = 0x30000000;	/* 1GB  system memory supported */
 #endif
 }

diff --git a/src/northbridge/amd/agesa/family15/northbridge.c b/src/northbridge/amd/agesa/family15/northbridge.c
index 2036dbf..be86fda 100644
--- a/src/northbridge/amd/agesa/family15/northbridge.c
+++ b/src/northbridge/amd/agesa/family15/northbridge.c
@@ -668,9 +668,6 @@ void setup_uma_memory(void)
    		__func__, uma_memory_size, uma_memory_base);

/* TODO: TOP_MEM2 */
-#else
-	uma_memory_size = 256 * ONE_MB; /* 256M recommended UMA */
-	uma_memory_base = 768 * ONE_MB; /* 1GB  system memory supported */
 #endif
 }