Merge branch 'master' of git://git.denx.de/u-boot-video

[karo-tx-uboot.git] / libfdt / Makefile

diff --git a/libfdt/Makefile b/libfdt/Makefile
index 418ad6b5ab1337c9f8f824ea9101aebe7376f966..d6e283045f6bbeb430c8d41a2b4072816b6875c1 100644 (file)
--- a/libfdt/Makefile
+++ b/libfdt/Makefile
@@ -25,12 +25,16 @@ include $(TOPDIR)/config.mk
 
 LIB    = $(obj)libfdt.a
 
-SOBJS  = 
+SOBJS  =
 
-COBJS  = fdt.o  fdt_ro.o  fdt_rw.o  fdt_strerror.o  fdt_sw.o  fdt_wip.o
+COBJS-libfdt += fdt.o fdt_ro.o fdt_rw.o fdt_strerror.o fdt_sw.o fdt_wip.o
 
+COBJS-$(CONFIG_OF_LIBFDT) += $(COBJS-libfdt)
+COBJS-$(CONFIG_FIT) += $(COBJS-libfdt)
 
-SRCS   := $(SOBJS:.o=.S) $(COBJS:.o=.c)
+
+COBJS  := $(sort $(COBJS-y))
+SRCS   := $(SOBJS:.o=.S) $(COBJS:.o=.c)
 OBJS   := $(addprefix $(obj),$(SOBJS) $(COBJS))
 
 $(LIB):        $(obj).depend $(OBJS)
@@ -44,4 +48,3 @@ include $(SRCTREE)/rules.mk
 sinclude $(obj).depend
 
 #########################################################################
-