Merge git://git.denx.de/u-boot-fsl-qoriq

[oweals/u-boot.git] / drivers / core / Makefile

diff --git a/drivers/core/Makefile b/drivers/core/Makefile
index d74b065a0785cc45644b7909cd7541824cf24586..a5039c5bd3114eba461d81a10699f1fafe8fe2bc 100644 (file)
--- a/drivers/core/Makefile
+++ b/drivers/core/Makefile
@@ -9,7 +9,12 @@ 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_$(SPL_)REGMAP)    += regmap.o
-obj-$(CONFIG_$(SPL_)SYSCON)    += syscon-uclass.o
+obj-$(CONFIG_$(SPL_TPL_)REGMAP)        += regmap.o
+obj-$(CONFIG_$(SPL_TPL_)SYSCON)        += syscon-uclass.o
 obj-$(CONFIG_OF_LIVE) += of_access.o of_addr.o
-obj-$(CONFIG_OF_CONTROL) += of_extra.o ofnode.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
+
+ccflags-$(CONFIG_DM_DEBUG) += -DDEBUG