x86: Create weak init_cache() and default enable_caches() functions

--
Changes for v2:
 - Tweaked commit title

diff --git a/arch/x86/cpu/cpu.c b/arch/x86/cpu/cpu.c
index 8c3b92c78dcbe92331948b9752c6705389eb0f50..e9bb0d770a379f6c329085da7217a3ba0dccd165 100644 (file)
--- a/arch/x86/cpu/cpu.c
+++ b/arch/x86/cpu/cpu.c
@@ -139,6 +139,14 @@ int x86_cpu_init_f(void)
 int cpu_init_f(void) __attribute__((weak, alias("x86_cpu_init_f")));
 
 int x86_cpu_init_r(void)
+{
+       /* 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")));
+
+void x86_enable_caches(void)
 {
        const u32 nw_cd_rst = ~(X86_CR0_NW | X86_CR0_CD);
 
@@ -147,12 +155,16 @@ int x86_cpu_init_r(void)
            "andl       %0, %%eax\n"
            "movl       %%eax, %%cr0\n"
            "wbinvd\n" : : "i" (nw_cd_rst) : "eax");
+}
+void enable_caches(void) __attribute__((weak, alias("x86_enable_caches")));
+
+int x86_init_cache(void)
+{
+       enable_caches();
 
-       /* 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 5540d517692539624a545c659b7f2385d2599f23..878a1ee77b116da67f5b9a43179f395c8daefe95 100644 (file)
--- a/arch/x86/include/asm/u-boot-x86.h
+++ b/arch/x86/include/asm/u-boot-x86.h
@@ -39,6 +39,7 @@ 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 *);

diff --git a/arch/x86/lib/board.c b/arch/x86/lib/board.c
index 3d82165af30fff40a242cb4d8bcfec0342d29796..56acf3563700cf63f78118f08d44a525ccc44779 100644 (file)
--- a/arch/x86/lib/board.c
+++ b/arch/x86/lib/board.c
@@ -140,6 +140,7 @@ init_fnc_t *init_sequence_f[] = {
 
 init_fnc_t *init_sequence_r[] = {
        copy_gd_to_ram,
+       init_cache,
        cpu_init_r,             /* basic cpu dependent setup */
        board_early_init_r,     /* basic board dependent setup */
        dram_init,              /* configure available RAM banks */