From 761712188b353494defb2b644491ff73d0daaa6f Mon Sep 17 00:00:00 2001 From: Jean-Christophe PLAGNIOL-VILLARD Date: Mon, 31 Mar 2008 21:12:17 +0200 Subject: [PATCH] AT91CAP9ADK: Move CONFIG_CMD_NAND to Makefile Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD --- board/atmel/at91cap9adk/Makefile | 8 +++++--- 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 #include -#ifdef CONFIG_CMD_NAND - #include /* @@ -70,4 +68,3 @@ int board_nand_init(struct nand_chip *nand) return 0; } -#endif -- 2.39.5