diff options
| author | Jean-Christophe PLAGNIOL-VILLARD | 2009-03-27 23:26:44 +0100 |
|---|---|---|
| committer | Jean-Christophe PLAGNIOL-VILLARD | 2009-04-04 20:42:22 +0200 |
| commit | 4758ebdd53571d4d183be5c2db8f0ee4ef368915 (patch) | |
| tree | 39dfec6ea223a45f31d6f3beb67be4c431886251 | |
| parent | 2b7178afce59f71e95da657273f4132012098c1f (diff) | |
at91: move dataflash spi driver to drivers/spi
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
| -rw-r--r-- | cpu/arm926ejs/at91/Makefile | 1 | ||||
| -rw-r--r-- | drivers/spi/Makefile | 1 | ||||
| -rw-r--r-- | drivers/spi/atmel_dataflash_spi.c (renamed from cpu/arm926ejs/at91/spi.c) | 0 | ||||
| -rw-r--r-- | include/configs/afeb9260.h | 1 | ||||
| -rw-r--r-- | include/configs/at91cap9adk.h | 1 | ||||
| -rw-r--r-- | include/configs/at91sam9260ek.h | 1 | ||||
| -rw-r--r-- | include/configs/at91sam9261ek.h | 1 | ||||
| -rw-r--r-- | include/configs/at91sam9263ek.h | 1 | ||||
| -rw-r--r-- | include/configs/at91sam9rlek.h | 1 |
9 files changed, 7 insertions, 1 deletions
diff --git a/cpu/arm926ejs/at91/Makefile b/cpu/arm926ejs/at91/Makefile index d0d47e67485..34e746182a6 100644 --- a/cpu/arm926ejs/at91/Makefile +++ b/cpu/arm926ejs/at91/Makefile @@ -55,7 +55,6 @@ COBJS-y += at91sam9rl_serial.o COBJS-$(CONFIG_HAS_DATAFLASH) += at91sam9rl_spi.o endif COBJS-$(CONFIG_AT91_LED) += led.o -COBJS-$(CONFIG_HAS_DATAFLASH) += spi.o COBJS-y += timer.o SOBJS = lowlevel_init.o diff --git a/drivers/spi/Makefile b/drivers/spi/Makefile index 6e2c121d67b..1350f3e0bff 100644 --- a/drivers/spi/Makefile +++ b/drivers/spi/Makefile @@ -25,6 +25,7 @@ include $(TOPDIR)/config.mk LIB := $(obj)libspi.a +COBJS-$(CONFIG_ATMEL_DATAFLASH_SPI) += atmel_dataflash_spi.o COBJS-$(CONFIG_ATMEL_SPI) += atmel_spi.o COBJS-$(CONFIG_BFIN_SPI) += bfin_spi.o COBJS-$(CONFIG_MPC8XXX_SPI) += mpc8xxx_spi.o diff --git a/cpu/arm926ejs/at91/spi.c b/drivers/spi/atmel_dataflash_spi.c index 3eb252c5b5d..3eb252c5b5d 100644 --- a/cpu/arm926ejs/at91/spi.c +++ b/drivers/spi/atmel_dataflash_spi.c diff --git a/include/configs/afeb9260.h b/include/configs/afeb9260.h index 72881abc441..de938f7a291 100644 --- a/include/configs/afeb9260.h +++ b/include/configs/afeb9260.h @@ -87,6 +87,7 @@ #define PHYS_SDRAM_SIZE 0x04000000 /* 64 megs */ /* DataFlash */ +#define CONFIG_ATMEL_DATAFLASH_SPI #define CONFIG_HAS_DATAFLASH 1 #define CONFIG_SYS_SPI_WRITE_TOUT (5 * CONFIG_SYS_HZ) #define CONFIG_SYS_MAX_DATAFLASH_BANKS 2 diff --git a/include/configs/at91cap9adk.h b/include/configs/at91cap9adk.h index 2f4baed44b2..b978731bcec 100644 --- a/include/configs/at91cap9adk.h +++ b/include/configs/at91cap9adk.h @@ -107,6 +107,7 @@ #define PHYS_SDRAM_SIZE 0x04000000 /* 64 megs */ /* DataFlash */ +#define CONFIG_ATMEL_DATAFLASH_SPI #define CONFIG_HAS_DATAFLASH 1 #define CONFIG_SYS_SPI_WRITE_TOUT (5*CONFIG_SYS_HZ) #define CONFIG_SYS_MAX_DATAFLASH_BANKS 1 diff --git a/include/configs/at91sam9260ek.h b/include/configs/at91sam9260ek.h index 29cabcfd3e8..bcc65bdd64a 100644 --- a/include/configs/at91sam9260ek.h +++ b/include/configs/at91sam9260ek.h @@ -103,6 +103,7 @@ #define PHYS_SDRAM_SIZE 0x04000000 /* 64 megs */ /* DataFlash */ +#define CONFIG_ATMEL_DATAFLASH_SPI #define CONFIG_HAS_DATAFLASH 1 #define CONFIG_SYS_SPI_WRITE_TOUT (5*CONFIG_SYS_HZ) #define CONFIG_SYS_MAX_DATAFLASH_BANKS 2 diff --git a/include/configs/at91sam9261ek.h b/include/configs/at91sam9261ek.h index d6d140a964e..cc40d7bda71 100644 --- a/include/configs/at91sam9261ek.h +++ b/include/configs/at91sam9261ek.h @@ -107,6 +107,7 @@ #define PHYS_SDRAM_SIZE 0x04000000 /* 64 megs */ /* DataFlash */ +#define CONFIG_ATMEL_DATAFLASH_SPI #define CONFIG_HAS_DATAFLASH 1 #define CONFIG_SYS_SPI_WRITE_TOUT (5*CONFIG_SYS_HZ) #define CONFIG_SYS_MAX_DATAFLASH_BANKS 2 diff --git a/include/configs/at91sam9263ek.h b/include/configs/at91sam9263ek.h index 83baf67ea86..cd0c15c97d0 100644 --- a/include/configs/at91sam9263ek.h +++ b/include/configs/at91sam9263ek.h @@ -108,6 +108,7 @@ #define PHYS_SDRAM_SIZE 0x04000000 /* 64 megs */ /* DataFlash */ +#define CONFIG_ATMEL_DATAFLASH_SPI #define CONFIG_HAS_DATAFLASH 1 #define CONFIG_SYS_SPI_WRITE_TOUT (5*CONFIG_SYS_HZ) #define CONFIG_SYS_MAX_DATAFLASH_BANKS 1 diff --git a/include/configs/at91sam9rlek.h b/include/configs/at91sam9rlek.h index a48f2cba5a1..fec48b6b265 100644 --- a/include/configs/at91sam9rlek.h +++ b/include/configs/at91sam9rlek.h @@ -98,6 +98,7 @@ #define PHYS_SDRAM_SIZE 0x04000000 /* 64 megs */ /* DataFlash */ +#define CONFIG_ATMEL_DATAFLASH_SPI #define CONFIG_HAS_DATAFLASH 1 #define CONFIG_SYS_SPI_WRITE_TOUT (5*CONFIG_SYS_HZ) #define CONFIG_SYS_MAX_DATAFLASH_BANKS 1 |