Arthur Heymans has uploaded this change for review.

View Change

[TEST]sb/intel/common: Remove CAR_GLOBAL use

We have NO_CAR_GLOBAL_MIGRATION now. (yes?)

Change-Id: Ic2c90d264d851ab4abeca07f412d43d088ad96dc
Signed-off-by: Arthur Heymans <arthur@aheymans.xyz>
---
M src/southbridge/intel/common/gpio.c
M src/southbridge/intel/common/pmbase.c
M src/southbridge/intel/common/spi.c
3 files changed, 4 insertions(+), 4 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/06/30506/1

diff --git a/src/southbridge/intel/common/gpio.c b/src/southbridge/intel/common/gpio.c
index 7c8cfe8..140839f 100644
--- a/src/southbridge/intel/common/gpio.c
+++ b/src/southbridge/intel/common/gpio.c
@@ -40,7 +40,7 @@
 	/* Don't assume GPIO_BASE is still the same */
 	return pci_read_config16(PCH_LPC_DEV, GPIO_BASE) & 0xfffe;
 #else
-	static u16 gpiobase CAR_GLOBAL;
+	static u16 gpiobase;
 
 	if (gpiobase)
 		return gpiobase;
diff --git a/src/southbridge/intel/common/pmbase.c b/src/southbridge/intel/common/pmbase.c
index 2de57d6..b022629 100644
--- a/src/southbridge/intel/common/pmbase.c
+++ b/src/southbridge/intel/common/pmbase.c
@@ -42,7 +42,7 @@
 	/* Don't assume PMBASE is still the same */
 	return pci_read_config16(PCH_LPC_DEV, PMBASE) & 0xfffc;
 #else
-	static u16 pmbase CAR_GLOBAL;
+	static u16 pmbase;
 
 	if (pmbase)
 		return pmbase;
diff --git a/src/southbridge/intel/common/spi.c b/src/southbridge/intel/common/spi.c
index 3ca0d6c..6ef6769 100644
--- a/src/southbridge/intel/common/spi.c
+++ b/src/southbridge/intel/common/spi.c
@@ -69,7 +69,7 @@
 
 typedef struct spi_slave ich_spi_slave;
 
-static int g_ichspi_lock CAR_GLOBAL = 0;
+static int g_ichspi_lock = 0;
 
 typedef struct ich7_spi_regs {
 	uint16_t spis;
@@ -138,7 +138,7 @@
 	uint8_t fpr_max;
 } ich_spi_controller;
 
-static ich_spi_controller g_cntlr CAR_GLOBAL;
+static ich_spi_controller g_cntlr;
 
 enum {
 	SPIS_SCIP =		0x0001,

To view, visit change 30506. To unsubscribe, or for help writing mail filters, visit settings.