Commit 7d159536192323d65765211e7e7f56efcf3509ac
Committed by
Minkyu Kang
Minkyu Kang
1 parent
87033d4d97
Exists in
v2017.01-smarct4x
and in
38 other branches
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>
Showing 5 changed files with 43 additions and 18 deletions Side-by-side Diff
include/configs/exynos5-common.h
| ... | ... | @@ -48,17 +48,10 @@ |
| 48 | 48 | #define CONFIG_SYS_CONSOLE_IS_IN_ENV |
| 49 | 49 | #define CONFIG_CONSOLE_MUX |
| 50 | 50 | |
| 51 | -/* Enable keyboard */ | |
| 52 | -#define CONFIG_CROS_EC /* CROS_EC protocol */ | |
| 53 | -#define CONFIG_CROS_EC_KEYB /* CROS_EC keyboard input */ | |
| 54 | -#define CONFIG_CMD_CROS_EC | |
| 55 | -#define CONFIG_KEYBOARD | |
| 56 | - | |
| 57 | -/* Console configuration */ | |
| 58 | 51 | #define EXYNOS_DEVICE_SETTINGS \ |
| 59 | - "stdin=serial,cros-ec-keyb\0" \ | |
| 60 | - "stdout=serial,lcd\0" \ | |
| 61 | - "stderr=serial,lcd\0" | |
| 52 | + "stdin=serial\0" \ | |
| 53 | + "stdout=serial\0" \ | |
| 54 | + "stderr=serial\0" | |
| 62 | 55 | |
| 63 | 56 | #define CONFIG_EXTRA_ENV_SETTINGS \ |
| 64 | 57 | EXYNOS_DEVICE_SETTINGS |
| ... | ... | @@ -184,11 +177,6 @@ |
| 184 | 177 | #define CONFIG_ENV_SPI_BUS 1 |
| 185 | 178 | #define CONFIG_ENV_SPI_MAX_HZ 50000000 |
| 186 | 179 | #endif |
| 187 | - | |
| 188 | -/* PMIC */ | |
| 189 | -#define CONFIG_POWER | |
| 190 | -#define CONFIG_POWER_I2C | |
| 191 | -#define CONFIG_POWER_TPS65090 | |
| 192 | 180 | |
| 193 | 181 | /* Ethernet Controllor Driver */ |
| 194 | 182 | #ifdef CONFIG_CMD_NET |
include/configs/exynos5-dt-common.h
| 1 | +/* | |
| 2 | + * Copyright (C) 2014 Google, Inc | |
| 3 | + * | |
| 4 | + * Configuration settings for generic Exynos 5 board | |
| 5 | + * | |
| 6 | + * SPDX-License-Identifier: GPL-2.0+ | |
| 7 | + */ | |
| 8 | + | |
| 9 | +#ifndef __CONFIG_EXYNOS5_DT_COMMON_H | |
| 10 | +#define __CONFIG_EXYNOS5_DT_COMMON_H | |
| 11 | + | |
| 12 | +#include "exynos5-common.h" | |
| 13 | + | |
| 14 | +/* PMIC */ | |
| 15 | +#define CONFIG_POWER | |
| 16 | +#define CONFIG_POWER_I2C | |
| 17 | +#define CONFIG_POWER_TPS65090 | |
| 18 | + | |
| 19 | +/* Enable keyboard */ | |
| 20 | +#define CONFIG_CROS_EC /* CROS_EC protocol */ | |
| 21 | +#define CONFIG_CROS_EC_KEYB /* CROS_EC keyboard input */ | |
| 22 | +#define CONFIG_CMD_CROS_EC | |
| 23 | +#define CONFIG_KEYBOARD | |
| 24 | + | |
| 25 | +/* Console configuration */ | |
| 26 | +#undef EXYNOS_DEVICE_SETTINGS | |
| 27 | +#define EXYNOS_DEVICE_SETTINGS \ | |
| 28 | + "stdin=serial,cros-ec-keyb\0" \ | |
| 29 | + "stdout=serial,lcd\0" \ | |
| 30 | + "stderr=serial,lcd\0" | |
| 31 | + | |
| 32 | +#define CONFIG_EXTRA_ENV_SETTINGS \ | |
| 33 | + EXYNOS_DEVICE_SETTINGS | |
| 34 | + | |
| 35 | +#endif |
include/configs/exynos5250-common.h
| ... | ... | @@ -22,8 +22,6 @@ |
| 22 | 22 | |
| 23 | 23 | #define CONFIG_SPL_MAX_FOOTPRINT (14 * 1024) |
| 24 | 24 | |
| 25 | -#define CONFIG_CROS_EC_I2C /* Support CROS_EC over I2C */ | |
| 26 | - | |
| 27 | 25 | /* USB */ |
| 28 | 26 | #define CONFIG_CMD_USB |
| 29 | 27 | #define CONFIG_USB_XHCI |
| ... | ... | @@ -44,7 +42,6 @@ |
| 44 | 42 | |
| 45 | 43 | /* PMIC */ |
| 46 | 44 | #define CONFIG_POWER_MAX77686 |
| 47 | -#define CONFIG_POWER_TPS65090_I2C | |
| 48 | 45 | |
| 49 | 46 | /* Sound */ |
| 50 | 47 | #define CONFIG_CMD_SOUND |
include/configs/peach-pit.h
include/configs/snow.h
| ... | ... | @@ -10,7 +10,11 @@ |
| 10 | 10 | #define __CONFIG_SNOW_H |
| 11 | 11 | |
| 12 | 12 | #include <configs/exynos5250-common.h> |
| 13 | +#include <configs/exynos5-dt-common.h> | |
| 13 | 14 | |
| 15 | + | |
| 16 | +#define CONFIG_CROS_EC_I2C /* Support CROS_EC over I2C */ | |
| 17 | +#define CONFIG_POWER_TPS65090_I2C | |
| 14 | 18 | |
| 15 | 19 | #endif /* __CONFIG_SNOW_H */ |