diff options
| author | Gabe Black <gabeblack@chromium.org> | 2012-11-03 11:41:23 +0000 |
|---|---|---|
| committer | Simon Glass <sjg@chromium.org> | 2012-12-06 14:30:41 -0800 |
| commit | 8313315b9ab3a130784a2a7d0c4f329808690c0b (patch) | |
| tree | 6d5fe1a9f4318342993286e4ccf61f2ad5b90d0b /arch | |
| parent | ac31a7b81c5519a86ddce4fde4a99ba759332abc (diff) | |
| download | talos-obmc-uboot-8313315b9ab3a130784a2a7d0c4f329808690c0b.tar.gz talos-obmc-uboot-8313315b9ab3a130784a2a7d0c4f329808690c0b.zip | |
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>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/x86/include/asm/init_helpers.h | 1 | ||||
| -rw-r--r-- | arch/x86/lib/board.c | 3 | ||||
| -rw-r--r-- | arch/x86/lib/init_helpers.c | 9 |
3 files changed, 13 insertions, 0 deletions
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 @@ -154,6 +154,9 @@ init_fnc_t *init_sequence_r[] = { #ifndef CONFIG_SYS_NO_FLASH flash_init_r, #endif +#ifdef CONFIG_SPI + init_func_spi; +#endif env_relocate_r, #ifdef CONFIG_PCI pci_init_r, 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; +} |
