exynos: config: Move cros_ec and tps65090 out of smdk boards

These boards do not in fact have a Chrome OS EC, nor a TPS565090 PMIC, so
move the settings into a separate common file to be used by those that need
it.

Signed-off-by: Simon Glass <sjg@chromium.org>
Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>

diff --git a/include/configs/exynos5-common.h b/include/configs/exynos5-common.h
index 380a46feb88cc2a92dd5eb362c60386400911a1c..3581a3878c502a1d9dd824f84d52f8b27e83e40e 100644 (file)
--- a/include/configs/exynos5-common.h
+++ b/include/configs/exynos5-common.h
@@ -48,17 +48,10 @@
 #define CONFIG_SYS_CONSOLE_IS_IN_ENV
 #define CONFIG_CONSOLE_MUX
 
-/* Enable keyboard */
-#define CONFIG_CROS_EC         /* CROS_EC protocol */
-#define CONFIG_CROS_EC_KEYB    /* CROS_EC keyboard input */
-#define CONFIG_CMD_CROS_EC
-#define CONFIG_KEYBOARD
-
-/* Console configuration */
 #define EXYNOS_DEVICE_SETTINGS \
-               "stdin=serial,cros-ec-keyb\0" \
-               "stdout=serial,lcd\0" \
-               "stderr=serial,lcd\0"
+               "stdin=serial\0" \
+               "stdout=serial\0" \
+               "stderr=serial\0"
 
 #define CONFIG_EXTRA_ENV_SETTINGS \
        EXYNOS_DEVICE_SETTINGS
@@ -185,11 +178,6 @@
 #define CONFIG_ENV_SPI_MAX_HZ  50000000
 #endif
 
-/* PMIC */
-#define CONFIG_POWER
-#define CONFIG_POWER_I2C
-#define CONFIG_POWER_TPS65090
-
 /* Ethernet Controllor Driver */
 #ifdef CONFIG_CMD_NET
 #define CONFIG_SMC911X

diff --git a/include/configs/exynos5-dt-common.h b/include/configs/exynos5-dt-common.h
new file mode 100644 (file)
index 0000000..66547fa
--- /dev/null
+++ b/include/configs/exynos5-dt-common.h
@@ -0,0 +1,35 @@
+/*
+ * Copyright (C) 2014 Google, Inc
+ *
+ * Configuration settings for generic Exynos 5 board
+ *
+ * SPDX-License-Identifier:    GPL-2.0+
+ */
+
+#ifndef __CONFIG_EXYNOS5_DT_COMMON_H
+#define __CONFIG_EXYNOS5_DT_COMMON_H
+
+#include "exynos5-common.h"
+
+/* PMIC */
+#define CONFIG_POWER
+#define CONFIG_POWER_I2C
+#define CONFIG_POWER_TPS65090
+
+/* Enable keyboard */
+#define CONFIG_CROS_EC         /* CROS_EC protocol */
+#define CONFIG_CROS_EC_KEYB    /* CROS_EC keyboard input */
+#define CONFIG_CMD_CROS_EC
+#define CONFIG_KEYBOARD
+
+/* Console configuration */
+#undef EXYNOS_DEVICE_SETTINGS
+#define EXYNOS_DEVICE_SETTINGS \
+               "stdin=serial,cros-ec-keyb\0" \
+               "stdout=serial,lcd\0" \
+               "stderr=serial,lcd\0"
+
+#define CONFIG_EXTRA_ENV_SETTINGS \
+       EXYNOS_DEVICE_SETTINGS
+
+#endif

diff --git a/include/configs/exynos5250-common.h b/include/configs/exynos5250-common.h
index b4c1ccffe3f09b036d4d1134d0160cb9f405a902..987eb15fd95ae0b916eae7dcf0aebf211149fcac 100644 (file)
--- a/include/configs/exynos5250-common.h
+++ b/include/configs/exynos5250-common.h
@@ -22,8 +22,6 @@
 
 #define CONFIG_SPL_MAX_FOOTPRINT       (14 * 1024)
 
-#define CONFIG_CROS_EC_I2C             /* Support CROS_EC over I2C */
-
 /* USB */
 #define CONFIG_CMD_USB
 #define CONFIG_USB_XHCI
@@ -44,7 +42,6 @@
 
 /* PMIC */
 #define CONFIG_POWER_MAX77686
-#define CONFIG_POWER_TPS65090_I2C
 
 /* Sound */
 #define CONFIG_CMD_SOUND

diff --git a/include/configs/peach-pit.h b/include/configs/peach-pit.h
index e9736fc449cae2369b457374d6627813b7f26290..046813d1b62bcbf09f6f752462dbe58f2cf2a920 100644 (file)
--- a/include/configs/peach-pit.h
+++ b/include/configs/peach-pit.h
@@ -10,6 +10,7 @@
 #define __CONFIG_PEACH_PIT_H
 
 #include <configs/exynos5420-common.h>
+#include <configs/exynos5-dt-common.h>
 
 
 /* select serial console configuration */

diff --git a/include/configs/snow.h b/include/configs/snow.h
index 0834cc92234f33c2af03290127ed6b03ac007c59..dc09c665436c6c82919ca14b8f7b136e362a0cfd 100644 (file)
--- a/include/configs/snow.h
+++ b/include/configs/snow.h
@@ -10,6 +10,10 @@
 #define __CONFIG_SNOW_H
 
 #include <configs/exynos5250-common.h>
+#include <configs/exynos5-dt-common.h>
 
 
+#define CONFIG_CROS_EC_I2C             /* Support CROS_EC over I2C */
+#define CONFIG_POWER_TPS65090_I2C
+
 #endif /* __CONFIG_SNOW_H */