Fix FIT and FDT support to have CONFIG_OF_LIBFDT and CONFIG_FIT independent

[u-boot] / libfdt / Makefile

diff --git a/libfdt/Makefile b/libfdt/Makefile
index ca2ad76c887f7c9d1d59ae8adb6fb04d5c0099a6..d6e283045f6bbeb430c8d41a2b4072816b6875c1 100644 (file)
--- a/libfdt/Makefile
+++ b/libfdt/Makefile
@@ -27,9 +27,13 @@ LIB  = $(obj)libfdt.a
 
 SOBJS  =
 
-COBJS-$(CONFIG_OF_LIBFDT) += 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)
+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))