config: Move smdkv310 to use common exynos4 file

Most of the smdkv310 features are common with other exynos4 boards. To permit easier addition of driver model support, use the common file and add a device tree file. Signed-off-by: Simon Glass <sjg@chromium.org> Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>

config: Move smdkv310 to use common exynos4 file
Most of the smdkv310 features are common with other exynos4 boards. To permit easier addition of driver model support, use the common file and add a device tree file. Signed-off-by: Simon Glass <sjg@chromium.org> Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>
Simon Glass · Minkyu Kang
1 parent f94de733df
Showing 5 changed files with 34 additions and 51 deletions Side-by-side Diff
arch/arm/cpu/armv7/exynos/Kconfig
arch/arm/dts/Makefile
arch/arm/dts/exynos4210-smdkv310.dts
configs/smdkv310_defconfig
include/configs/smdkv310.h
@@ -5,6 +5,7 @@
  
 config TARGET_SMDKV310
 	bool "Exynos4210 SMDKV310 board"
+	select OF_CONTROL if !SPL_BUILD
  
 config TARGET_TRATS
 	bool "Exynos4210 Trats board"
 dtb-$(CONFIG_EXYNOS4) += exynos4210-origen.dtb \
+	exynos4210-smdkv310.dtb \
 	exynos4210-universal_c210.dtb \
 	exynos4210-trats.dtb \
 	exynos4412-trats2.dtb \
+/*
+ * Samsung's Exynos4210-based SMDKV310 board device tree source
+ *
+ * Copyright (c) 2014 Google, Inc
+ *
+ * SPDX-License-Identifier:	GPL-2.0+
+ */
+
+/dts-v1/;
+/include/ "exynos4.dtsi"
+
+/ {
+	model = "Samsung SMDKV310 on Exynos4210";
+	compatible = "samsung,smdkv310", "samsung,exynos4210";
+
+	aliases {
+		serial0 = "/serial@13800000";
+		console = "/serial@13820000";
+	};
+
+};
@@ -2,4 +2,5 @@
 +S:CONFIG_ARM=y
 +S:CONFIG_ARCH_EXYNOS=y
 +S:CONFIG_TARGET_SMDKV310=y
+CONFIG_DEFAULT_DEVICE_TREE="exynos4210-smdkv310"
@@ -9,72 +9,43 @@
 #ifndef __CONFIG_H
 #define __CONFIG_H
  
+#include "exynos4-common.h"
+
+#undef CONFIG_BOARD_COMMON
+#undef CONFIG_USB_GADGET
+#undef CONFIG_USB_GADGET_S3C_UDC_OTG
+#undef CONFIG_CMD_USB_MASS_STORAGE
+#undef CONFIG_REVISION_TAG
+#undef CONFIG_CMD_THOR_DOWNLOAD
+#undef CONFIG_CMD_DFU
+
 /* High Level Configuration Options */
-#define CONFIG_SAMSUNG			1	/* in a SAMSUNG core */
-#define CONFIG_S5P			1	/* S5P Family */
-#define CONFIG_EXYNOS4				/* EXYNOS4 Family */
 #define CONFIG_EXYNOS4210		1	/* which is a EXYNOS4210 SoC */
 #define CONFIG_SMDKV310			1	/* working with SMDKV310*/
  
-#include <asm/arch/cpu.h>		/* get chip and board defs */
-
-#define CONFIG_ARCH_CPU_INIT
-#define CONFIG_DISPLAY_CPUINFO
-#define CONFIG_DISPLAY_BOARDINFO
-#define CONFIG_BOARD_EARLY_INIT_F
-
 /* Mach Type */
 #define CONFIG_MACH_TYPE		MACH_TYPE_SMDKV310
  
 #define CONFIG_SYS_SDRAM_BASE		0x40000000
 #define CONFIG_SYS_TEXT_BASE		0x43E00000
  
-/* input clock of PLL: SMDKV310 has 24MHz input clock */
-#define CONFIG_SYS_CLK_FREQ		24000000
-
-#define CONFIG_SETUP_MEMORY_TAGS
-#define CONFIG_CMDLINE_TAG
-#define CONFIG_INITRD_TAG
-#define CONFIG_CMDLINE_EDITING
-
 /* Handling Sleep Mode*/
 #define S5P_CHECK_SLEEP			0x00000BAD
 #define S5P_CHECK_DIDLE			0xBAD00000
 #define S5P_CHECK_LPA			0xABAD0000
  
-/* Size of malloc() pool */
-#define CONFIG_SYS_MALLOC_LEN		(CONFIG_ENV_SIZE + (1 << 20))
-
 /* select serial console configuration */
 #define CONFIG_SERIAL1			1	/* use SERIAL 1 */
-#define CONFIG_BAUDRATE			115200
 #define EXYNOS4_DEFAULT_UART_OFFSET	0x010000
  
-/* SD/MMC configuration */
-#define CONFIG_GENERIC_MMC
-#define CONFIG_MMC
-#define CONFIG_SDHCI
-#define CONFIG_S5P_SDHCI
-
-/* PWM */
-#define CONFIG_PWM			1
-
 /* allow to overwrite serial and ethaddr */
 #define CONFIG_ENV_OVERWRITE
  
-/* Command definition*/
-#include <config_cmd_default.h>
-
 #define CONFIG_CMD_PING
 #define CONFIG_CMD_ELF
 #define CONFIG_CMD_DHCP
-#define CONFIG_CMD_MMC
 #define CONFIG_CMD_NET
-#define CONFIG_CMD_FAT
  
-#define CONFIG_BOOTDELAY		3
-#define CONFIG_ZERO_BOOTDELAY_CHECK
-
 /* MMC SPL */
 #define CONFIG_SKIP_LOWLEVEL_INIT
 #define COPY_BL2_FNPTR_ADDR	0x00002488
  
  
@@ -84,15 +55,8 @@
 #define CONFIG_BOOTCOMMAND	"fatload mmc 0 40007000 uImage; bootm 40007000"
  
 /* Miscellaneous configurable options */
-#define CONFIG_SYS_LONGHELP		/* undef to save memory */
-#define CONFIG_SYS_HUSH_PARSER		/* use "hush" command parser	*/
 #define CONFIG_SYS_PROMPT		"SMDKV310 # "
-#define CONFIG_SYS_CBSIZE		256	/* Console I/O Buffer Size*/
-#define CONFIG_SYS_PBSIZE		384	/* Print Buffer Size */
-#define CONFIG_SYS_MAXARGS		16	/* max number of command args */
 #define CONFIG_DEFAULT_CONSOLE		"console=ttySAC2,115200n8\0"
-/* Boot Argument Buffer Size */
-#define CONFIG_SYS_BARGSIZE		CONFIG_SYS_CBSIZE
 /* memtest works on */
 #define CONFIG_SYS_MEMTEST_START	CONFIG_SYS_SDRAM_BASE
 #define CONFIG_SYS_MEMTEST_END		(CONFIG_SYS_SDRAM_BASE + 0x6000000)
@@ -111,8 +75,6 @@
 #define PHYS_SDRAM_4_SIZE	SDRAM_BANK_SIZE
  
 /* FLASH and environment organization */
-#define CONFIG_SYS_NO_FLASH		1
-#undef	CONFIG_CMD_IMLS
 #define CONFIG_IDENT_STRING		" for SMDKC210/V310"
  
 #define CONFIG_CLK_1000_400_200
@@ -126,7 +88,6 @@
 #define RESERVE_BLOCK_SIZE		(512)
 #define BL1_SIZE			(16 << 10) /*16 K reserved for BL1*/
 #define CONFIG_ENV_OFFSET		(RESERVE_BLOCK_SIZE + BL1_SIZE)
-#define CONFIG_DOS_PARTITION		1
  
 #define CONFIG_SPL_LDSCRIPT	"board/samsung/common/exynos-uboot-spl.lds"
 #define CONFIG_SPL_MAX_FOOTPRINT	(14 * 1024)
@@ -146,7 +107,5 @@
 #define CONFIG_ENV_SROM_BANK		1
 #endif /*CONFIG_CMD_NET*/
  
-/* Enable devicetree support */
-#define CONFIG_OF_LIBFDT
 #endif	/* __CONFIG_H */
...	...	@@ -5,6 +5,7 @@
5	5
6	6	config TARGET_SMDKV310
7	7	bool "Exynos4210 SMDKV310 board"
	8	+ select OF_CONTROL if !SPL_BUILD
8	9
9	10	config TARGET_TRATS
10	11	bool "Exynos4210 Trats board"
1	1	dtb-$(CONFIG_EXYNOS4) += exynos4210-origen.dtb \
	2	+ exynos4210-smdkv310.dtb \
2	3	exynos4210-universal_c210.dtb \
3	4	exynos4210-trats.dtb \
4	5	exynos4412-trats2.dtb \
	1	+/*
	2	+ * Samsung's Exynos4210-based SMDKV310 board device tree source
	3	+ *
	4	+ * Copyright (c) 2014 Google, Inc
	5	+ *
	6	+ * SPDX-License-Identifier: GPL-2.0+
	7	+ */
	8	+
	9	+/dts-v1/;
	10	+/include/ "exynos4.dtsi"
	11	+
	12	+/ {
	13	+ model = "Samsung SMDKV310 on Exynos4210";
	14	+ compatible = "samsung,smdkv310", "samsung,exynos4210";
	15	+
	16	+ aliases {
	17	+ serial0 = "/serial@13800000";
	18	+ console = "/serial@13820000";
	19	+ };
	20	+
	21	+};
...	...	@@ -2,4 +2,5 @@
2	2	+S:CONFIG_ARM=y
3	3	+S:CONFIG_ARCH_EXYNOS=y
4	4	+S:CONFIG_TARGET_SMDKV310=y
	5	+CONFIG_DEFAULT_DEVICE_TREE="exynos4210-smdkv310"
...	...	@@ -9,72 +9,43 @@
9	9	#ifndef __CONFIG_H
10	10	#define __CONFIG_H
11	11
	12	+#include "exynos4-common.h"
	13	+
	14	+#undef CONFIG_BOARD_COMMON
	15	+#undef CONFIG_USB_GADGET
	16	+#undef CONFIG_USB_GADGET_S3C_UDC_OTG
	17	+#undef CONFIG_CMD_USB_MASS_STORAGE
	18	+#undef CONFIG_REVISION_TAG
	19	+#undef CONFIG_CMD_THOR_DOWNLOAD
	20	+#undef CONFIG_CMD_DFU
	21	+
12	22	/* High Level Configuration Options */
13		-#define CONFIG_SAMSUNG 1 /* in a SAMSUNG core */
14		-#define CONFIG_S5P 1 /* S5P Family */
15		-#define CONFIG_EXYNOS4 /* EXYNOS4 Family */
16	23	#define CONFIG_EXYNOS4210 1 /* which is a EXYNOS4210 SoC */
17	24	#define CONFIG_SMDKV310 1 /* working with SMDKV310*/
18	25
19		-#include <asm/arch/cpu.h> /* get chip and board defs */
20		-
21		-#define CONFIG_ARCH_CPU_INIT
22		-#define CONFIG_DISPLAY_CPUINFO
23		-#define CONFIG_DISPLAY_BOARDINFO
24		-#define CONFIG_BOARD_EARLY_INIT_F
25		-
26	26	/* Mach Type */
27	27	#define CONFIG_MACH_TYPE MACH_TYPE_SMDKV310
28	28
29	29	#define CONFIG_SYS_SDRAM_BASE 0x40000000
30	30	#define CONFIG_SYS_TEXT_BASE 0x43E00000
31	31
32		-/* input clock of PLL: SMDKV310 has 24MHz input clock */
33		-#define CONFIG_SYS_CLK_FREQ 24000000
34		-
35		-#define CONFIG_SETUP_MEMORY_TAGS
36		-#define CONFIG_CMDLINE_TAG
37		-#define CONFIG_INITRD_TAG
38		-#define CONFIG_CMDLINE_EDITING
39		-
40	32	/* Handling Sleep Mode*/
41	33	#define S5P_CHECK_SLEEP 0x00000BAD
42	34	#define S5P_CHECK_DIDLE 0xBAD00000
43	35	#define S5P_CHECK_LPA 0xABAD0000
44	36
45		-/* Size of malloc() pool */
46		-#define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + (1 << 20))
47		-
48	37	/* select serial console configuration */
49	38	#define CONFIG_SERIAL1 1 /* use SERIAL 1 */
50		-#define CONFIG_BAUDRATE 115200
51	39	#define EXYNOS4_DEFAULT_UART_OFFSET 0x010000
52	40
53		-/* SD/MMC configuration */
54		-#define CONFIG_GENERIC_MMC
55		-#define CONFIG_MMC
56		-#define CONFIG_SDHCI
57		-#define CONFIG_S5P_SDHCI
58		-
59		-/* PWM */
60		-#define CONFIG_PWM 1
61		-
62	41	/* allow to overwrite serial and ethaddr */
63	42	#define CONFIG_ENV_OVERWRITE
64	43
65		-/* Command definition*/
66		-#include <config_cmd_default.h>
67		-
68	44	#define CONFIG_CMD_PING
69	45	#define CONFIG_CMD_ELF
70	46	#define CONFIG_CMD_DHCP
71		-#define CONFIG_CMD_MMC
72	47	#define CONFIG_CMD_NET
73		-#define CONFIG_CMD_FAT
74	48
75		-#define CONFIG_BOOTDELAY 3
76		-#define CONFIG_ZERO_BOOTDELAY_CHECK
77		-
78	49	/* MMC SPL */
79	50	#define CONFIG_SKIP_LOWLEVEL_INIT
80	51	#define COPY_BL2_FNPTR_ADDR 0x00002488
81	52
82	53
...	...	@@ -84,15 +55,8 @@
84	55	#define CONFIG_BOOTCOMMAND "fatload mmc 0 40007000 uImage; bootm 40007000"
85	56
86	57	/* Miscellaneous configurable options */
87		-#define CONFIG_SYS_LONGHELP /* undef to save memory */
88		-#define CONFIG_SYS_HUSH_PARSER /* use "hush" command parser */
89	58	#define CONFIG_SYS_PROMPT "SMDKV310 # "
90		-#define CONFIG_SYS_CBSIZE 256 /* Console I/O Buffer Size*/
91		-#define CONFIG_SYS_PBSIZE 384 /* Print Buffer Size */
92		-#define CONFIG_SYS_MAXARGS 16 /* max number of command args */
93	59	#define CONFIG_DEFAULT_CONSOLE "console=ttySAC2,115200n8\0"
94		-/* Boot Argument Buffer Size */
95		-#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
96	60	/* memtest works on */
97	61	#define CONFIG_SYS_MEMTEST_START CONFIG_SYS_SDRAM_BASE
98	62	#define CONFIG_SYS_MEMTEST_END (CONFIG_SYS_SDRAM_BASE + 0x6000000)
...	...	@@ -111,8 +75,6 @@
111	75	#define PHYS_SDRAM_4_SIZE SDRAM_BANK_SIZE
112	76
113	77	/* FLASH and environment organization */
114		-#define CONFIG_SYS_NO_FLASH 1
115		-#undef CONFIG_CMD_IMLS
116	78	#define CONFIG_IDENT_STRING " for SMDKC210/V310"
117	79
118	80	#define CONFIG_CLK_1000_400_200
...	...	@@ -126,7 +88,6 @@
126	88	#define RESERVE_BLOCK_SIZE (512)
127	89	#define BL1_SIZE (16 << 10) /16 K reserved for BL1/
128	90	#define CONFIG_ENV_OFFSET (RESERVE_BLOCK_SIZE + BL1_SIZE)
129		-#define CONFIG_DOS_PARTITION 1
130	91
131	92	#define CONFIG_SPL_LDSCRIPT "board/samsung/common/exynos-uboot-spl.lds"
132	93	#define CONFIG_SPL_MAX_FOOTPRINT (14 * 1024)
...	...	@@ -146,7 +107,5 @@
146	107	#define CONFIG_ENV_SROM_BANK 1
147	108	#endif /CONFIG_CMD_NET/
148	109
149		-/* Enable devicetree support */
150		-#define CONFIG_OF_LIBFDT
151	110	#endif /* __CONFIG_H */