diff options
| author | Graeme Russ <graeme.russ@gmail.com> | 2012-11-27 15:38:36 +0000 |
|---|---|---|
| committer | Simon Glass <sjg@chromium.org> | 2012-11-28 11:40:03 -0800 |
| commit | 8d61625d6a73307857f80002949583105545dbbc (patch) | |
| tree | 2f5da8cb7d9df09564e2c35818c429f247076582 /arch/x86/include/asm | |
| parent | e4fb6116495eafbeee5ea8ff7ea245eb5e96d012 (diff) | |
| download | u-boot-imx-8d61625d6a73307857f80002949583105545dbbc.zip u-boot-imx-8d61625d6a73307857f80002949583105545dbbc.tar.gz u-boot-imx-8d61625d6a73307857f80002949583105545dbbc.tar.bz2 | |
x86: Put global data on the stack
Putting global data on the stack simplifies the init process (and makes it
slightly quicker). During the 'flash' stage of the init sequence, global
data is in the CAR stack. After SDRAM is initialised, global data is copied
from CAR to the SDRAM stack
Signed-off-by: Graeme Russ <graeme.russ@gmail.com>
Signed-off-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'arch/x86/include/asm')
| -rw-r--r-- | arch/x86/include/asm/global_data.h | 1 | ||||
| -rw-r--r-- | arch/x86/include/asm/init_helpers.h | 1 | ||||
| -rw-r--r-- | arch/x86/include/asm/processor.h | 1 |
3 files changed, 1 insertions, 2 deletions
diff --git a/arch/x86/include/asm/global_data.h b/arch/x86/include/asm/global_data.h index 13a3ce8..59c2a90 100644 --- a/arch/x86/include/asm/global_data.h +++ b/arch/x86/include/asm/global_data.h @@ -54,7 +54,6 @@ struct global_data { unsigned long relocaddr; /* Start address of U-Boot in RAM */ unsigned long start_addr_sp; /* start_addr_stackpointer */ unsigned long gdt_addr; /* Location of GDT */ - unsigned long new_gd_addr; /* New location of Global Data */ phys_size_t ram_size; /* RAM size */ unsigned long reset_status; /* reset status register at boot */ void **jt; /* jump table */ diff --git a/arch/x86/include/asm/init_helpers.h b/arch/x86/include/asm/init_helpers.h index 8afb443..ade694f 100644 --- a/arch/x86/include/asm/init_helpers.h +++ b/arch/x86/include/asm/init_helpers.h @@ -29,7 +29,6 @@ int display_dram_config(void); int init_baudrate_f(void); int calculate_relocation_address(void); -int copy_gd_to_ram_f_r(void); int init_cache_f_r(void); int set_reloc_flag_r(void); diff --git a/arch/x86/include/asm/processor.h b/arch/x86/include/asm/processor.h index 6eb5180..17f27cb 100644 --- a/arch/x86/include/asm/processor.h +++ b/arch/x86/include/asm/processor.h @@ -41,6 +41,7 @@ enum { #else /* NOTE: If the above enum is modified, this define must be checked */ #define X86_GDT_ENTRY_32BIT_DS 3 +#define X86_GDT_NUM_ENTRIES 7 #endif #define X86_GDT_SIZE (X86_GDT_NUM_ENTRIES * X86_GDT_ENTRY_SIZE) |