Many options are duplicated on the exynos5 boards. Move these to the common
files. Also some options are not used so can be removed.
Tidy this up to make the files easier to maintain.
Signed-off-by: Simon Glass s...@chromium.org
Acked-by: Przemyslaw Marczak p.marc...@samsung.com
---
Changes in v2:
- Rebase to dm/master
include/configs/arndale.h | 14 ++
include/configs/exynos5-common.h| 3 ---
include/configs/exynos5-dt-common.h | 16 +++-
include/configs/exynos5250-common.h | 16 ++--
include/configs/exynos5420-common.h | 9 +++--
include/configs/odroid_xu3.h| 2 ++
include/configs/peach-pi.h | 12 +---
include/configs/peach-pit.h | 20 +---
include/configs/smdk5250.h | 15 ---
include/configs/smdk5420.h | 10 --
include/configs/snow.h | 12 +---
11 files changed, 39 insertions(+), 90 deletions(-)
diff --git a/include/configs/arndale.h b/include/configs/arndale.h
index 91e32df..8784c4e 100644
--- a/include/configs/arndale.h
+++ b/include/configs/arndale.h
@@ -13,6 +13,7 @@
fdtfile=exynos5250-arndale.dtb\0
#include exynos5250-common.h
+#include configs/exynos5-common.h
/* SD/MMC configuration */
#define CONFIG_SUPPORT_EMMC_BOOT
@@ -20,15 +21,6 @@
/* allow to overwrite serial and ethaddr */
#define CONFIG_ENV_OVERWRITE
-/* USB */
-#define CONFIG_USB_EHCI
-#define CONFIG_USB_EHCI_EXYNOS
-
-#define CONFIG_SYS_USB_EHCI_MAX_ROOT_PORTS 3
-#define CONFIG_USB_HOST_ETHER
-#define CONFIG_USB_ETHER_ASIX
-#define CONFIG_USB_ETHER_ASIX88179
-
/* MMC SPL */
#define CONFIG_EXYNOS_SPL
@@ -36,9 +28,6 @@
#define CONFIG_SYS_PROMPT ARNDALE #
#define CONFIG_DEFAULT_CONSOLE console=ttySAC2,115200n8\0
-#define CONFIG_NR_DRAM_BANKS 8
-#define SDRAM_BANK_SIZE(256UL 20UL) /* 256 MB */
-
#define CONFIG_IDENT_STRING for ARNDALE
#define CONFIG_ENV_IS_IN_MMC
@@ -49,6 +38,7 @@
#define CONFIG_SYS_INIT_SP_ADDRCONFIG_IRAM_STACK
/* PMIC */
+#define CONFIG_POWER
#define CONFIG_PMIC
#define CONFIG_POWER_I2C
diff --git a/include/configs/exynos5-common.h b/include/configs/exynos5-common.h
index 15363d0..e710f41 100644
--- a/include/configs/exynos5-common.h
+++ b/include/configs/exynos5-common.h
@@ -143,8 +143,6 @@
#define CONFIG_SPI_FLASH_GIGADEVICE
#define CONFIG_SF_DEFAULT_MODE SPI_MODE_0
#define CONFIG_SF_DEFAULT_SPEED5000
-#define EXYNOS5_SPI_NUM_CONTROLLERS5
-#define CONFIG_OF_SPI
#endif
#ifdef CONFIG_ENV_IS_IN_SPI_FLASH
@@ -194,7 +192,6 @@
#define CONFIG_FIT
#define CONFIG_FIT_BEST_MATCH
-
#define BOOT_TARGET_DEVICES(func) \
func(MMC, mmc, 1) \
func(MMC, mmc, 0) \
diff --git a/include/configs/exynos5-dt-common.h
b/include/configs/exynos5-dt-common.h
index 098734b..29ef84b 100644
--- a/include/configs/exynos5-dt-common.h
+++ b/include/configs/exynos5-dt-common.h
@@ -16,7 +16,21 @@
stdout=serial,lcd\0 \
stderr=serial,lcd\0
-#include exynos5-common.h
+#define CONFIG_ENV_IS_IN_SPI_FLASH
+#define CONFIG_ENV_SPI_BASE0x12D3
+#define FLASH_SIZE (4 20)
+#define CONFIG_ENV_OFFSET (FLASH_SIZE - CONFIG_ENV_SECT_SIZE)
+#define CONFIG_SPI_BOOTING
+
+#define CONFIG_BOARD_COMMON
+
+/* Display */
+#define CONFIG_LCD
+#ifdef CONFIG_LCD
+#define CONFIG_EXYNOS_FB
+#define CONFIG_EXYNOS_DP
+#define LCD_BPPLCD_COLOR16
+#endif
/* Enable keyboard */
#define CONFIG_KEYBOARD
diff --git a/include/configs/exynos5250-common.h
b/include/configs/exynos5250-common.h
index 95e96ec..7d8921f 100644
--- a/include/configs/exynos5250-common.h
+++ b/include/configs/exynos5250-common.h
@@ -10,7 +10,6 @@
#ifndef __CONFIG_5250_H
#define __CONFIG_5250_H
-#include configs/exynos5-common.h
#define CONFIG_EXYNOS5250
#define CONFIG_SYS_SDRAM_BASE 0x4000
@@ -28,16 +27,13 @@
#define CONFIG_SYS_INIT_SP_ADDRCONFIG_IRAM_STACK
-/* I2C */
-#define CONFIG_MAX_I2C_NUM 8
+/* USB */
+#define CONFIG_USB_EHCI
+#define CONFIG_USB_EHCI_EXYNOS
-/* Display */
-#define CONFIG_LCD
-#ifdef CONFIG_LCD
-#define CONFIG_EXYNOS_FB
-#define CONFIG_EXYNOS_DP
-#define LCD_BPPLCD_COLOR16
-#endif
+#define CONFIG_USB_HOST_ETHER
+#define CONFIG_USB_ETHER_ASIX
+#define CONFIG_USB_ETHER_ASIX88179
/* DRAM Memory Banks */
#define CONFIG_NR_DRAM_BANKS 8
diff --git a/include/configs/exynos5420-common.h
b/include/configs/exynos5420-common.h
index 3b1ac2c..3cdec51 100644
--- a/include/configs/exynos5420-common.h
+++ b/include/configs/exynos5420-common.h
@@ -13,8 +13,6 @@
/* A variant of Exynos5420 (Exynos5 Family) */
#define CONFIG_EXYNOS5800
-#include configs/exynos5-common.h
-
#define MACH_TYPE_SMDK5420 8002
#define CONFIG_MACH_TYPE MACH_TYPE_SMDK5420
@@ -32,10 +30,6 @@
#define CONFIG_DEVICE_TREE_LIST
