summaryrefslogtreecommitdiff
path: root/arch/x86
diff options
context:
space:
mode:
authorGabe Black <gabeblack@chromium.org>2011-08-04 13:18:41 -0700
committerSimon Glass <sjg@chromium.org>2011-08-29 10:59:26 -0700
commit5681e0ebc53d3a761b4c8c78d3ce9ada9379ce29 (patch)
tree543cd712f98d3dad4d32b1d24f51e081eef4c2ff /arch/x86
parentbe83bd01c8f461d91b8d52ab52fba68ced96fd80 (diff)
If the ICH SPI driver is compiled in, initialize it during startup
BUG=chrome-os-partner:4722 TEST=Built and booted on x86-alex with the right drivers enabled, saw the SPI driver work. Change-Id: Ie370b622ba2fa9c5a9f1fbc079f45b663cd76b67 Signed-off-by: Gabe Black <gabeblack@google.com> Reviewed-on: http://gerrit.chromium.org/gerrit/5378
Diffstat (limited to 'arch/x86')
-rw-r--r--arch/x86/lib/board.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/arch/x86/lib/board.c b/arch/x86/lib/board.c
index c5ff44d793..c882a55bd7 100644
--- a/arch/x86/lib/board.c
+++ b/arch/x86/lib/board.c
@@ -3,7 +3,7 @@
* Graeme Russ, <graeme.russ@gmail.com>
*
* (C) Copyright 2002
- * Daniel Engström, Omicron Ceti AB, <daniel@omicron.se>
+ * Daniel Engstr�m, Omicron Ceti AB, <daniel@omicron.se>
*
* (C) Copyright 2002
* Wolfgang Denk, DENX Software Engineering, <wd@denx.de>
@@ -42,6 +42,7 @@
#include <ide.h>
#include <serial.h>
#include <asm/u-boot-x86.h>
+#include <spi.h>
#include <elf.h>
#ifdef CONFIG_BITBANGMII
@@ -354,6 +355,10 @@ void board_init_r(gd_t *id, ulong dest_addr)
/* Initialize the console (after the relocation and devices init) */
console_init_r();
+#ifdef CONFIG_CMD_SPI
+ spi_init();
+#endif
+
#ifdef CONFIG_MISC_INIT_R
/* miscellaneous platform dependent initialisations */
misc_init_r();