From patchwork Sat Nov  3 21:41:26 2012
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: [U-Boot,
 04/20] x86: Make calculate_relocation_address an overridable function
Date: Sat, 03 Nov 2012 11:41:26 -0000
From: Simon Glass <sjg@chromium.org>
X-Patchwork-Id: 196953
Message-Id: <1351978902-23719-5-git-send-email-sjg@chromium.org>
To: U-Boot Mailing List <u-boot@lists.denx.de>

From: Gabe Black <gabeblack@chromium.org>

Different systems may have different mechanisms for picking a suitable place
to relocate U-Boot to.

Signed-off-by: Gabe Black <gabeblack@chromium.org>

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

---
arch/x86/lib/init_helpers.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/arch/x86/lib/init_helpers.c b/arch/x86/lib/init_helpers.c
index 6032ee5..fc28af7 100644
--- a/arch/x86/lib/init_helpers.c
+++ b/arch/x86/lib/init_helpers.c
@@ -32,6 +32,7 @@
 #include <status_led.h>
 #include <asm/processor.h>
 #include <asm/u-boot-x86.h>
+#include <linux/compiler.h>
 
 #include <asm/init_helpers.h>
 
@@ -72,7 +73,7 @@ int init_baudrate_f(void)
 	return 0;
 }
 
-int calculate_relocation_address(void)
+__weak int calculate_relocation_address(void)
 {
 	ulong text_start = (ulong)&__text_start;
 	/* keep .bss variables aligned */