TI:omap5/dra7xx: Convert to ti_armv7_common.h

Update omap5_common.h to use ti_armv7_common.h, and in turn update dra7xx_evm.h and omap5_uevm.h slightly. The biggest changes here are that IP blocks which exist on the platform, and had clocks enabled, now have the drivers being built as well. Signed-off-by: Tom Rini <trini@ti.com>

TI:omap5/dra7xx: Convert to ti_armv7_common.h
Update omap5_common.h to use ti_armv7_common.h, and in turn update dra7xx_evm.h and omap5_uevm.h slightly. The biggest changes here are that IP blocks which exist on the platform, and had clocks enabled, now have the drivers being built as well. Signed-off-by: Tom Rini <trini@ti.com>
Tom Rini
1 parent 8769455861
Showing 3 changed files with 34 additions and 177 deletions Side-by-side Diff
include/configs/dra7xx_evm.h
include/configs/omap5_common.h
include/configs/omap5_uevm.h
@@ -12,21 +12,18 @@
 #ifndef __CONFIG_DRA7XX_EVM_H
 #define __CONFIG_DRA7XX_EVM_H
  
-/* High Level Configuration Options */
-#define CONFIG_DRA7XX		/* in a TI DRA7XX core */
+#define CONFIG_DRA7XX
+
 #define CONFIG_ENV_IS_NOWHERE		/* For now. */
  
-#include <configs/omap5_common.h>
-
-#define CONFIG_SYS_PROMPT		"DRA752 EVM # "
-
+#define CONSOLEDEV			"ttyO0"
 #define CONFIG_CONS_INDEX		1
 #define CONFIG_SYS_NS16550_COM1		UART1_BASE
 #define CONFIG_BAUDRATE			115200
  
 #define CONFIG_SYS_OMAP_ABE_SYSCK
  
-#define CONSOLEDEV		"ttyO0"
+#include <configs/omap5_common.h>
  
 /* CPSW Ethernet */
 #define CONFIG_CMD_NET
@@ -9,112 +9,59 @@
  * TI OMAP5 AND DRA7XX common configuration settings
  *
  * SPDX-License-Identifier:	GPL-2.0+ 
+ *
+ * For more details, please see the technical documents listed at
+ * http://www.ti.com/product/omap5432
  */
  
 #ifndef __CONFIG_OMAP5_COMMON_H
 #define __CONFIG_OMAP5_COMMON_H
  
-/*
- * High Level Configuration Options
- */
-#define CONFIG_OMAP	/* in a TI OMAP core */
-#define CONFIG_OMAP54XX	/* which is a 54XX */
-#define CONFIG_OMAP_GPIO
-#define CONFIG_OMAP_COMMON
-
-/* Get CPU defs */
-#include <asm/arch/cpu.h>
-#include <asm/arch/omap.h>
-
-/* Display CPU and Board Info */
+#define CONFIG_OMAP54XX
 #define CONFIG_DISPLAY_CPUINFO
 #define CONFIG_DISPLAY_BOARDINFO
-
 #define CONFIG_MISC_INIT_R
+#define CONFIG_ARCH_CPU_INIT
  
-#define CONFIG_OF_LIBFDT
-#define CONFIG_CMD_BOOTZ
+#define CONFIG_SYS_CACHELINE_SIZE	64
  
-#define CONFIG_CMDLINE_TAG /* enable passing of ATAGs */
-#define CONFIG_SETUP_MEMORY_TAGS
-#define CONFIG_INITRD_TAG
+/* Use General purpose timer 1 */
+#define CONFIG_SYS_TIMERBASE		GPT2_BASE
  
-/*
- * Size of malloc() pool
- * Total Size Environment - 128k
- * Malloc - add 256k
- */
+#define CONFIG_SYS_EMIF_PRECALCULATED_TIMING_REGS
+
+/* Defines for SDRAM init */
+#ifndef CONFIG_SYS_EMIF_PRECALCULATED_TIMING_REGS
+#define CONFIG_SYS_AUTOMATIC_SDRAM_DETECTION
+#define CONFIG_SYS_DEFAULT_LPDDR2_TIMINGS
+#endif
+
+#ifndef CONFIG_SPL_BUILD
+#define CONFIG_PALMAS_POWER
+#endif
+
+#include <asm/arch/cpu.h>
+#include <asm/arch/omap.h>
+
 #define CONFIG_ENV_SIZE			(128 << 10)
-#define CONFIG_SYS_MALLOC_LEN		(CONFIG_ENV_SIZE + (256 << 10))
-/* Vector Base */
-#define CONFIG_SYS_CA9_VECTOR_BASE	SRAM_ROM_VECT_BASE
  
+#include <configs/ti_armv7_common.h>
+
 /*
  * Hardware drivers
  */
-
-/*
- * serial port - NS16550 compatible
- */
-#define V_NS16550_CLK			48000000
-
 #define CONFIG_SYS_NS16550
 #define CONFIG_SYS_NS16550_SERIAL
 #define CONFIG_SYS_NS16550_REG_SIZE	(-4)
-#define CONFIG_SYS_NS16550_CLK		V_NS16550_CLK
+#define CONFIG_SYS_NS16550_CLK		48000000
  
-/* CPU */
-#define CONFIG_ARCH_CPU_INIT
-
-/* I2C  */
-#define CONFIG_HARD_I2C
-#define CONFIG_SYS_I2C_SPEED		100000
-#define CONFIG_SYS_I2C_SLAVE		1
-#define CONFIG_DRIVER_OMAP34XX_I2C
-#define CONFIG_I2C_MULTI_BUS
-
-/* MMC */
-#define CONFIG_GENERIC_MMC
-#define CONFIG_MMC
-#define CONFIG_OMAP_HSMMC
-#define CONFIG_DOS_PARTITION
-
-#define CONFIG_SYS_CONSOLE_IS_IN_ENV
-
-/* Flash */
-#define CONFIG_SYS_NO_FLASH
-
-/* Cache */
-#define CONFIG_SYS_CACHELINE_SIZE	64
-#define CONFIG_SYS_CACHELINE_SHIFT	6
-
-/* commands to include */
-#include <config_cmd_default.h>
-
-/* Enabled commands */
-#define CONFIG_CMD_EXT2		/* EXT2 Support                 */
-#define CONFIG_CMD_FAT		/* FAT support                  */
-#define CONFIG_CMD_I2C		/* I2C serial bus support	*/
-#define CONFIG_CMD_MMC		/* MMC support                  */
-
-/* Disabled commands */
+/* Per-SoC commands */
 #undef CONFIG_CMD_NET
 #undef CONFIG_CMD_NFS
-#undef CONFIG_CMD_FPGA		/* FPGA configuration Support   */
-#undef CONFIG_CMD_IMLS		/* List all found images        */
  
 /*
  * Environment setup
  */
-
-#define CONFIG_BOOTDELAY	3
-#define CONFIG_ENV_VARS_UBOOT_CONFIG
-#define CONFIG_CMD_FS_GENERIC
-#define CONFIG_CMD_EXT2
-#define CONFIG_CMD_EXT4
-
-#define CONFIG_ENV_OVERWRITE
-
 #ifndef PARTS_DEFAULT
 #define PARTS_DEFAULT
 #endif
  
  
  
  
  
@@ -179,97 +126,12 @@
 		"fi; " \
 	"fi"
  
-#define CONFIG_AUTO_COMPLETE		1
  
-/*
- * Miscellaneous configurable options
- */
-
-#define CONFIG_SYS_LONGHELP	/* undef to save memory */
-#define CONFIG_SYS_HUSH_PARSER	/* use "hush" command parser */
-#define CONFIG_SYS_CBSIZE		256
-/* Print Buffer Size */
-#define CONFIG_SYS_PBSIZE		(CONFIG_SYS_CBSIZE + \
-					sizeof(CONFIG_SYS_PROMPT) + 16)
-#define CONFIG_SYS_MAXARGS		16
-/* Boot Argument Buffer Size */
-#define CONFIG_SYS_BARGSIZE		(CONFIG_SYS_CBSIZE)
-
-/*
- * memtest setup
- */
-#define CONFIG_SYS_MEMTEST_START	0x80000000
-#define CONFIG_SYS_MEMTEST_END		(CONFIG_SYS_MEMTEST_START + (32 << 20))
-
-/* Default load address */
-#define CONFIG_SYS_LOAD_ADDR		0x80000000
-
-/* Use General purpose timer 1 */
-#define CONFIG_SYS_TIMERBASE		GPT2_BASE
-#define CONFIG_SYS_PTV			2	/* Divisor: 2^(PTV+1) => 8 */
-#define CONFIG_SYS_HZ			1000
-
-/*
- * SDRAM Memory Map
- * Even though we use two CS all the memory
- * is mapped to one contiguous block
- */
-#define CONFIG_NR_DRAM_BANKS	1
-
-#define CONFIG_SYS_SDRAM_BASE		0x80000000
-#define CONFIG_SYS_INIT_SP_ADDR         (NON_SECURE_SRAM_END - \
-					 GENERATED_GBL_DATA_SIZE)
-
-#define CONFIG_SYS_EMIF_PRECALCULATED_TIMING_REGS
-
-/* Defines for SDRAM init */
-#ifndef CONFIG_SYS_EMIF_PRECALCULATED_TIMING_REGS
-#define CONFIG_SYS_AUTOMATIC_SDRAM_DETECTION
-#define CONFIG_SYS_DEFAULT_LPDDR2_TIMINGS
-#endif
-
-#ifndef CONFIG_SPL_BUILD
-#define CONFIG_PALMAS_POWER
-#endif
-
 /* Defines for SPL */
-#define CONFIG_SPL
-#define CONFIG_SPL_FRAMEWORK
 #define CONFIG_SPL_TEXT_BASE		0x40300350
 #define CONFIG_SPL_MAX_SIZE		0x19000	/* 100K */
-#define CONFIG_SPL_STACK		CONFIG_SYS_INIT_SP_ADDR
 #define CONFIG_SPL_DISPLAY_PRINT
-
-#define CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR	0x300 /* address 0x60000 */
-#define CONFIG_SYS_U_BOOT_MAX_SIZE_SECTORS	0x200 /* 256 KB */
-#define CONFIG_SYS_MMC_SD_FAT_BOOT_PARTITION	1
-#define CONFIG_SPL_FAT_LOAD_PAYLOAD_NAME	"u-boot.img"
-
-#define CONFIG_SPL_LIBCOMMON_SUPPORT
-#define CONFIG_SPL_LIBDISK_SUPPORT
-#define CONFIG_SPL_I2C_SUPPORT
-#define CONFIG_SPL_MMC_SUPPORT
-#define CONFIG_SPL_FAT_SUPPORT
-#define CONFIG_SPL_LIBGENERIC_SUPPORT
-#define CONFIG_SPL_SERIAL_SUPPORT
 #define CONFIG_SPL_LDSCRIPT "$(CPUDIR)/omap-common/u-boot-spl.lds"
-
-/*
- * 64 bytes before this address should be set aside for u-boot.img's
- * header. That is 80E7FFC0--0x80E80000 should not be used for any
- * other needs.
- */
-#define CONFIG_SYS_TEXT_BASE		0x80E80000
-
-/*
- * BSS and malloc area 64MB into memory to allow enough
- * space for the kernel at the beginning of memory
- */
-#define CONFIG_SPL_BSS_START_ADDR	0x84000000
-#define CONFIG_SPL_BSS_MAX_SIZE		0x100000	/* 1 MB */
-#define CONFIG_SYS_SPL_MALLOC_START	0x84100000
-#define CONFIG_SYS_SPL_MALLOC_SIZE	0x100000	/* 1 MB */
-#define CONFIG_SPL_GPIO_SUPPORT
  
 #endif /* __CONFIG_OMAP5_COMMON_H */
@@ -17,8 +17,6 @@
 	"uuid_disk=${uuid_gpt_disk};" \
 	"name=rootfs,start=2MiB,size=-,uuid=${uuid_gpt_rootfs}"
  
-#include <configs/omap5_common.h>
-
 #define CONFIG_CONS_INDEX		3
 #define CONFIG_SYS_NS16550_COM3		UART3_BASE
 #define CONFIG_BAUDRATE			115200
  
  
@@ -42,10 +40,10 @@
 #define CONFIG_SYS_I2C_TCA642X_BUS_NUM 4
 #define CONFIG_SYS_I2C_TCA642X_ADDR 0x22
  
-#define CONFIG_SYS_PROMPT		"OMAP5432 uEVM # "
-
 #define CONSOLEDEV		"ttyO2"
-
 #define CONFIG_OMAP_PLATFORM_RESET_TIME_MAX_USEC	16296
+
+#include <configs/omap5_common.h>
+
 #endif /* __CONFIG_OMAP5_EVM_H */
...	...	@@ -12,21 +12,18 @@
12	12	#ifndef __CONFIG_DRA7XX_EVM_H
13	13	#define __CONFIG_DRA7XX_EVM_H
14	14
15		-/* High Level Configuration Options */
16		-#define CONFIG_DRA7XX /* in a TI DRA7XX core */
	15	+#define CONFIG_DRA7XX
	16	+
17	17	#define CONFIG_ENV_IS_NOWHERE /* For now. */
18	18
19		-#include <configs/omap5_common.h>
20		-
21		-#define CONFIG_SYS_PROMPT "DRA752 EVM # "
22		-
	19	+#define CONSOLEDEV "ttyO0"
23	20	#define CONFIG_CONS_INDEX 1
24	21	#define CONFIG_SYS_NS16550_COM1 UART1_BASE
25	22	#define CONFIG_BAUDRATE 115200
26	23
27	24	#define CONFIG_SYS_OMAP_ABE_SYSCK
28	25
29		-#define CONSOLEDEV "ttyO0"
	26	+#include <configs/omap5_common.h>
30	27
31	28	/* CPSW Ethernet */
32	29	#define CONFIG_CMD_NET
...	...	@@ -9,112 +9,59 @@
9	9	* TI OMAP5 AND DRA7XX common configuration settings
10	10	*
11	11	* SPDX-License-Identifier: GPL-2.0+
	12	+ *
	13	+ * For more details, please see the technical documents listed at
	14	+ * http://www.ti.com/product/omap5432
12	15	*/
13	16
14	17	#ifndef __CONFIG_OMAP5_COMMON_H
15	18	#define __CONFIG_OMAP5_COMMON_H
16	19
17		-/*
18		- * High Level Configuration Options
19		- */
20		-#define CONFIG_OMAP /* in a TI OMAP core */
21		-#define CONFIG_OMAP54XX /* which is a 54XX */
22		-#define CONFIG_OMAP_GPIO
23		-#define CONFIG_OMAP_COMMON
24		-
25		-/* Get CPU defs */
26		-#include <asm/arch/cpu.h>
27		-#include <asm/arch/omap.h>
28		-
29		-/* Display CPU and Board Info */
	20	+#define CONFIG_OMAP54XX
30	21	#define CONFIG_DISPLAY_CPUINFO
31	22	#define CONFIG_DISPLAY_BOARDINFO
32		-
33	23	#define CONFIG_MISC_INIT_R
	24	+#define CONFIG_ARCH_CPU_INIT
34	25
35		-#define CONFIG_OF_LIBFDT
36		-#define CONFIG_CMD_BOOTZ
	26	+#define CONFIG_SYS_CACHELINE_SIZE 64
37	27
38		-#define CONFIG_CMDLINE_TAG /* enable passing of ATAGs */
39		-#define CONFIG_SETUP_MEMORY_TAGS
40		-#define CONFIG_INITRD_TAG
	28	+/* Use General purpose timer 1 */
	29	+#define CONFIG_SYS_TIMERBASE GPT2_BASE
41	30
42		-/*
43		- * Size of malloc() pool
44		- * Total Size Environment - 128k
45		- * Malloc - add 256k
46		- */
	31	+#define CONFIG_SYS_EMIF_PRECALCULATED_TIMING_REGS
	32	+
	33	+/* Defines for SDRAM init */
	34	+#ifndef CONFIG_SYS_EMIF_PRECALCULATED_TIMING_REGS
	35	+#define CONFIG_SYS_AUTOMATIC_SDRAM_DETECTION
	36	+#define CONFIG_SYS_DEFAULT_LPDDR2_TIMINGS
	37	+#endif
	38	+
	39	+#ifndef CONFIG_SPL_BUILD
	40	+#define CONFIG_PALMAS_POWER
	41	+#endif
	42	+
	43	+#include <asm/arch/cpu.h>
	44	+#include <asm/arch/omap.h>
	45	+
47	46	#define CONFIG_ENV_SIZE (128 << 10)
48		-#define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + (256 << 10))
49		-/* Vector Base */
50		-#define CONFIG_SYS_CA9_VECTOR_BASE SRAM_ROM_VECT_BASE
51	47
	48	+#include <configs/ti_armv7_common.h>
	49	+
52	50	/*
53	51	* Hardware drivers
54	52	*/
55		-
56		-/*
57		- * serial port - NS16550 compatible
58		- */
59		-#define V_NS16550_CLK 48000000
60		-
61	53	#define CONFIG_SYS_NS16550
62	54	#define CONFIG_SYS_NS16550_SERIAL
63	55	#define CONFIG_SYS_NS16550_REG_SIZE (-4)
64		-#define CONFIG_SYS_NS16550_CLK V_NS16550_CLK
	56	+#define CONFIG_SYS_NS16550_CLK 48000000
65	57
66		-/* CPU */
67		-#define CONFIG_ARCH_CPU_INIT
68		-
69		-/* I2C */
70		-#define CONFIG_HARD_I2C
71		-#define CONFIG_SYS_I2C_SPEED 100000
72		-#define CONFIG_SYS_I2C_SLAVE 1
73		-#define CONFIG_DRIVER_OMAP34XX_I2C
74		-#define CONFIG_I2C_MULTI_BUS
75		-
76		-/* MMC */
77		-#define CONFIG_GENERIC_MMC
78		-#define CONFIG_MMC
79		-#define CONFIG_OMAP_HSMMC
80		-#define CONFIG_DOS_PARTITION
81		-
82		-#define CONFIG_SYS_CONSOLE_IS_IN_ENV
83		-
84		-/* Flash */
85		-#define CONFIG_SYS_NO_FLASH
86		-
87		-/* Cache */
88		-#define CONFIG_SYS_CACHELINE_SIZE 64
89		-#define CONFIG_SYS_CACHELINE_SHIFT 6
90		-
91		-/* commands to include */
92		-#include <config_cmd_default.h>
93		-
94		-/* Enabled commands */
95		-#define CONFIG_CMD_EXT2 /* EXT2 Support */
96		-#define CONFIG_CMD_FAT /* FAT support */
97		-#define CONFIG_CMD_I2C /* I2C serial bus support */
98		-#define CONFIG_CMD_MMC /* MMC support */
99		-
100		-/* Disabled commands */
	58	+/* Per-SoC commands */
101	59	#undef CONFIG_CMD_NET
102	60	#undef CONFIG_CMD_NFS
103		-#undef CONFIG_CMD_FPGA /* FPGA configuration Support */
104		-#undef CONFIG_CMD_IMLS /* List all found images */
105	61
106	62	/*
107	63	* Environment setup
108	64	*/
109		-
110		-#define CONFIG_BOOTDELAY 3
111		-#define CONFIG_ENV_VARS_UBOOT_CONFIG
112		-#define CONFIG_CMD_FS_GENERIC
113		-#define CONFIG_CMD_EXT2
114		-#define CONFIG_CMD_EXT4
115		-
116		-#define CONFIG_ENV_OVERWRITE
117		-
118	65	#ifndef PARTS_DEFAULT
119	66	#define PARTS_DEFAULT
120	67	#endif
121	68
122	69
123	70
124	71
125	72
...	...	@@ -179,97 +126,12 @@
179	126	"fi; " \
180	127	"fi"
181	128
182		-#define CONFIG_AUTO_COMPLETE 1
183	129
184		-/*
185		- * Miscellaneous configurable options
186		- */
187		-
188		-#define CONFIG_SYS_LONGHELP /* undef to save memory */
189		-#define CONFIG_SYS_HUSH_PARSER /* use "hush" command parser */
190		-#define CONFIG_SYS_CBSIZE 256
191		-/* Print Buffer Size */
192		-#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + \
193		- sizeof(CONFIG_SYS_PROMPT) + 16)
194		-#define CONFIG_SYS_MAXARGS 16
195		-/* Boot Argument Buffer Size */
196		-#define CONFIG_SYS_BARGSIZE (CONFIG_SYS_CBSIZE)
197		-
198		-/*
199		- * memtest setup
200		- */
201		-#define CONFIG_SYS_MEMTEST_START 0x80000000
202		-#define CONFIG_SYS_MEMTEST_END (CONFIG_SYS_MEMTEST_START + (32 << 20))
203		-
204		-/* Default load address */
205		-#define CONFIG_SYS_LOAD_ADDR 0x80000000
206		-
207		-/* Use General purpose timer 1 */
208		-#define CONFIG_SYS_TIMERBASE GPT2_BASE
209		-#define CONFIG_SYS_PTV 2 /* Divisor: 2^(PTV+1) => 8 */
210		-#define CONFIG_SYS_HZ 1000
211		-
212		-/*
213		- * SDRAM Memory Map
214		- * Even though we use two CS all the memory
215		- * is mapped to one contiguous block
216		- */
217		-#define CONFIG_NR_DRAM_BANKS 1
218		-
219		-#define CONFIG_SYS_SDRAM_BASE 0x80000000
220		-#define CONFIG_SYS_INIT_SP_ADDR (NON_SECURE_SRAM_END - \
221		- GENERATED_GBL_DATA_SIZE)
222		-
223		-#define CONFIG_SYS_EMIF_PRECALCULATED_TIMING_REGS
224		-
225		-/* Defines for SDRAM init */
226		-#ifndef CONFIG_SYS_EMIF_PRECALCULATED_TIMING_REGS
227		-#define CONFIG_SYS_AUTOMATIC_SDRAM_DETECTION
228		-#define CONFIG_SYS_DEFAULT_LPDDR2_TIMINGS
229		-#endif
230		-
231		-#ifndef CONFIG_SPL_BUILD
232		-#define CONFIG_PALMAS_POWER
233		-#endif
234		-
235	130	/* Defines for SPL */
236		-#define CONFIG_SPL
237		-#define CONFIG_SPL_FRAMEWORK
238	131	#define CONFIG_SPL_TEXT_BASE 0x40300350
239	132	#define CONFIG_SPL_MAX_SIZE 0x19000 /* 100K */
240		-#define CONFIG_SPL_STACK CONFIG_SYS_INIT_SP_ADDR
241	133	#define CONFIG_SPL_DISPLAY_PRINT
242		-
243		-#define CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR 0x300 /* address 0x60000 */
244		-#define CONFIG_SYS_U_BOOT_MAX_SIZE_SECTORS 0x200 /* 256 KB */
245		-#define CONFIG_SYS_MMC_SD_FAT_BOOT_PARTITION 1
246		-#define CONFIG_SPL_FAT_LOAD_PAYLOAD_NAME "u-boot.img"
247		-
248		-#define CONFIG_SPL_LIBCOMMON_SUPPORT
249		-#define CONFIG_SPL_LIBDISK_SUPPORT
250		-#define CONFIG_SPL_I2C_SUPPORT
251		-#define CONFIG_SPL_MMC_SUPPORT
252		-#define CONFIG_SPL_FAT_SUPPORT
253		-#define CONFIG_SPL_LIBGENERIC_SUPPORT
254		-#define CONFIG_SPL_SERIAL_SUPPORT
255	134	#define CONFIG_SPL_LDSCRIPT "$(CPUDIR)/omap-common/u-boot-spl.lds"
256		-
257		-/*
258		- * 64 bytes before this address should be set aside for u-boot.img's
259		- * header. That is 80E7FFC0--0x80E80000 should not be used for any
260		- * other needs.
261		- */
262		-#define CONFIG_SYS_TEXT_BASE 0x80E80000
263		-
264		-/*
265		- * BSS and malloc area 64MB into memory to allow enough
266		- * space for the kernel at the beginning of memory
267		- */
268		-#define CONFIG_SPL_BSS_START_ADDR 0x84000000
269		-#define CONFIG_SPL_BSS_MAX_SIZE 0x100000 /* 1 MB */
270		-#define CONFIG_SYS_SPL_MALLOC_START 0x84100000
271		-#define CONFIG_SYS_SPL_MALLOC_SIZE 0x100000 /* 1 MB */
272		-#define CONFIG_SPL_GPIO_SUPPORT
273	135
274	136	#endif /* __CONFIG_OMAP5_COMMON_H */
...	...	@@ -17,8 +17,6 @@
17	17	"uuid_disk=${uuid_gpt_disk};" \
18	18	"name=rootfs,start=2MiB,size=-,uuid=${uuid_gpt_rootfs}"
19	19
20		-#include <configs/omap5_common.h>
21		-
22	20	#define CONFIG_CONS_INDEX 3
23	21	#define CONFIG_SYS_NS16550_COM3 UART3_BASE
24	22	#define CONFIG_BAUDRATE 115200
25	23
26	24
...	...	@@ -42,10 +40,10 @@
42	40	#define CONFIG_SYS_I2C_TCA642X_BUS_NUM 4
43	41	#define CONFIG_SYS_I2C_TCA642X_ADDR 0x22
44	42
45		-#define CONFIG_SYS_PROMPT "OMAP5432 uEVM # "
46		-
47	43	#define CONSOLEDEV "ttyO2"
48		-
49	44	#define CONFIG_OMAP_PLATFORM_RESET_TIME_MAX_USEC 16296
	45	+
	46	+#include <configs/omap5_common.h>
	47	+
50	48	#endif /* __CONFIG_OMAP5_EVM_H */