AT91SAM9: Move CONFIG_HAS_DATAFLASH to Makefile

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>

diff --git a/cpu/arm926ejs/at91sam9/Makefile b/cpu/arm926ejs/at91sam9/Makefile
index bf15e1edb33366ba11456544789e2be663a53f36..203abc28e149ef1950e55308a23a0326bd22925f 100644 (file)
--- a/cpu/arm926ejs/at91sam9/Makefile
+++ b/cpu/arm926ejs/at91sam9/Makefile
@@ -25,11 +25,14 @@ include $(TOPDIR)/config.mk
 
 LIB    = $(obj)lib$(SOC).a
 
-COBJS  = ether.o timer.o spi.o usb.o
+COBJS-y        += ether.o
+COBJS-y        += timer.o
+COBJS-$(CONFIG_HAS_DATAFLASH) +=spi.o
+COBJS-y        += usb.o
 SOBJS  = lowlevel_init.o
 
-SRCS   := $(SOBJS:.o=.S) $(COBJS:.o=.c)
-OBJS   := $(addprefix $(obj),$(SOBJS) $(COBJS))
+SRCS    := $(SOBJS:.o=.S) $(COBJS-y:.o=.c)
+OBJS    := $(addprefix $(obj),$(SOBJS) $(COBJS-y))
 
 all:   $(obj).depend $(LIB)
 

diff --git a/cpu/arm926ejs/at91sam9/spi.c b/cpu/arm926ejs/at91sam9/spi.c
index c819608295245af3f3142b35478174690a3e490d..c9fe6d8a3fc9fca37db09ea7a4dd458e2bd847ad 100644 (file)
--- a/cpu/arm926ejs/at91sam9/spi.c
+++ b/cpu/arm926ejs/at91sam9/spi.c
@@ -26,7 +26,6 @@
 #include <asm/arch/at91_pio.h>
 #include <asm/arch/at91_spi.h>
 
-#ifdef CONFIG_HAS_DATAFLASH
 #include <dataflash.h>
 
 #define AT91_SPI_PCS0_DATAFLASH_CARD   0xE     /* Chip Select 0: NPCS0%1110 */
@@ -85,6 +84,7 @@ void AT91F_SpiInit(void)
 void AT91F_SpiEnable(int cs)
 {
        unsigned long mode;
+
        switch (cs) {
        case 0: /* Configure SPI CS0 for Serial DataFlash AT45DBxx */
                mode = readl(AT91_BASE_SPI + AT91_SPI_MR);
@@ -116,12 +116,10 @@ unsigned int AT91F_SpiWrite(AT91PS_DataflashDesc pDesc)
 {
        unsigned int timeout;
 
-
        pDesc->state = BUSY;
 
        writel(AT91_SPI_TXTDIS + AT91_SPI_RXTDIS, AT91_BASE_SPI + AT91_SPI_PTCR);
 
-
        /* Initialize the Transmit and Receive Pointer */
        writel((unsigned int)pDesc->rx_cmd_pt, AT91_BASE_SPI + AT91_SPI_RPR);
        writel((unsigned int)pDesc->tx_cmd_pt, AT91_BASE_SPI + AT91_SPI_TPR);
@@ -157,4 +155,3 @@ unsigned int AT91F_SpiWrite(AT91PS_DataflashDesc pDesc)
 
        return DATAFLASH_OK;
 }
-#endif