From 8313315b9ab3a130784a2a7d0c4f329808690c0b Mon Sep 17 00:00:00 2001
From: Gabe Black <gabeblack@chromium.org>
Date: Sat, 3 Nov 2012 11:41:23 +0000
Subject: [PATCH] x86: Initialise SPI if enabled
If we have SPI support, make sure that we init it.
Signed-off-by: Gabe Black <gabeblack@google.com>
Signed-off-by: Simon Glass <sjg@chromium.org>
Signed-off-by: Vic Yang <victoryang@chromium.org>
---
arch/x86/include/asm/init_helpers.h | 1 +
arch/x86/lib/board.c | 3 +++
arch/x86/lib/init_helpers.c | 9 +++++++++
3 files changed, 13 insertions(+)
diff --git a/arch/x86/include/asm/init_helpers.h b/arch/x86/include/asm/init_helpers.h
index ade694fba3..2f437e0343 100644
--- a/arch/x86/include/asm/init_helpers.h
+++ b/arch/x86/include/asm/init_helpers.h
@@ -37,5 +37,6 @@ int init_bd_struct_r(void);
int flash_init_r(void);
int status_led_set_r(void);
int set_load_addr_r(void);
+int init_func_spi(void);
#endif /* !_INIT_HELPERS_H_ */
diff --git a/arch/x86/lib/board.c b/arch/x86/lib/board.c
index c7d89604ca..2ffe0614dc 100644
--- a/arch/x86/lib/board.c
+++ b/arch/x86/lib/board.c
@@ -153,6 +153,9 @@ init_fnc_t *init_sequence_r[] = {
serial_initialize_r,
#ifndef CONFIG_SYS_NO_FLASH
flash_init_r,
+#endif
+#ifdef CONFIG_SPI
+ init_func_spi;
#endif
env_relocate_r,
#ifdef CONFIG_PCI
diff --git a/arch/x86/lib/init_helpers.c b/arch/x86/lib/init_helpers.c
index 87c7263fcb..d10a846cfd 100644
--- a/arch/x86/lib/init_helpers.c
+++ b/arch/x86/lib/init_helpers.c
@@ -28,6 +28,7 @@
#include <net.h>
#include <ide.h>
#include <serial.h>
+#include <spi.h>
#include <status_led.h>
#include <asm/processor.h>
#include <asm/u-boot-x86.h>
@@ -160,3 +161,11 @@ int set_load_addr_r(void)
return 0;
}
+
+int init_func_spi(void)
+{
+ puts("SPI: ");
+ spi_init();
+ puts("ready\n");
+ return 0;
+}
--
2.39.5