From: Gabe Black <gabeblack@chromium.org>
Date: Sat, 3 Nov 2012 11:41:26 +0000 (+0000)
Subject: x86: Make calculate_relocation_address an overridable function
X-Git-Tag: v2013.01-rc2~73^2~19
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=d65297b64d743105b18d912fa62627d6bf468c2f;p=oweals%2Fu-boot.git

x86: Make calculate_relocation_address an overridable function

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>
---

diff --git a/arch/x86/lib/init_helpers.c b/arch/x86/lib/init_helpers.c
index 9fd87dfd2e..3a62b2ea06 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;
 	ulong bss_end = (ulong)&__bss_end;