Skip to contentSkip to conversation

x86: Clean up asm-offsets

PATCH New Bin Meng 2 participants 2 messages Dec 4, 2014

Subsystems (2)
lore
Share & tools
lore

Bin Meng

author
#0 lore raw

PATCH 4/25 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.

---
 arch/x86/cpu/start.S       | 3 ++-
 arch/x86/lib/asm-offsets.c | 2 +-
 lib/asm-offsets.c          | 3 ---
 3 files changed, 3 insertions(+), 5 deletions(-)
arch/x86/cpu/start.S +2 -1
index b0d0ac0..f9662fb 100644
@@ -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
arch/x86/lib/asm-offsets.c +1 -1
index d65c6ab..50a488f 100644
@@ -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;
 }
lib/asm-offsets.c +0 -3
index 580f763..129bc3e 100644
@@ -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)
 
Signature · 1 line
1.8.2.1