diff options
| author | Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> | 2008-03-31 21:12:17 +0200 |
|---|---|---|
| committer | Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> | 2008-04-01 01:46:01 +0200 |
| commit | 761712188b353494defb2b644491ff73d0daaa6f (patch) | |
| tree | 6c60f17cc7a133a5335acb2fb19a56fdbe3b233b | |
| parent | 983c1db04c1dd0f92e02f06d29f0c65a3d9a2687 (diff) | |
AT91CAP9ADK: Move CONFIG_CMD_NAND to Makefile
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
| -rw-r--r-- | board/atmel/at91cap9adk/Makefile | 8 | ||||
| -rw-r--r-- | board/atmel/at91cap9adk/nand.c | 3 |
2 files changed, 5 insertions, 6 deletions
diff --git a/board/atmel/at91cap9adk/Makefile b/board/atmel/at91cap9adk/Makefile index 359fdab600..3961030359 100644 --- a/board/atmel/at91cap9adk/Makefile +++ b/board/atmel/at91cap9adk/Makefile @@ -25,10 +25,12 @@ include $(TOPDIR)/config.mk LIB = $(obj)lib$(BOARD).a -COBJS := at91cap9adk.o led.o nand.o +COBJS-y += at91cap9adk.o +COBJS-y += led.o +COBJS-$(CONFIG_CMD_NAND) += nand.o -SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c) -OBJS := $(addprefix $(obj),$(COBJS)) +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/at91cap9adk/nand.c b/board/atmel/at91cap9adk/nand.c index 1277973a98..c72b0244bd 100644 --- a/board/atmel/at91cap9adk/nand.c +++ b/board/atmel/at91cap9adk/nand.c @@ -29,8 +29,6 @@ #include <asm/arch/gpio.h> #include <asm/arch/at91_pio.h> -#ifdef CONFIG_CMD_NAND - #include <nand.h> /* @@ -70,4 +68,3 @@ int board_nand_init(struct nand_chip *nand) return 0; } -#endif |