Merge branch 'u-boot-samsung/master' into 'u-boot-arm/master'

[u-boot] / drivers / power / Makefile

diff --git a/drivers/power/Makefile b/drivers/power/Makefile
index 7733e01a44864654b6169e8df46880551a4afe56..1dac16a9f7da05fc25b19df326f04fe82bb4cd68 100644 (file)
--- a/drivers/power/Makefile
+++ b/drivers/power/Makefile
@@ -25,17 +25,18 @@ include $(TOPDIR)/config.mk
 
 LIB    := $(obj)libpower.o
 
+COBJS-$(CONFIG_EXYNOS_TMU)     += exynos-tmu.o
 COBJS-$(CONFIG_FTPMU010_POWER) += ftpmu010.o
 COBJS-$(CONFIG_TPS6586X_POWER) += tps6586x.o
 COBJS-$(CONFIG_TWL4030_POWER)  += twl4030.o
 COBJS-$(CONFIG_TWL6030_POWER)  += twl6030.o
 COBJS-$(CONFIG_TWL6035_POWER)  += twl6035.o
 
-COBJS-$(CONFIG_PMIC) += power_core.o
-COBJS-$(CONFIG_DIALOG_PMIC) += power_dialog.o
-COBJS-$(CONFIG_PMIC_FSL) += power_fsl.o
-COBJS-$(CONFIG_PMIC_I2C) += power_i2c.o
-COBJS-$(CONFIG_PMIC_SPI) += power_spi.o
+COBJS-$(CONFIG_POWER) += power_core.o
+COBJS-$(CONFIG_DIALOG_POWER) += power_dialog.o
+COBJS-$(CONFIG_POWER_FSL) += power_fsl.o
+COBJS-$(CONFIG_POWER_I2C) += power_i2c.o
+COBJS-$(CONFIG_POWER_SPI) += power_spi.o
 
 COBJS  := $(COBJS-y)
 SRCS   := $(COBJS:.o=.c)