Skip to content

Commit 43900da

Browse files
Hyungwon HwangMinkyuKang
Hyungwon Hwang
authored andcommitted
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 <[email protected]> Acked-by: Simon Glass <[email protected]> Tested-by: Kevin Hilman <[email protected]> Signed-off-by: Minkyu Kang <[email protected]>
1 parent d8bec60 commit 43900da

File tree

4 files changed

+23
-18
lines changed

4 files changed

+23
-18
lines changed

include/configs/exynos5420-common.h

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,6 @@
1313
/* A variant of Exynos5420 (Exynos5 Family) */
1414
#define CONFIG_EXYNOS5800
1515

16-
#define CONFIG_ENV_IS_IN_SPI_FLASH
17-
#define CONFIG_SPI_FLASH
18-
#define CONFIG_ENV_SPI_BASE 0x12D30000
19-
#define FLASH_SIZE (0x4 << 20)
20-
#define CONFIG_ENV_OFFSET (FLASH_SIZE - CONFIG_BL2_SIZE)
21-
#define CONFIG_SPI_BOOTING
22-
2316
#include <configs/exynos5-common.h>
2417

2518
#define CONFIG_ARCH_EARLY_INIT_R
@@ -29,8 +22,6 @@
2922

3023
#define CONFIG_VAR_SIZE_SPL
3124

32-
#define CONFIG_SYS_SDRAM_BASE 0x20000000
33-
#define CONFIG_SYS_TEXT_BASE 0x23E00000
3425
#ifdef CONFIG_VAR_SIZE_SPL
3526
#define CONFIG_SPL_TEXT_BASE 0x02024410
3627
#else
@@ -49,13 +40,4 @@
4940

5041
#define CONFIG_SYS_USB_XHCI_MAX_ROOT_PORTS 2
5142

52-
/*
53-
* Put the initial stack pointer 1KB below this to allow room for the
54-
* SPL marker. This value is arbitrary, but gd_t is placed starting here.
55-
*/
56-
#define CONFIG_SYS_INIT_SP_ADDR (CONFIG_IRAM_TOP - 0x800)
57-
58-
/* Miscellaneous configurable options */
59-
#define CONFIG_DEFAULT_CONSOLE "console=ttySAC1,115200n8\0"
60-
6143
#endif /* __CONFIG_EXYNOS5420_H */

include/configs/peach-pi.h

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,20 @@
1414
#define CONFIG_ENV_SPI_BASE 0x12D30000
1515
#define FLASH_SIZE (0x4 << 20)
1616
#define CONFIG_ENV_OFFSET (FLASH_SIZE - CONFIG_BL2_SIZE)
17+
#define CONFIG_SPI_BOOTING
1718

1819
#include <configs/exynos5420-common.h>
1920
#include <configs/exynos5-dt-common.h>
2021

2122
#define CONFIG_BOARD_COMMON
2223

24+
#define CONFIG_SYS_SDRAM_BASE 0x20000000
25+
#define CONFIG_SYS_TEXT_BASE 0x23E00000
26+
#define CONFIG_SYS_INIT_SP_ADDR (CONFIG_IRAM_TOP - 0x800)
27+
2328
/* select serial console configuration */
2429
#define CONFIG_SERIAL3 /* use SERIAL 3 */
30+
#define CONFIG_DEFAULT_CONSOLE "console=ttySAC1,115200n8\0"
2531

2632
#define CONFIG_SYS_PROMPT "Peach-Pi # "
2733
#define CONFIG_IDENT_STRING " for Peach-Pi"

include/configs/peach-pit.h

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,20 @@
1414
#define CONFIG_ENV_SPI_BASE 0x12D30000
1515
#define FLASH_SIZE (0x4 << 20)
1616
#define CONFIG_ENV_OFFSET (FLASH_SIZE - CONFIG_BL2_SIZE)
17+
#define CONFIG_SPI_BOOTING
1718

1819
#include <configs/exynos5420-common.h>
1920
#include <configs/exynos5-dt-common.h>
2021

2122
#define CONFIG_BOARD_COMMON
2223

24+
#define CONFIG_SYS_SDRAM_BASE 0x20000000
25+
#define CONFIG_SYS_TEXT_BASE 0x23E00000
26+
#define CONFIG_SYS_INIT_SP_ADDR (CONFIG_IRAM_TOP - 0x800)
27+
2328
/* select serial console configuration */
2429
#define CONFIG_SERIAL3 /* use SERIAL 3 */
30+
#define CONFIG_DEFAULT_CONSOLE "console=ttySAC1,115200n8\0"
2531

2632
#define CONFIG_SYS_PROMPT "Peach-Pit # "
2733
#define CONFIG_IDENT_STRING " for Peach-Pit"

include/configs/smdk5420.h

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,26 @@
99
#ifndef __CONFIG_SMDK5420_H
1010
#define __CONFIG_SMDK5420_H
1111

12+
#define CONFIG_ENV_IS_IN_SPI_FLASH
13+
#define CONFIG_SPI_FLASH
14+
#define CONFIG_ENV_SPI_BASE 0x12D30000
15+
#define FLASH_SIZE (0x4 << 20)
16+
#define CONFIG_ENV_OFFSET (FLASH_SIZE - CONFIG_BL2_SIZE)
17+
#define CONFIG_SPI_BOOTING
18+
1219
#include <configs/exynos5420-common.h>
1320

1421
#define CONFIG_BOARD_COMMON
1522

1623
#define CONFIG_SMDK5420 /* which is in a SMDK5420 */
1724

25+
#define CONFIG_SYS_SDRAM_BASE 0x20000000
26+
#define CONFIG_SYS_TEXT_BASE 0x23E00000
27+
#define CONFIG_SYS_INIT_SP_ADDR (CONFIG_IRAM_TOP - 0x800)
1828

1929
/* select serial console configuration */
2030
#define CONFIG_SERIAL3 /* use SERIAL 3 */
31+
#define CONFIG_DEFAULT_CONSOLE "console=ttySAC1,115200n8\0"
2132

2233
#define CONFIG_SYS_PROMPT "SMDK5420 # "
2334
#define CONFIG_IDENT_STRING " for SMDK5420"

0 commit comments

Comments
 (0)