config: exynos5420: move non common configs to specific board files

The media for boot and environment is a board-specific feature, not a
processor-specific. This is same to console port number and  some
other addresses. This patch moves the that kinds of configs to each
board-specific files from the common config file for Exynos5420.

Signed-off-by: Hyungwon Hwang <human.hwang@samsung.com>
Acked-by: Simon Glass <sjg@chromium.org>
Tested-by: Kevin Hilman <khilman@linaro.org>
Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>

diff --git a/include/configs/exynos5420-common.h b/include/configs/exynos5420-common.h
index ef6e1551ab0086a139e4dc2e03cc95c94d95bdc9..7322f336381dcafe7e709b91e1c8db6cbc72e7e9 100644 (file)
--- a/include/configs/exynos5420-common.h
+++ b/include/configs/exynos5420-common.h
@@ -13,13 +13,6 @@
 /* A variant of Exynos5420 (Exynos5 Family) */
 #define CONFIG_EXYNOS5800
 
-#define CONFIG_ENV_IS_IN_SPI_FLASH
-#define CONFIG_SPI_FLASH
-#define CONFIG_ENV_SPI_BASE    0x12D30000
-#define FLASH_SIZE             (0x4 << 20)
-#define CONFIG_ENV_OFFSET      (FLASH_SIZE - CONFIG_BL2_SIZE)
-#define CONFIG_SPI_BOOTING
-
 #include <configs/exynos5-common.h>
 
 #define CONFIG_ARCH_EARLY_INIT_R
@@ -29,8 +22,6 @@
 
 #define CONFIG_VAR_SIZE_SPL
 
-#define CONFIG_SYS_SDRAM_BASE          0x20000000
-#define CONFIG_SYS_TEXT_BASE           0x23E00000
 #ifdef CONFIG_VAR_SIZE_SPL
 #define CONFIG_SPL_TEXT_BASE           0x02024410
 #else
@@ -49,13 +40,4 @@
 
 #define CONFIG_SYS_USB_XHCI_MAX_ROOT_PORTS     2
 
-/*
- * Put the initial stack pointer 1KB below this to allow room for the
- * SPL marker. This value is arbitrary, but gd_t is placed starting here.
- */
-#define CONFIG_SYS_INIT_SP_ADDR        (CONFIG_IRAM_TOP - 0x800)
-
-/* Miscellaneous configurable options */
-#define CONFIG_DEFAULT_CONSOLE         "console=ttySAC1,115200n8\0"
-
 #endif /* __CONFIG_EXYNOS5420_H */

diff --git a/include/configs/peach-pi.h b/include/configs/peach-pi.h
index 8a82402ec159f164b9c579ad351dbac0983d9d8b..a1c980d320259a380465a934d190e71538a4e0c1 100644 (file)
--- a/include/configs/peach-pi.h
+++ b/include/configs/peach-pi.h
@@ -14,14 +14,20 @@
 #define CONFIG_ENV_SPI_BASE    0x12D30000
 #define FLASH_SIZE             (0x4 << 20)
 #define CONFIG_ENV_OFFSET      (FLASH_SIZE - CONFIG_BL2_SIZE)
+#define CONFIG_SPI_BOOTING
 
 #include <configs/exynos5420-common.h>
 #include <configs/exynos5-dt-common.h>
 
 #define CONFIG_BOARD_COMMON
 
+#define CONFIG_SYS_SDRAM_BASE  0x20000000
+#define CONFIG_SYS_TEXT_BASE   0x23E00000
+#define CONFIG_SYS_INIT_SP_ADDR        (CONFIG_IRAM_TOP - 0x800)
+
 /* select serial console configuration */
 #define CONFIG_SERIAL3         /* use SERIAL 3 */
+#define CONFIG_DEFAULT_CONSOLE "console=ttySAC1,115200n8\0"
 
 #define CONFIG_SYS_PROMPT      "Peach-Pi # "
 #define CONFIG_IDENT_STRING    " for Peach-Pi"

diff --git a/include/configs/peach-pit.h b/include/configs/peach-pit.h
index ad5db57f5f94678591d2c6f2398cd3ca83ed2bd9..6516a727642f3afaad3c8c04249e75d1eabbcdf2 100644 (file)
--- a/include/configs/peach-pit.h
+++ b/include/configs/peach-pit.h
@@ -14,14 +14,20 @@
 #define CONFIG_ENV_SPI_BASE    0x12D30000
 #define FLASH_SIZE             (0x4 << 20)
 #define CONFIG_ENV_OFFSET      (FLASH_SIZE - CONFIG_BL2_SIZE)
+#define CONFIG_SPI_BOOTING
 
 #include <configs/exynos5420-common.h>
 #include <configs/exynos5-dt-common.h>
 
 #define CONFIG_BOARD_COMMON
 
+#define CONFIG_SYS_SDRAM_BASE  0x20000000
+#define CONFIG_SYS_TEXT_BASE   0x23E00000
+#define CONFIG_SYS_INIT_SP_ADDR        (CONFIG_IRAM_TOP - 0x800)
+
 /* select serial console configuration */
 #define CONFIG_SERIAL3         /* use SERIAL 3 */
+#define CONFIG_DEFAULT_CONSOLE "console=ttySAC1,115200n8\0"
 
 #define CONFIG_SYS_PROMPT      "Peach-Pit # "
 #define CONFIG_IDENT_STRING    " for Peach-Pit"

diff --git a/include/configs/smdk5420.h b/include/configs/smdk5420.h
index 5c9a3c0b21b676e5d09d13796abdac1fbbd71b6d..6b459488f26ccbf69f627c2e666d3ad70a56a4d6 100644 (file)
--- a/include/configs/smdk5420.h
+++ b/include/configs/smdk5420.h
@@ -9,15 +9,26 @@
 #ifndef __CONFIG_SMDK5420_H
 #define __CONFIG_SMDK5420_H
 
+#define CONFIG_ENV_IS_IN_SPI_FLASH
+#define CONFIG_SPI_FLASH
+#define CONFIG_ENV_SPI_BASE    0x12D30000
+#define FLASH_SIZE             (0x4 << 20)
+#define CONFIG_ENV_OFFSET      (FLASH_SIZE - CONFIG_BL2_SIZE)
+#define CONFIG_SPI_BOOTING
+
 #include <configs/exynos5420-common.h>
 
 #define CONFIG_BOARD_COMMON
 
 #define CONFIG_SMDK5420                        /* which is in a SMDK5420 */
 
+#define CONFIG_SYS_SDRAM_BASE  0x20000000
+#define CONFIG_SYS_TEXT_BASE   0x23E00000
+#define CONFIG_SYS_INIT_SP_ADDR        (CONFIG_IRAM_TOP - 0x800)
 
 /* select serial console configuration */
 #define CONFIG_SERIAL3         /* use SERIAL 3 */
+#define CONFIG_DEFAULT_CONSOLE "console=ttySAC1,115200n8\0"
 
 #define CONFIG_SYS_PROMPT      "SMDK5420 # "
 #define CONFIG_IDENT_STRING    " for SMDK5420"