From 91fac61240612291f7be3362f7acad31803e8b03 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ky=C3=B6sti=20M=C3=A4lkki?= <kyosti.malkki@gmail.com>
Date: Wed, 31 Dec 2014 20:55:19 +0200
Subject: CBMEM: Tidy up CAR migration
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Move the  CAR migration call to arch -specific part of CBMEM init,
it is truly a x86 specific thing.

Change-Id: I715417e54f197b8745e0670d6b900a5660178141
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: http://review.coreboot.org/7860
Reviewed-by: Aaron Durbin <adurbin@google.com>
Tested-by: build bot (Jenkins)
---
 src/arch/x86/boot/cbmem.c | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'src/arch/x86/boot')

diff --git a/src/arch/x86/boot/cbmem.c b/src/arch/x86/boot/cbmem.c
index af42edd841..80588c385d 100644
--- a/src/arch/x86/boot/cbmem.c
+++ b/src/arch/x86/boot/cbmem.c
@@ -21,6 +21,7 @@
 #include <arch/acpi.h>
 
 /* FIXME: Remove after CBMEM_INIT_HOOKS. */
+#include <arch/early_variables.h>
 #include <cpu/x86/gdt.h>
 #include <console/cbmem_console.h>
 #include <timestamp.h>
@@ -76,6 +77,9 @@ void *cbmem_top(void)
 
 void cbmem_run_init_hooks(void)
 {
+	/* Migrate car.global_data. */
+	car_migrate_variables();
+
 #if !defined(__PRE_RAM__)
 	/* Relocate CBMEM console. */
 	cbmemc_reinit();
-- 
cgit v1.2.3