From: Joe Hershberger <joe.hershberger@ni.com>
Date: Wed, 21 Mar 2012 00:35:07 +0000 (-0500)
Subject: Xilinx: ARM: Only build the NAND controller driver if NAND is enabled
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c3b0bbdf0a2488796c143b5055169e9955a92d21;p=thirdparty%2Fu-boot.git

Xilinx: ARM: Only build the NAND controller driver if NAND is enabled

Signed-off-by: Joe Hershberger <joe.hershberger@ni.com>
---

diff --git a/board/xilinx/dfe/Makefile b/board/xilinx/dfe/Makefile
index 235d0ea232c..42bf8ffe948 100644
--- a/board/xilinx/dfe/Makefile
+++ b/board/xilinx/dfe/Makefile
@@ -28,15 +28,18 @@ endif
 
 LIB	= $(obj)lib$(BOARD).o
 
-COBJS	:= board.o \
+COBJS-y	:= board.o \
 	   xemacpss_g.o xemacpss_control.o xemacpss_sinit.o \
 	   xemacpss_bdring.o xemacpss.o xgmac.o \
-	   xilinx_nandpss.o \
 	   xilinx_qspipss.o \
 	   pele_qspi.o \
 	   mmc.o \
 	   ../common/xbasic_types.o
 
+COBJS-$(CONFIG_CMD_NAND) += xilinx_nandpss.o
+
+COBJS	:= $(sort $(COBJS-y))
+
 SOBJS	:= lowlevel_init.o
 
 SRCS	:= $(SOBJS:.o=.S) $(COBJS:.o=.c)