Patchwork [U-Boot,4/9] at91rm9200dk: Move conditional compilation to Makefile

login
register
mail settings
Submitter Jean-Christophe PLAGNIOL-VILLARD
Date March 3, 2009, 2:07 p.m.
Message ID <1236089265-24598-4-git-send-email-plagnioj@jcrosoft.com>
Download mbox | patch
Permalink /patch/71651/
State Accepted
Delegated to: Reinhard Meyer
Headers show

Comments

Jean-Christophe PLAGNIOL-VILLARD - March 3, 2009, 2:07 p.m.
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
---
 board/atmel/at91rm9200dk/Makefile |   14 ++++++++++----
 board/atmel/at91rm9200dk/mux.c    |   16 ++++++----------
 2 files changed, 16 insertions(+), 14 deletions(-)

Patch

diff --git a/board/atmel/at91rm9200dk/Makefile b/board/atmel/at91rm9200dk/Makefile
index 2d806d0..79d41d6 100644
--- a/board/atmel/at91rm9200dk/Makefile
+++ b/board/atmel/at91rm9200dk/Makefile
@@ -25,10 +25,16 @@  include $(TOPDIR)/config.mk
 
 LIB	= $(obj)lib$(BOARD).a
 
-COBJS	:= at91rm9200dk.o flash.o led.o mux.o partition.o
-
-SRCS	:= $(SOBJS:.o=.S) $(COBJS:.o=.c)
-OBJS	:= $(addprefix $(obj),$(COBJS))
+COBJS-y += $(BOARD).o
+COBJS-y += flash.o
+COBJS-y += led.o
+ifdef CONFIG_HAS_DATAFLASH
+COBJS-$(CONFIG_DATAFLASH_MMC_SELECT) += mux.o
+COBJS-y += partition.o
+endif
+
+SRCS	:= $(SOBJS:.o=.S) $(COBJS-y:.o=.c)
+OBJS	:= $(addprefix $(obj),$(COBJS-y))
 SOBJS	:= $(addprefix $(obj),$(SOBJS))
 
 $(LIB):	$(obj).depend $(OBJS) $(SOBJS)
diff --git a/board/atmel/at91rm9200dk/mux.c b/board/atmel/at91rm9200dk/mux.c
index 8319142..030411c 100644
--- a/board/atmel/at91rm9200dk/mux.c
+++ b/board/atmel/at91rm9200dk/mux.c
@@ -3,35 +3,31 @@ 
 #include <asm/hardware.h>
 #include <dataflash.h>
 
-int AT91F_GetMuxStatus(void) {
-#ifdef	CONFIG_DATAFLASH_MMC_SELECT
+int AT91F_GetMuxStatus(void)
+{
 	AT91C_BASE_PIOB->PIO_PER = CONFIG_SYS_DATAFLASH_MMC_PIO; /* Set in PIO mode */
 	AT91C_BASE_PIOB->PIO_OER = CONFIG_SYS_DATAFLASH_MMC_PIO; /* Configure in output */
 
-
 	if(AT91C_BASE_PIOB->PIO_ODSR & CONFIG_SYS_DATAFLASH_MMC_PIO) {
 		return 1;
 	} else {
 		return 0;
 	}
-#endif
 	return 0;
 }
 
-void AT91F_SelectMMC(void) {
-#ifdef	CONFIG_DATAFLASH_MMC_SELECT
+void AT91F_SelectMMC(void)
+{
 	AT91C_BASE_PIOB->PIO_PER = CONFIG_SYS_DATAFLASH_MMC_PIO;	/* Set in PIO mode */
 	AT91C_BASE_PIOB->PIO_OER = CONFIG_SYS_DATAFLASH_MMC_PIO;	/* Configure in output */
 	/* Set Output */
 	AT91C_BASE_PIOB->PIO_SODR = CONFIG_SYS_DATAFLASH_MMC_PIO;
-#endif
 }
 
-void AT91F_SelectSPI(void) {
-#ifdef	CONFIG_DATAFLASH_MMC_SELECT
+void AT91F_SelectSPI(void)
+{
 	AT91C_BASE_PIOB->PIO_PER = CONFIG_SYS_DATAFLASH_MMC_PIO;	/* Set in PIO mode */
 	AT91C_BASE_PIOB->PIO_OER = CONFIG_SYS_DATAFLASH_MMC_PIO;	/* Configure in output */
 	/* Clear Output */
 	AT91C_BASE_PIOB->PIO_CODR = CONFIG_SYS_DATAFLASH_MMC_PIO;
-#endif
 }