summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon Glass <sjg@chromium.org>2012-12-13 20:48:41 +0000
committerTom Rini <trini@ti.com>2013-02-01 15:39:42 -0500
commit5a35e6c48e833366ea0099c0fffb63b368dba232 (patch)
treeba2e1dc53fbd250d2a6bd61736a5b04e365eeb56
parent0cecc3b67938147bc9b9dfe55a8464b4dd4092de (diff)
downloadu-boot-imx-5a35e6c48e833366ea0099c0fffb63b368dba232.zip
u-boot-imx-5a35e6c48e833366ea0099c0fffb63b368dba232.tar.gz
u-boot-imx-5a35e6c48e833366ea0099c0fffb63b368dba232.tar.bz2
x86: Move gd_addr into arch_global_data
Move this field into arch_global_data and tidy up. Signed-off-by: Simon Glass <sjg@chromium.org> [trini: Add arch/x86/cpu/cpu.c changes after Graeme's comments] Signed-off-by: Tom Rini <trini@ti.com>
-rw-r--r--arch/x86/cpu/cpu.c4
-rw-r--r--arch/x86/include/asm/global_data.h3
2 files changed, 3 insertions, 4 deletions
diff --git a/arch/x86/cpu/cpu.c b/arch/x86/cpu/cpu.c
index 4902f8b..6a23974 100644
--- a/arch/x86/cpu/cpu.c
+++ b/arch/x86/cpu/cpu.c
@@ -100,9 +100,9 @@ void setup_gdt(gd_t *id, u64 *gdt_addr)
gdt_addr[X86_GDT_ENTRY_32BIT_DS] = GDT_ENTRY(0xc093, 0, 0xfffff);
/* FS: data, read/write, 4 GB, base (Global Data Pointer) */
- id->gd_addr = id;
+ id->arch.gd_addr = id;
gdt_addr[X86_GDT_ENTRY_32BIT_FS] = GDT_ENTRY(0xc093,
- (ulong)&id->gd_addr, 0xfffff);
+ (ulong)&id->arch.gd_addr, 0xfffff);
/* 16-bit CS: code, read/execute, 64 kB, base 0 */
gdt_addr[X86_GDT_ENTRY_16BIT_CS] = GDT_ENTRY(0x109b, 0, 0x0ffff);
diff --git a/arch/x86/include/asm/global_data.h b/arch/x86/include/asm/global_data.h
index 9a4f141..eded279 100644
--- a/arch/x86/include/asm/global_data.h
+++ b/arch/x86/include/asm/global_data.h
@@ -28,6 +28,7 @@
/* Architecture-specific global data */
struct arch_global_data {
+ struct global_data *gd_addr; /* Location of Global Data */
};
/*
@@ -44,8 +45,6 @@ typedef struct global_data gd_t;
struct global_data {
struct arch_global_data arch; /* architecture-specific data */
- /* NOTE: gd_addr MUST be first member of struct global_data! */
- gd_t *gd_addr; /* Location of Global Data */
bd_t *bd;
unsigned long flags;
unsigned int baudrate;