diff options
| author | Tom Rini <trini@ti.com> | 2013-08-12 08:48:49 -0400 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2013-08-12 08:48:49 -0400 |
| commit | 66ddf42b0e1bdb2fbe5d84bb5c1fde515633d028 (patch) | |
| tree | 7edfb92fa148bdac387dd5db63bd9457c60bd6e8 /arch | |
| parent | a78dac79ede7fbb4c9e816abc879655540c3f076 (diff) | |
| parent | 07a16f2a9cb6cbb0fbce72e649c7be214d7f801a (diff) | |
| download | u-boot-imx-66ddf42b0e1bdb2fbe5d84bb5c1fde515633d028.zip u-boot-imx-66ddf42b0e1bdb2fbe5d84bb5c1fde515633d028.tar.gz u-boot-imx-66ddf42b0e1bdb2fbe5d84bb5c1fde515633d028.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot-spi
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/include/asm/arch-zynq/hardware.h | 2 | ||||
| -rw-r--r-- | arch/microblaze/lib/board.c | 5 |
2 files changed, 7 insertions, 0 deletions
diff --git a/arch/arm/include/asm/arch-zynq/hardware.h b/arch/arm/include/asm/arch-zynq/hardware.h index 25f0e3d..081624e 100644 --- a/arch/arm/include/asm/arch-zynq/hardware.h +++ b/arch/arm/include/asm/arch-zynq/hardware.h @@ -17,6 +17,8 @@ #define ZYNQ_SDHCI_BASEADDR1 0xE0101000 #define ZYNQ_I2C_BASEADDR0 0xE0004000 #define ZYNQ_I2C_BASEADDR1 0xE0005000 +#define ZYNQ_SPI_BASEADDR0 0xE0006000 +#define ZYNQ_SPI_BASEADDR1 0xE0007000 /* Reflect slcr offsets */ struct slcr_regs { diff --git a/arch/microblaze/lib/board.c b/arch/microblaze/lib/board.c index 8267191..f7182f2 100644 --- a/arch/microblaze/lib/board.c +++ b/arch/microblaze/lib/board.c @@ -16,6 +16,7 @@ #include <stdio_dev.h> #include <serial.h> #include <net.h> +#include <spi.h> #include <linux/compiler.h> #include <asm/processor.h> #include <asm/microblaze_intc.h> @@ -147,6 +148,10 @@ void board_init_f(ulong not_used) } #endif +#ifdef CONFIG_SPI + spi_init(); +#endif + /* relocate environment function pointers etc. */ env_relocate(); |