commit fe0c33a5acc8cc5400747200802089177bd94b58
author Bin Meng <bmeng.cn@gmail.com> Fri Dec 12 21:05:22 2014 +0800
committer Simon Glass <sjg@chromium.org> Sat Dec 13 22:32:04 2014 -0700
tree 1c95fc97caa55bfb3f81d6ecf750db36023a5cdd
parent c7016234f77e3c46dab08f84399bcc4b48268c04

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>

arch/x86/cpu/start.S

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

arch/x86/lib/asm-offsets.c

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