mpc83xx: Add support for MergerBox board

[u-boot] / board / eNET / Makefile

diff --git a/board/eNET/Makefile b/board/eNET/Makefile
index 4813b4b53a3e796e8521e798585c4a4c377ed73b..498078702e2f59b8bfe02780bd79e0ffb76fd49c 100644 (file)
--- a/board/eNET/Makefile
+++ b/board/eNET/Makefile
@@ -29,17 +29,18 @@
 
 include $(TOPDIR)/config.mk
 
-LIB    = $(obj)lib$(BOARD).a
+LIB    = $(obj)lib$(BOARD).o
 
-COBJS  := eNET.o
-SOBJS  := eNET_start16.o eNET_start.o
+COBJS-y        += eNET.o
+COBJS-$(CONFIG_PCI) += eNET_pci.o
+SOBJS-y        += eNET_start16.o
+SOBJS-y        += eNET_start.o
 
-SRCS   := $(SOBJS:.o=.S) $(COBJS:.o=.c)
-OBJS   := $(addprefix $(obj),$(COBJS))
-SOBJS  := $(addprefix $(obj),$(SOBJS))
+SRCS   := $(SOBJS-y:.o=.S) $(COBJS-y:.o=.c)
+OBJS   := $(addprefix $(obj),$(SOBJS-y) $(COBJS-y))
 
 $(LIB):        $(obj).depend $(OBJS) $(SOBJS)
-       $(AR) $(ARFLAGS) $@ $(OBJS) $(SOBJS)
+       $(call cmd_link_o_target, $(OBJS) $(SOBJS))
 
 clean:
        rm -f $(SOBJS) $(OBJS)