Merge git://git.denx.de/u-boot-dm

[platform/kernel/u-boot.git] / drivers / core / Makefile

diff --git a/drivers/core/Makefile b/drivers/core/Makefile
index 260833e..fd2d4de 100644 (file)
--- a/drivers/core/Makefile
+++ b/drivers/core/Makefile
@@ -4,11 +4,15 @@
 # SPDX-License-Identifier:     GPL-2.0+
 #
 
-obj-y  += device.o lists.o root.o uclass.o util.o devres.o
-ifndef CONFIG_SPL_BUILD
-obj-$(CONFIG_OF_CONTROL) += simple-bus.o
-endif
-obj-$(CONFIG_DM_DEVICE_REMOVE) += device-remove.o
+obj-y  += device.o fdtaddr.o lists.o root.o uclass.o util.o
+obj-$(CONFIG_DEVRES) += devres.o
+obj-$(CONFIG_$(SPL_)DM_DEVICE_REMOVE)  += device-remove.o
+obj-$(CONFIG_$(SPL_)SIMPLE_BUS)        += simple-bus.o
 obj-$(CONFIG_DM)       += dump.o
-obj-$(CONFIG_REGMAP)   += regmap.o
-obj-$(CONFIG_SYSCON)   += syscon-uclass.o
+obj-$(CONFIG_$(SPL_)REGMAP)    += regmap.o
+obj-$(CONFIG_$(SPL_)SYSCON)    += syscon-uclass.o
+obj-$(CONFIG_OF_LIVE) += of_access.o of_addr.o
+ifndef CONFIG_DM_DEV_READ_INLINE
+obj-$(CONFIG_OF_CONTROL) += read.o
+endif
+obj-$(CONFIG_OF_CONTROL) += of_extra.o ofnode.o read_extra.o