diff options
| author | Kyösti Mälkki <kyosti.malkki@gmail.com> | 2012-07-20 08:31:37 +0300 |
|---|---|---|
| committer | Anton Kochkov <anton.kochkov@gmail.com> | 2012-08-02 12:55:28 +0200 |
| commit | 30f04645c1dc25a34d1e274a360a8a97f1d07f92 (patch) | |
| tree | a357b1d4e73fcf0c99c8c299bb5317d866837a5b /src/northbridge/amd/agesa | |
| parent | f803ac4a4550b6f767b67117731446d75db85a68 (diff) | |
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 <kyosti.malkki@gmail.com>
Reviewed-on: http://review.coreboot.org/1247
Reviewed-by: Zheng Bao <zheng.bao@amd.com>
Tested-by: build bot (Jenkins)
Reviewed-by: Anton Kochkov <anton.kochkov@gmail.com>
Diffstat (limited to 'src/northbridge/amd/agesa')
5 files changed, 4 insertions, 12 deletions
diff --git a/src/northbridge/amd/agesa/family10/northbridge.c b/src/northbridge/amd/agesa/family10/northbridge.c index c4acedf8eb..831aec095c 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 d7458ff8de..7ac8996f40 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 dbc432a3ea..6cdff271f6 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 2036dbf598..be86fda58a 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 } diff --git a/src/northbridge/amd/agesa/family15tn/northbridge.c b/src/northbridge/amd/agesa/family15tn/northbridge.c index fc4115e687..b572e24f77 100644 --- a/src/northbridge/amd/agesa/family15tn/northbridge.c +++ b/src/northbridge/amd/agesa/family15tn/northbridge.c @@ -677,9 +677,6 @@ void setup_uma_memory(void) __func__, uma_memory_size, uma_memory_base); /* TODO: TOP_MEM2 */ -#else - uma_memory_size = 256 << ONE_MB_SHIFT; /* 256M recommended UMA */ - uma_memory_base = 768 << ONE_MB_SHIFT; /* 1GB system memory supported */ #endif } |