Patrick Georgi merged this change.

View Change

nb/intel/nehalem: Remove CAR_GLOBAL use

We have NO_CAR_GLOBAL_MIGRATION now.

Change-Id: I077f235029e3fe3b1368f028981985895d8b766b
Signed-off-by: Arthur Heymans <arthur@aheymans.xyz>
Reviewed-on: https://review.coreboot.org/c/30505
Reviewed-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
---
M src/mainboard/lenovo/x201/romstage.c
M src/northbridge/intel/nehalem/raminit.c
2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/mainboard/lenovo/x201/romstage.c b/src/mainboard/lenovo/x201/romstage.c
index 329f8d7..601c4ae 100644
--- a/src/mainboard/lenovo/x201/romstage.c
+++ b/src/mainboard/lenovo/x201/romstage.c
@@ -33,7 +33,6 @@
 #include <arch/acpi.h>
 
 #include "dock.h"
-#include <arch/early_variables.h>
 #include <southbridge/intel/ibexpeak/pch.h>
 #include <southbridge/intel/common/gpio.h>
 #include <northbridge/intel/nehalem/nehalem.h>
diff --git a/src/northbridge/intel/nehalem/raminit.c b/src/northbridge/intel/nehalem/raminit.c
index 5a1b26e..c730b5e 100644
--- a/src/northbridge/intel/nehalem/raminit.c
+++ b/src/northbridge/intel/nehalem/raminit.c
@@ -34,7 +34,6 @@
 #include <cpu/intel/speedstep.h>
 #include <cpu/intel/turbo.h>
 #include <mrc_cache.h>
-#include <arch/early_variables.h>
 
 #include "nehalem.h"
 
@@ -225,7 +224,7 @@
 };
 
 /* Global allocation of timings_car */
-timing_bounds_t timings_car[64] CAR_GLOBAL;
+timing_bounds_t timings_car[64];
 
 static void
 write_500(struct raminfo *info, int channel, u32 val, u16 addr, int bits,

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