From 4e03dde84dd2c91e327cdc23ae119d432559a7a3 Mon Sep 17 00:00:00 2001 From: Jean-Christophe PLAGNIOL-VILLARD Date: Mon, 31 Mar 2008 21:31:04 +0200 Subject: [PATCH] AT91SAM9260EK: Move CONFIG_CMD_NAND to Makefile Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD --- board/atmel/at91sam9260ek/Makefile | 8 +++++--- 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 309ea46f2a..8a629b9c8f 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 5131c4174c..abb788afe7 100644 --- a/board/atmel/at91sam9260ek/nand.c +++ b/board/atmel/at91sam9260ek/nand.c @@ -29,8 +29,6 @@ #include #include -#ifdef CONFIG_CMD_NAND - #include /* @@ -76,4 +74,3 @@ int board_nand_init(struct nand_chip *nand) return 0; } -#endif -- 2.25.1