intel: Remove GFXUMA and related global variables

Remove use of global variables uma_memory_base and uma_memory_size
from builds with Intel northbridges, as these variables can be kept
within the chipset or even as stack locals.

Intel platforms have no functional implemenation for option GFXUMA.
If we did implement some choice between external and integrated graphics,
it needs to be named in less obscure fashion.

Change-Id: I12f18c4ee6bc89e65a561db6c2b514956f3e2d03
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: http://review.coreboot.org/5720
Tested-by: build bot (Jenkins)
Reviewed-by: Patrick Georgi <patrick@georgi-clan.de>

6 files changed, 12 insertions, 0 deletions

diff --git a/src/northbridge/intel/fsp_sandybridge/northbridge.c b/src/northbridge/intel/fsp_sandybridge/northbridge.c
index 2922ca0e6a..182252d00b 100644
--- a/src/northbridge/intel/fsp_sandybridge/northbridge.c
+++ b/src/northbridge/intel/fsp_sandybridge/northbridge.c
@@ -41,6 +41,10 @@
 static int bridge_revision_id = -1;
 static u8 finished_FSP_after_pci = 0;
 
+/* IGD UMA memory */
+static uint64_t uma_memory_base = 0;
+static uint64_t uma_memory_size = 0;
+
 int bridge_silicon_revision(void)
 {
 	if (bridge_revision_id < 0) {
diff --git a/src/northbridge/intel/i82810/northbridge.c b/src/northbridge/intel/i82810/northbridge.c
index 2e07db8099..9d10f1d68f 100644
--- a/src/northbridge/intel/i82810/northbridge.c
+++ b/src/northbridge/intel/i82810/northbridge.c
@@ -73,6 +73,7 @@ static void pci_domain_set_resources(device_t dev)
 {
 	device_t mc_dev;
 	int igd_memory = 0;
+	uint64_t uma_memory_base = 0, uma_memory_size = 0;
 
 	mc_dev = dev->link_list->children;
 	if (!mc_dev)
diff --git a/src/northbridge/intel/i82830/northbridge.c b/src/northbridge/intel/i82830/northbridge.c
index 08ed279750..c78bdf11f4 100644
--- a/src/northbridge/intel/i82830/northbridge.c
+++ b/src/northbridge/intel/i82830/northbridge.c
@@ -54,6 +54,7 @@ static void pci_domain_set_resources(device_t dev)
 {
 	device_t mc_dev;
 	int igd_memory = 0;
+	uint64_t uma_memory_base = 0, uma_memory_size = 0;
 
 	mc_dev = dev->link_list->children;
 	if (!mc_dev)
diff --git a/src/northbridge/intel/i945/northbridge.c b/src/northbridge/intel/i945/northbridge.c
index 922a81950e..180ffde4c2 100644
--- a/src/northbridge/intel/i945/northbridge.c
+++ b/src/northbridge/intel/i945/northbridge.c
@@ -87,6 +87,7 @@ static void pci_domain_set_resources(device_t dev)
 	uint8_t tolud, reg8;
 	uint16_t reg16;
 	unsigned long long tomk, tomk_stolen;
+	uint64_t uma_memory_base = 0, uma_memory_size = 0;
 	uint64_t tseg_memory_base = 0, tseg_memory_size = 0;
 
 	/* Can we find out how much memory we can use at most
diff --git a/src/northbridge/intel/sandybridge/northbridge.c b/src/northbridge/intel/sandybridge/northbridge.c
index 1fd252bcc0..5f9912ff6d 100644
--- a/src/northbridge/intel/sandybridge/northbridge.c
+++ b/src/northbridge/intel/sandybridge/northbridge.c
@@ -39,6 +39,10 @@
 
 static int bridge_revision_id = -1;
 
+/* IGD UMA memory */
+static uint64_t uma_memory_base = 0;
+static uint64_t uma_memory_size = 0;
+
 int bridge_silicon_revision(void)
 {
 	if (bridge_revision_id < 0) {
diff --git a/src/northbridge/intel/sch/northbridge.c b/src/northbridge/intel/sch/northbridge.c
index 9dc33f581d..0bbf91b140 100644
--- a/src/northbridge/intel/sch/northbridge.c
+++ b/src/northbridge/intel/sch/northbridge.c
@@ -99,6 +99,7 @@ static void pci_domain_set_resources(device_t dev)
 	u8 reg8;
 	u16 reg16;
 	unsigned long long tomk, tolud, tomk_stolen;
+	uint64_t uma_memory_base = 0, uma_memory_size = 0;
 	uint64_t tseg_memory_base = 0, tseg_memory_size = 0;
 
 	/* Can we find out how much memory we can use at most this way? */