summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBin Meng <bmeng.cn@gmail.com>2014-12-12 21:05:22 +0800
committerSimon Glass <sjg@chromium.org>2014-12-13 22:32:04 -0700
commitfe0c33a5acc8cc5400747200802089177bd94b58 (patch)
tree1c95fc97caa55bfb3f81d6ecf750db36023a5cdd
parentc7016234f77e3c46dab08f84399bcc4b48268c04 (diff)
downloadu-boot-imx-fe0c33a5acc8cc5400747200802089177bd94b58.zip
u-boot-imx-fe0c33a5acc8cc5400747200802089177bd94b58.tar.gz
u-boot-imx-fe0c33a5acc8cc5400747200802089177bd94b58.tar.bz2
x86: Clean up asm-offsets
Move GD_BIST from lib/asm-offsets.c to arch/x86/lib/asm-offsets.c as it is x86 arch specific stuff. Also remove GENERATED_GD_RELOC_OFF which is not referenced anymore. Signed-off-by: Bin Meng <bmeng.cn@gmail.com> Acked-by: Simon Glass <sjg@chromium.org>
-rw-r--r--arch/x86/cpu/start.S3
-rw-r--r--arch/x86/lib/asm-offsets.c2
-rw-r--r--lib/asm-offsets.c3
3 files changed, 3 insertions, 5 deletions
diff --git a/arch/x86/cpu/start.S b/arch/x86/cpu/start.S
index b0d0ac0..f9662fb 100644
--- a/arch/x86/cpu/start.S
+++ b/arch/x86/cpu/start.S
@@ -1,5 +1,5 @@
/*
- * U-boot - x86 Startup Code
+ * U-Boot - x86 Startup Code
*
* (C) Copyright 2008-2011
* Graeme Russ, <graeme.russ@gmail.com>
@@ -17,6 +17,7 @@
#include <asm/processor.h>
#include <asm/processor-flags.h>
#include <generated/generic-asm-offsets.h>
+#include <generated/asm-offsets.h>
.section .text
.code32
diff --git a/arch/x86/lib/asm-offsets.c b/arch/x86/lib/asm-offsets.c
index d65c6ab..50a488f 100644
--- a/arch/x86/lib/asm-offsets.c
+++ b/arch/x86/lib/asm-offsets.c
@@ -17,6 +17,6 @@
int main(void)
{
- DEFINE(GENERATED_GD_RELOC_OFF, offsetof(gd_t, reloc_off));
+ DEFINE(GD_BIST, offsetof(gd_t, arch.bist));
return 0;
}
diff --git a/lib/asm-offsets.c b/lib/asm-offsets.c
index 580f763..129bc3e 100644
--- a/lib/asm-offsets.c
+++ b/lib/asm-offsets.c
@@ -31,9 +31,6 @@ int main(void)
#ifdef CONFIG_SYS_MALLOC_F_LEN
DEFINE(GD_MALLOC_BASE, offsetof(struct global_data, malloc_base));
#endif
-#ifdef CONFIG_X86
- DEFINE(GD_BIST, offsetof(struct global_data, arch.bist));
-#endif
#if defined(CONFIG_ARM)