summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGabe Black <gabeblack@chromium.org>2012-11-03 11:41:26 +0000
committerSimon Glass <sjg@chromium.org>2012-12-06 14:30:41 -0800
commitd65297b64d743105b18d912fa62627d6bf468c2f (patch)
tree4b0783345e78aea65cae32548058c40c65595973
parent842d33874fddd8b6d2005987c53d05958985441a (diff)
downloadu-boot-imx-d65297b64d743105b18d912fa62627d6bf468c2f.zip
u-boot-imx-d65297b64d743105b18d912fa62627d6bf468c2f.tar.gz
u-boot-imx-d65297b64d743105b18d912fa62627d6bf468c2f.tar.bz2
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>
-rw-r--r--arch/x86/lib/init_helpers.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/x86/lib/init_helpers.c b/arch/x86/lib/init_helpers.c
index 9fd87df..3a62b2e 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;