From: Simon Glass <sjg@chromium.org>
Date: Thu, 1 Jan 2015 23:18:13 +0000 (-0700)
Subject: x86: Disable CAR before relocation on platforms that need it
X-Git-Tag: v2015.04-rc1~195^2~16
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=801d70ce026be4595e595fb6790621a6a898cee9;p=u-boot

x86: Disable CAR before relocation on platforms that need it

For platforms with CAR we should disable it before relocation. Check if
this function is available and call it if so.

Signed-off-by: Simon Glass <sjg@chromium.org>
---

diff --git a/arch/x86/cpu/start.S b/arch/x86/cpu/start.S
index 125782cf27..f51f1121d0 100644
--- a/arch/x86/cpu/start.S
+++ b/arch/x86/cpu/start.S
@@ -205,6 +205,14 @@ board_init_f_r_trampoline:
 	/* Setup global descriptor table so gd->xyz works */
 	call	setup_gdt
 
+	/* Set if we need to disable CAR */
+.weak	car_uninit
+	movl	$car_uninit, %eax
+	cmpl	$0, %eax
+	jz	1f
+
+	call	car_uninit
+1:
 	/* Re-enter U-Boot by calling board_init_f_r */
 	call	board_init_f_r