diff options
| author | Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> | 2008-03-31 21:31:04 +0200 |
|---|---|---|
| committer | Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> | 2008-04-01 01:46:12 +0200 |
| commit | 4e03dde84dd2c91e327cdc23ae119d432559a7a3 (patch) | |
| tree | 1690460b55fa7fc0c3cc1fe91d76a56553ce333d /board/atmel | |
| parent | 0176d43e759a6e00cacc85eff26fd60f74b4f6b7 (diff) | |
| download | u-boot-imx-4e03dde84dd2c91e327cdc23ae119d432559a7a3.zip u-boot-imx-4e03dde84dd2c91e327cdc23ae119d432559a7a3.tar.gz u-boot-imx-4e03dde84dd2c91e327cdc23ae119d432559a7a3.tar.bz2 | |
AT91SAM9260EK: Move CONFIG_CMD_NAND to Makefile
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Diffstat (limited to 'board/atmel')
| -rw-r--r-- | board/atmel/at91sam9260ek/Makefile | 8 | ||||
| -rw-r--r-- | board/atmel/at91sam9260ek/nand.c | 3 |
2 files changed, 5 insertions, 6 deletions
diff --git a/board/atmel/at91sam9260ek/Makefile b/board/atmel/at91sam9260ek/Makefile index 309ea46..8a629b9 100644 --- a/board/atmel/at91sam9260ek/Makefile +++ b/board/atmel/at91sam9260ek/Makefile @@ -25,10 +25,12 @@ include $(TOPDIR)/config.mk LIB = $(obj)lib$(BOARD).a -COBJS := at91sam9260ek.o led.o nand.o +COBJS-y += at91sam9260ek.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/at91sam9260ek/nand.c b/board/atmel/at91sam9260ek/nand.c index 5131c41..abb788a 100644 --- a/board/atmel/at91sam9260ek/nand.c +++ b/board/atmel/at91sam9260ek/nand.c @@ -29,8 +29,6 @@ #include <asm/arch/gpio.h> #include <asm/arch/at91_pio.h> -#ifdef CONFIG_CMD_NAND - #include <nand.h> /* @@ -76,4 +74,3 @@ int board_nand_init(struct nand_chip *nand) return 0; } -#endif |