5 files changed, 6 insertions, 19 deletions
diff --git a/include/configs/arndale.h b/include/configs/arndale.h
index 3ad4a9ba91..91e32dff52 100644
--- a/include/configs/arndale.h
+++ b/include/configs/arndale.h
@@ -60,4 +60,8 @@
 /* The PERIPHBASE in the CBAR register is wrong on the Arndale, so override it */
 #define CONFIG_ARM_GIC_BASE_ADDRESS	0x10480000
 
+/* Power */
+#define CONFIG_POWER
+#define CONFIG_POWER_I2C
+
 #endif	/* __CONFIG_H */
diff --git a/include/configs/exynos5-common.h b/include/configs/exynos5-common.h
index e04dec7411..15363d0079 100644
--- a/include/configs/exynos5-common.h
+++ b/include/configs/exynos5-common.h
@@ -67,6 +67,8 @@
 
 #define CONFIG_SPL_LIBCOMMON_SUPPORT
 #define CONFIG_SPL_GPIO_SUPPORT
+#define CONFIG_SPL_SERIAL_SUPPORT
+#define CONFIG_SPL_LIBGENERIC_SUPPORT
 
 /* specific .lds file */
 #define CONFIG_SPL_LDSCRIPT	"board/samsung/common/exynos-uboot-spl.lds"
@@ -126,10 +128,6 @@
 #define SPI_FLASH_UBOOT_POS	(CONFIG_SEC_FW_SIZE + CONFIG_BL1_SIZE)
 
 /* I2C */
-
-/* TODO(sjg@chromium.org): Move these two options to Kconfig */
-#define CONFIG_DM_I2C
-#define CONFIG_DM_I2C_COMPAT
 #define CONFIG_CMD_I2C
 #define CONFIG_SYS_I2C_S3C24X0
 #define CONFIG_SYS_I2C_S3C24X0_SPEED	100000		/* 100 Kbps */
@@ -149,10 +147,6 @@
 #define CONFIG_OF_SPI
 #endif
 
-/* Power */
-#define CONFIG_POWER
-#define CONFIG_POWER_I2C
-
 #ifdef CONFIG_ENV_IS_IN_SPI_FLASH
 #define CONFIG_ENV_SPI_MODE	SPI_MODE_0
 #define CONFIG_ENV_SECT_SIZE	CONFIG_ENV_SIZE
diff --git a/include/configs/exynos5-dt-common.h b/include/configs/exynos5-dt-common.h
index b1b8e1ace7..098734b542 100644
--- a/include/configs/exynos5-dt-common.h
+++ b/include/configs/exynos5-dt-common.h
@@ -18,11 +18,6 @@
 
 #include "exynos5-common.h"
 
-/* PMIC */
-#define CONFIG_POWER
-#define CONFIG_POWER_I2C
-#define CONFIG_POWER_TPS65090
-
 /* Enable keyboard */
 #define CONFIG_KEYBOARD
 
diff --git a/include/configs/smdk5250.h b/include/configs/smdk5250.h
index e5655fce19..bbec672193 100644
--- a/include/configs/smdk5250.h
+++ b/include/configs/smdk5250.h
@@ -17,9 +17,6 @@
 
 #include <configs/exynos5250-common.h>
 
-/* PMIC */
-#define CONFIG_POWER_MAX77686
-
 #define CONFIG_BOARD_COMMON
 
 #define CONFIG_USB_XHCI
diff --git a/include/configs/snow.h b/include/configs/snow.h
index 557f86c07c..a467792cdd 100644
--- a/include/configs/snow.h
+++ b/include/configs/snow.h
@@ -18,9 +18,6 @@
 #include <configs/exynos5250-common.h>
 #include <configs/exynos5-dt-common.h>
 
-
-#define CONFIG_POWER_TPS65090_I2C
-
 #define CONFIG_BOARD_COMMON
 
 #define CONFIG_USB_XHCI