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
 }