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 126fa2c02f7a8f5b7d4df4479bf767f1eac47154..d6e283045f6bbeb430c8d41a2b4072816b6875c1 100644 (file)
--- a/libfdt/Makefile
+++ b/libfdt/Makefile
@@ -27,10 +27,14 @@ LIB = $(obj)libfdt.a
 
 SOBJS  =
 
-COBJS-y += 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  := $(COBJS-y)
-SRCS   := $(SOBJS:.o=.S) $(COBJS:.o=.c)
+COBJS-$(CONFIG_OF_LIBFDT) += $(COBJS-libfdt)
+COBJS-$(CONFIG_FIT) += $(COBJS-libfdt)
+
+
+COBJS  := $(sort $(COBJS-y))
+SRCS   := $(SOBJS:.o=.S) $(COBJS:.o=.c)
 OBJS   := $(addprefix $(obj),$(SOBJS) $(COBJS))
 
 $(LIB):        $(obj).depend $(OBJS)