diff options
author | Wolfgang Denk <wd@denx.de> | 2012-02-17 23:47:29 +0100 |
---|---|---|
committer | Wolfgang Denk <wd@denx.de> | 2012-02-17 23:47:29 +0100 |
commit | e390e8709149664ff96cf19384264c84573f3082 (patch) | |
tree | a14b00ce6732eedf0b9c20b2cb54f17f1ac14596 /arch/x86/include/asm/u-boot-x86.h | |
parent | e9d44b35beb45869863f3ca6929089d9df4df3e5 (diff) | |
parent | afd855d534de22aa625cb12aa9aa45e459f7de99 (diff) | |
download | u-boot-imx-e390e8709149664ff96cf19384264c84573f3082.zip u-boot-imx-e390e8709149664ff96cf19384264c84573f3082.tar.gz u-boot-imx-e390e8709149664ff96cf19384264c84573f3082.tar.bz2 |
Merge branch 'master' of git://git.denx.de/u-boot-x86
* 'master' of git://git.denx.de/u-boot-x86:
x86: Convert board_init_f_r to a processing loop
x86: Split init functions out of board.c
x86: Move relocation code out of board.c
x86: Move setup_pcat_compatibility() out of board.c
x86: Move do_go_exec() out of board.c
CHECKPATCH: arch/x86/lib/*
x86: Tweak IDT and GDT for alignment and readability
x86: Allow cache before copy to RAM
x86: Create weak init_cache() and default enable_caches() functions
x86: Set GD_FLG_RELOC after entering in-RAM copy of U-Boot
x86: Use fs for global data
x86: Rework relocation calculations
x86: Simplify Flash-to-RAM code execution transition
x86: Rework Global Descriptor Table loading
x86: Remove GDR related magic numbers
x86: Speed up copy-to-RAM and clear BSS operations
x86: Import glibc memcpy implementation
Diffstat (limited to 'arch/x86/include/asm/u-boot-x86.h')
-rw-r--r-- | arch/x86/include/asm/u-boot-x86.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/x86/include/asm/u-boot-x86.h b/arch/x86/include/asm/u-boot-x86.h index 755f88a..878a1ee 100644 --- a/arch/x86/include/asm/u-boot-x86.h +++ b/arch/x86/include/asm/u-boot-x86.h @@ -37,6 +37,9 @@ int x86_cpu_init_r(void); int cpu_init_r(void); int x86_cpu_init_f(void); int cpu_init_f(void); +void init_gd(gd_t *id, u64 *gdt_addr); +void setup_gdt(gd_t *id, u64 *gdt_addr); +int init_cache(void); /* cpu/.../timer.c */ void timer_isr(void *); @@ -61,5 +64,7 @@ u32 isa_map_rom(u32 bus_addr, int size); int video_bios_init(void); int video_init(void); +void board_init_f_r_trampoline(ulong) __attribute__ ((noreturn)); +void board_init_f_r(void) __attribute__ ((noreturn)); #endif /* _U_BOOT_I386_H_ */ |