Merge branch 'master' of git://git.denx.de/u-boot-arm into HEAD

[karo-tx-uboot.git] / common / board_r.c

diff --git a/common/board_r.c b/common/board_r.c
index c57ae5cace163dcd578e91612d309bf87db2ac7c..2b17fa6cfedef6db677d1931dfe6ca7af2f5f769 100644 (file)
--- a/common/board_r.c
+++ b/common/board_r.c
@@ -63,6 +63,9 @@
 #include <asm/mmu.h>
 #endif
 #include <asm/sections.h>
+#ifdef CONFIG_X86
+#include <asm/init_helpers.h>
+#endif
 #include <linux/compiler.h>
 
 DECLARE_GLOBAL_DATA_PTR;
@@ -504,11 +507,13 @@ static int show_model_r(void)
 #endif
 
 /* enable exceptions */
+#ifdef CONFIG_ARM
 static int initr_enable_interrupts(void)
 {
        enable_interrupts();
        return 0;
 }
+#endif
 
 #ifdef CONFIG_CMD_NET
 static int initr_ethaddr(void)
@@ -764,11 +769,16 @@ init_fnc_t init_sequence_r[] = {
        initr_flash,
 #endif
        INIT_FUNC_WATCHDOG_RESET
-#ifdef CONFIG_PPC
+#if defined(CONFIG_PPC) || defined(CONFIG_X86)
        /* initialize higher level parts of CPU like time base and timers */
        cpu_init_r,
+#endif
+#ifdef CONFIG_PPC
        initr_spi,
 #endif
+#if defined(CONFIG_X86) && defined(CONFIG_SPI)
+       init_func_spi,
+#endif
 #ifdef CONFIG_CMD_NAND
        initr_nand,
 #endif
@@ -821,11 +831,17 @@ init_fnc_t init_sequence_r[] = {
        INIT_FUNC_WATCHDOG_RESET
 #ifdef CONFIG_CMD_KGDB
        initr_kgdb,
+#endif
+#ifdef CONFIG_X86
+       board_early_init_r,
 #endif
        interrupt_init,
-#ifdef CONFIG_ARM
+#if defined(CONFIG_ARM) || defined(CONFIG_x86)
        initr_enable_interrupts,
 #endif
+#ifdef CONFIG_X86
+       timer_init,             /* initialize timer */
+#endif
 #if defined(CONFIG_STATUS_LED) && defined(STATUS_LED_BOOT)
        initr_status_led,
 #endif
@@ -887,7 +903,9 @@ init_fnc_t init_sequence_r[] = {
 
 void board_init_r(gd_t *new_gd, ulong dest_addr)
 {
+#ifndef CONFIG_X86
        gd = new_gd;
+#endif
        if (initcall_run_list(init_sequence_r))
                hang();