Merge git://git.denx.de/u-boot-nand-flash

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

diff --git a/drivers/core/Makefile b/drivers/core/Makefile
index 5c2ead8..07adb61 100644 (file)
--- a/drivers/core/Makefile
+++ b/drivers/core/Makefile
@@ -5,10 +5,9 @@
 #
 
 obj-y  += device.o lists.o root.o uclass.o util.o
-ifndef CONFIG_SPL_BUILD
-obj-$(CONFIG_OF_CONTROL) += simple-bus.o
-endif
-obj-$(CONFIG_DM_DEVICE_REMOVE) += device-remove.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_OF_CONTROL)       += regmap.o
-obj-$(CONFIG_OF_CONTROL)       += syscon-uclass.o
+obj-$(CONFIG_$(SPL_)REGMAP)    += regmap.o
+obj-$(CONFIG_$(SPL_)SYSCON)    += syscon-uclass.o