efi_loader: fix signature of efi_disconnect_controller

[u-boot] / lib / libfdt / Makefile

diff --git a/lib/libfdt/Makefile b/lib/libfdt/Makefile
index 07373df99ae4a35d31a9e0a8e8510780c96c2f84..be42e946b794d5a43a6a24cbb72e54fee439050e 100644 (file)
--- a/lib/libfdt/Makefile
+++ b/lib/libfdt/Makefile
@@ -5,30 +5,22 @@
 # SPDX-License-Identifier:     GPL-2.0+
 #
 
-include $(TOPDIR)/config.mk
-
-LIB    = $(obj)libfdt.o
-
-SOBJS  =
-
-COBJS-libfdt += fdt.o fdt_ro.o fdt_rw.o fdt_strerror.o fdt_sw.o fdt_wip.o fdt_empty_tree.o
-
-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)
-       $(call cmd_link_o_target, $(OBJS))
-
-#########################################################################
-
-# defines $(obj).depend target
-include $(SRCTREE)/rules.mk
-
-sinclude $(obj).depend
-
-#########################################################################
+# Use upstream code.
+obj-y += \
+       fdt.o \
+       fdt_wip.o \
+       fdt_strerror.o \
+       fdt_sw.o \
+       fdt_empty_tree.o \
+       fdt_addresses.o
+
+obj-$(CONFIG_OF_LIBFDT_OVERLAY) += fdt_overlay.o
+
+# Locally modified for U-Boot.
+# TODO: split out the local modifiction.
+obj-y += \
+       fdt_ro.o \
+       fdt_rw.o
+
+# U-Boot own file
+obj-y += fdt_region.o