Skip to content
Snippets Groups Projects
Commit 43900da8 authored by Hyungwon Hwang's avatar Hyungwon Hwang Committed by Minkyu Kang
Browse files

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: default avatarHyungwon Hwang <human.hwang@samsung.com>
Acked-by: default avatarSimon Glass <sjg@chromium.org>
Tested-by: default avatarKevin Hilman <khilman@linaro.org>
Signed-off-by: default avatarMinkyu Kang <mk7.kang@samsung.com>
parent d8bec60c
No related branches found
No related tags found
No related merge requests found
...@@ -13,13 +13,6 @@ ...@@ -13,13 +13,6 @@
/* A variant of Exynos5420 (Exynos5 Family) */ /* A variant of Exynos5420 (Exynos5 Family) */
#define CONFIG_EXYNOS5800 #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> #include <configs/exynos5-common.h>
#define CONFIG_ARCH_EARLY_INIT_R #define CONFIG_ARCH_EARLY_INIT_R
...@@ -29,8 +22,6 @@ ...@@ -29,8 +22,6 @@
#define CONFIG_VAR_SIZE_SPL #define CONFIG_VAR_SIZE_SPL
#define CONFIG_SYS_SDRAM_BASE 0x20000000
#define CONFIG_SYS_TEXT_BASE 0x23E00000
#ifdef CONFIG_VAR_SIZE_SPL #ifdef CONFIG_VAR_SIZE_SPL
#define CONFIG_SPL_TEXT_BASE 0x02024410 #define CONFIG_SPL_TEXT_BASE 0x02024410
#else #else
...@@ -49,13 +40,4 @@ ...@@ -49,13 +40,4 @@
#define CONFIG_SYS_USB_XHCI_MAX_ROOT_PORTS 2 #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 */ #endif /* __CONFIG_EXYNOS5420_H */
...@@ -14,14 +14,20 @@ ...@@ -14,14 +14,20 @@
#define CONFIG_ENV_SPI_BASE 0x12D30000 #define CONFIG_ENV_SPI_BASE 0x12D30000
#define FLASH_SIZE (0x4 << 20) #define FLASH_SIZE (0x4 << 20)
#define CONFIG_ENV_OFFSET (FLASH_SIZE - CONFIG_BL2_SIZE) #define CONFIG_ENV_OFFSET (FLASH_SIZE - CONFIG_BL2_SIZE)
#define CONFIG_SPI_BOOTING
#include <configs/exynos5420-common.h> #include <configs/exynos5420-common.h>
#include <configs/exynos5-dt-common.h> #include <configs/exynos5-dt-common.h>
#define CONFIG_BOARD_COMMON #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 */ /* select serial console configuration */
#define CONFIG_SERIAL3 /* use SERIAL 3 */ #define CONFIG_SERIAL3 /* use SERIAL 3 */
#define CONFIG_DEFAULT_CONSOLE "console=ttySAC1,115200n8\0"
#define CONFIG_SYS_PROMPT "Peach-Pi # " #define CONFIG_SYS_PROMPT "Peach-Pi # "
#define CONFIG_IDENT_STRING " for Peach-Pi" #define CONFIG_IDENT_STRING " for Peach-Pi"
......
...@@ -14,14 +14,20 @@ ...@@ -14,14 +14,20 @@
#define CONFIG_ENV_SPI_BASE 0x12D30000 #define CONFIG_ENV_SPI_BASE 0x12D30000
#define FLASH_SIZE (0x4 << 20) #define FLASH_SIZE (0x4 << 20)
#define CONFIG_ENV_OFFSET (FLASH_SIZE - CONFIG_BL2_SIZE) #define CONFIG_ENV_OFFSET (FLASH_SIZE - CONFIG_BL2_SIZE)
#define CONFIG_SPI_BOOTING
#include <configs/exynos5420-common.h> #include <configs/exynos5420-common.h>
#include <configs/exynos5-dt-common.h> #include <configs/exynos5-dt-common.h>
#define CONFIG_BOARD_COMMON #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 */ /* select serial console configuration */
#define CONFIG_SERIAL3 /* use SERIAL 3 */ #define CONFIG_SERIAL3 /* use SERIAL 3 */
#define CONFIG_DEFAULT_CONSOLE "console=ttySAC1,115200n8\0"
#define CONFIG_SYS_PROMPT "Peach-Pit # " #define CONFIG_SYS_PROMPT "Peach-Pit # "
#define CONFIG_IDENT_STRING " for Peach-Pit" #define CONFIG_IDENT_STRING " for Peach-Pit"
......
...@@ -9,15 +9,26 @@ ...@@ -9,15 +9,26 @@
#ifndef __CONFIG_SMDK5420_H #ifndef __CONFIG_SMDK5420_H
#define __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> #include <configs/exynos5420-common.h>
#define CONFIG_BOARD_COMMON #define CONFIG_BOARD_COMMON
#define CONFIG_SMDK5420 /* which is in a SMDK5420 */ #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 */ /* select serial console configuration */
#define CONFIG_SERIAL3 /* use SERIAL 3 */ #define CONFIG_SERIAL3 /* use SERIAL 3 */
#define CONFIG_DEFAULT_CONSOLE "console=ttySAC1,115200n8\0"
#define CONFIG_SYS_PROMPT "SMDK5420 # " #define CONFIG_SYS_PROMPT "SMDK5420 # "
#define CONFIG_IDENT_STRING " for SMDK5420" #define CONFIG_IDENT_STRING " for SMDK5420"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment