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 <[email protected]>
Acked-by: Simon Glass <[email protected]>

diff --git a/arch/x86/cpu/start.S b/arch/x86/cpu/start.S
index b0d0ac0610b158be02ac05327214e7219d2f0323..f9662fb20345731311628ac84501297bead08ae6 100644 (file)
--- 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, <[email protected]>
@@ -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 d65c6ab1b0d173f46fd4a333809ed8adf1684640..50a488f4f189bae93063de17fde96eb8c4dd9d73 100644 (file)
--- 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 580f763da67bfcc396bdbe7beb10de0e9939d3bf..129bc3e2aff7eb18d80a4a10afe9cb5688f33384 100644 (file)
--- 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)