[U-Boot] [RFC 05/14] x86: Create weak init_cache() function

[Graeme Russ]

---
 arch/x86/cpu/cpu.c                |   16 +++++++++++-----
 arch/x86/include/asm/u-boot-x86.h |    2 ++
 arch/x86/lib/board.c              |    3 +++
 3 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/arch/x86/cpu/cpu.c b/arch/x86/cpu/cpu.c
index 61d0b69..a8069ad 100644
--- a/arch/x86/cpu/cpu.c
+++ b/arch/x86/cpu/cpu.c
@@ -105,6 +105,16 @@ int cpu_init_f(void) __attribute__((weak, 
alias("x86_cpu_init_f")));
 
 int x86_cpu_init_r(void)
 {
+       reload_gdt();
+
+       /* Initialize core interrupt and exception functionality of CPU */
+       cpu_init_interrupts();
+       return 0;
+}
+int cpu_init_r(void) __attribute__((weak, alias("x86_cpu_init_r")));
+
+int x86_init_cache(void)
+{
        const u32 nw_cd_rst = ~(X86_CR0_NW | X86_CR0_CD);
 
        /* turn on the cache and disable write through */
@@ -113,13 +123,9 @@ int x86_cpu_init_r(void)
            "movl       %%eax, %%cr0\n"
            "wbinvd\n" : : "i" (nw_cd_rst) : "eax");
 
-       reload_gdt();
-
-       /* Initialize core interrupt and exception functionality of CPU */
-       cpu_init_interrupts();
        return 0;
 }
-int cpu_init_r(void) __attribute__((weak, alias("x86_cpu_init_r")));
+int init_cache(void) __attribute__((weak, alias("x86_init_cache")));
 
 int do_reset(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 {
diff --git a/arch/x86/include/asm/u-boot-x86.h 
b/arch/x86/include/asm/u-boot-x86.h
index 757a8ee..eaa50cc 100644
--- a/arch/x86/include/asm/u-boot-x86.h
+++ b/arch/x86/include/asm/u-boot-x86.h
@@ -37,6 +37,8 @@ int x86_cpu_init_r(void);
 int cpu_init_r(void);
 int x86_cpu_init_f(void);
 int cpu_init_f(void);
+int x86_init_cache(void);
+int init_cache(void);
 
 /* cpu/.../timer.c */
 void timer_isr(void *);
diff --git a/arch/x86/lib/board.c b/arch/x86/lib/board.c
index 4736477..fb2b92c 100644
--- a/arch/x86/lib/board.c
+++ b/arch/x86/lib/board.c
@@ -267,6 +267,9 @@ void relocate_code(ulong stack_ptr, gd_t *id, ulong 
reloc_addr)
 
        id->start_addr_sp = stack_ptr;
 
+       if (init_cache() != 0)
+               hang();
+
        calculate_relocation_address(id);
        copy_uboot_to_ram(id);
        clear_bss(id);
-- 
1.7.5.2.317.g391b14

_______________________________________________
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot