configs: mx6: Add a common config file

Add a common mx6 config file that can be shared between some mx6 boards. Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>

configs: mx6: Add a common config file
Add a common mx6 config file that can be shared between some mx6 boards. Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
Fabio Estevam · Tom Rini
1 parent 2af7e81015
Showing 2 changed files with 185 additions and 164 deletions Side-by-side Diff
include/configs/mx6qsabre_common.h
include/configs/mx6qsabresd.h
+/*
+ * Copyright (C) 2012 Freescale Semiconductor, Inc.
+ *
+ * Configuration settings for the Freescale i.MX6Q SabreSD board.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of
+ * the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.         See the
+ * GNU General Public License for more details.
+ */
+
+#ifndef __MX6QSABRE_COMMON_CONFIG_H
+#define __MX6QSABRE_COMMON_CONFIG_H
+
+#define CONFIG_MX6Q
+#define CONFIG_SYS_MX6_HCLK            24000000
+#define CONFIG_SYS_MX6_CLK32           32768
+#define CONFIG_DISPLAY_CPUINFO
+#define CONFIG_DISPLAY_BOARDINFO
+
+#include <asm/arch/imx-regs.h>
+
+#define CONFIG_CMDLINE_TAG
+#define CONFIG_SETUP_MEMORY_TAGS
+#define CONFIG_INITRD_TAG
+#define CONFIG_REVISION_TAG
+
+/* Size of malloc() pool */
+#define CONFIG_SYS_MALLOC_LEN		(CONFIG_ENV_SIZE + 2 * 1024 * 1024)
+
+#define CONFIG_BOARD_EARLY_INIT_F
+#define CONFIG_MXC_GPIO
+
+#define CONFIG_MXC_UART
+
+/* MMC Configs */
+#define CONFIG_FSL_ESDHC
+#define CONFIG_FSL_USDHC
+#define CONFIG_SYS_FSL_ESDHC_ADDR      0
+#define CONFIG_SYS_FSL_USDHC_NUM       2
+
+#define CONFIG_MMC
+#define CONFIG_CMD_MMC
+#define CONFIG_GENERIC_MMC
+#define CONFIG_CMD_EXT2
+#define CONFIG_CMD_FAT
+#define CONFIG_DOS_PARTITION
+
+#define CONFIG_CMD_PING
+#define CONFIG_CMD_DHCP
+#define CONFIG_CMD_MII
+#define CONFIG_CMD_NET
+#define CONFIG_FEC_MXC
+#define CONFIG_MII
+#define IMX_FEC_BASE			ENET_BASE_ADDR
+#define CONFIG_FEC_XCV_TYPE		RGMII
+#define CONFIG_ETHPRIME			"FEC"
+#define CONFIG_FEC_MXC_PHYADDR		1
+
+#define CONFIG_PHYLIB
+#define CONFIG_PHY_ATHEROS
+
+/* allow to overwrite serial and ethaddr */
+#define CONFIG_ENV_OVERWRITE
+#define CONFIG_CONS_INDEX              1
+#define CONFIG_BAUDRATE                        115200
+
+/* Command definition */
+#include <config_cmd_default.h>
+
+#undef CONFIG_CMD_IMLS
+
+#define CONFIG_BOOTDELAY               3
+
+#define CONFIG_LOADADDR                        0x10800000
+#define CONFIG_SYS_TEXT_BASE           0x17800000
+
+#define CONFIG_EXTRA_ENV_SETTINGS \
+	"script=boot.scr\0" \
+	"uimage=uImage\0" \
+	"console=ttymxc0\0" \
+	"fdt_high=0xffffffff\0"	  \
+	"initrd_high=0xffffffff\0" \
+	"mmcdev=0\0" \
+	"mmcpart=1\0" \
+	"mmcroot=/dev/mmcblk1p2 rootwait rw\0" \
+	"mmcargs=setenv bootargs console=${console},${baudrate} " \
+		"root=${mmcroot}\0" \
+	"loadbootscript=" \
+		"fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${script};\0" \
+	"bootscript=echo Running bootscript from mmc ...; " \
+		"source\0" \
+	"loaduimage=fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${uimage}\0" \
+		"mmcboot=echo Booting from mmc ...; " \
+		"run mmcargs; " \
+		"bootm\0" \
+	"netargs=setenv bootargs console=${console},${baudrate} " \
+		"root=/dev/nfs " \
+		"ip=dhcp nfsroot=${serverip}:${nfsroot},v3,tcp\0" \
+	"netboot=echo Booting from net ...; " \
+		"run netargs; " \
+		"dhcp ${uimage}; bootm\0" \
+
+#define CONFIG_BOOTCOMMAND \
+	"mmc dev ${mmcdev};" \
+	"if mmc rescan ${mmcdev}; then " \
+		"if run loadbootscript; then " \
+		"run bootscript; " \
+		"else " \
+			"if run loaduimage; then " \
+				"run mmcboot; " \
+			"else run netboot; " \
+			"fi; " \
+		"fi; " \
+	"else run netboot; fi"
+
+#define CONFIG_ARP_TIMEOUT     200UL
+
+/* Miscellaneous configurable options */
+#define CONFIG_SYS_LONGHELP
+#define CONFIG_SYS_HUSH_PARSER
+#define CONFIG_SYS_PROMPT_HUSH_PS2     "> "
+#define CONFIG_SYS_PROMPT              "U-Boot > "
+#define CONFIG_AUTO_COMPLETE
+#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
+#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
+
+#define CONFIG_SYS_MEMTEST_START       0x10000000
+#define CONFIG_SYS_MEMTEST_END         0x10010000
+
+#define CONFIG_SYS_LOAD_ADDR           CONFIG_LOADADDR
+#define CONFIG_SYS_HZ                  1000
+
+#define CONFIG_CMDLINE_EDITING
+#define CONFIG_STACKSIZE               (128 * 1024)
+
+/* Physical Memory Map */
+#define CONFIG_NR_DRAM_BANKS           1
+#define PHYS_SDRAM                     MMDC0_ARB_BASE_ADDR
+
+#define CONFIG_SYS_SDRAM_BASE          PHYS_SDRAM
+#define CONFIG_SYS_INIT_RAM_ADDR       IRAM_BASE_ADDR
+#define CONFIG_SYS_INIT_RAM_SIZE       IRAM_SIZE
+
+#define CONFIG_SYS_INIT_SP_OFFSET \
+	(CONFIG_SYS_INIT_RAM_SIZE - GENERATED_GBL_DATA_SIZE)
+#define CONFIG_SYS_INIT_SP_ADDR \
+	(CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET)
+
+/* FLASH and environment organization */
+#define CONFIG_SYS_NO_FLASH
+
+#define CONFIG_ENV_SIZE			(8 * 1024)
+
+#define CONFIG_ENV_IS_IN_MMC
+
+#if defined(CONFIG_ENV_IS_IN_MMC)
+#define CONFIG_ENV_OFFSET		(6 * 64 * 1024)
+#define CONFIG_SYS_MMC_ENV_DEV		0
+#endif
+
+#define CONFIG_OF_LIBFDT
+
+#define CONFIG_SYS_DCACHE_OFF
+
+#ifndef CONFIG_SYS_DCACHE_OFF
+#define CONFIG_CMD_CACHE
+#endif
+
+#endif                         /* __MX6QSABRE_COMMON_CONFIG_H */
@@ -14,171 +14,13 @@
  * GNU General Public License for more details.
  */
  
-#ifndef __CONFIG_H
-#define __CONFIG_H
+#ifndef __MX6QSABRESD_CONFIG_H
+#define __MX6QSABRESD_CONFIG_H
+#include "mx6qsabre_common.h"
  
-#define CONFIG_MX6Q
-#define CONFIG_SYS_MX6_HCLK            24000000
-#define CONFIG_SYS_MX6_CLK32           32768
-#define CONFIG_DISPLAY_CPUINFO
-#define CONFIG_DISPLAY_BOARDINFO
-
 #define CONFIG_MACH_TYPE	3980
+#define CONFIG_MXC_UART_BASE	UART1_BASE
+#define PHYS_SDRAM_SIZE		(1u * 1024 * 1024 * 1024)
  
-#include <asm/arch/imx-regs.h>
-
-#define CONFIG_CMDLINE_TAG
-#define CONFIG_SETUP_MEMORY_TAGS
-#define CONFIG_INITRD_TAG
-#define CONFIG_REVISION_TAG
-
-/* Size of malloc() pool */
-#define CONFIG_SYS_MALLOC_LEN		(CONFIG_ENV_SIZE + 2 * 1024 * 1024)
-
-#define CONFIG_BOARD_EARLY_INIT_F
-#define CONFIG_MXC_GPIO
-
-#define CONFIG_MXC_UART
-#define CONFIG_MXC_UART_BASE           UART1_BASE
-
-/* MMC Configs */
-#define CONFIG_FSL_ESDHC
-#define CONFIG_FSL_USDHC
-#define CONFIG_SYS_FSL_ESDHC_ADDR      0
-#define CONFIG_SYS_FSL_USDHC_NUM       2
-
-#define CONFIG_MMC
-#define CONFIG_CMD_MMC
-#define CONFIG_GENERIC_MMC
-#define CONFIG_CMD_EXT2
-#define CONFIG_CMD_FAT
-#define CONFIG_DOS_PARTITION
-
-#define CONFIG_CMD_PING
-#define CONFIG_CMD_DHCP
-#define CONFIG_CMD_MII
-#define CONFIG_CMD_NET
-#define CONFIG_FEC_MXC
-#define CONFIG_MII
-#define IMX_FEC_BASE			ENET_BASE_ADDR
-#define CONFIG_FEC_XCV_TYPE		RGMII
-#define CONFIG_ETHPRIME			"FEC"
-#define CONFIG_FEC_MXC_PHYADDR		1
-
-#define CONFIG_PHYLIB
-#define CONFIG_PHY_ATHEROS
-
-/* allow to overwrite serial and ethaddr */
-#define CONFIG_ENV_OVERWRITE
-#define CONFIG_CONS_INDEX              1
-#define CONFIG_BAUDRATE                        115200
-
-/* Command definition */
-#include <config_cmd_default.h>
-
-#undef CONFIG_CMD_IMLS
-
-#define CONFIG_BOOTDELAY               3
-
-#define CONFIG_LOADADDR                        0x10800000
-#define CONFIG_SYS_TEXT_BASE           0x17800000
-
-#define CONFIG_EXTRA_ENV_SETTINGS \
-	"script=boot.scr\0" \
-	"uimage=uImage\0" \
-	"console=ttymxc0\0" \
-	"fdt_high=0xffffffff\0"	  \
-	"initrd_high=0xffffffff\0" \
-	"mmcdev=0\0" \
-	"mmcpart=2\0" \
-	"mmcroot=/dev/mmcblk0p3 rootwait rw\0" \
-	"mmcargs=setenv bootargs console=${console},${baudrate} " \
-		"root=${mmcroot}\0" \
-	"loadbootscript=" \
-		"fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${script};\0" \
-	"bootscript=echo Running bootscript from mmc ...; " \
-		"source\0" \
-	"loaduimage=fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${uimage}\0" \
-		"mmcboot=echo Booting from mmc ...; " \
-		"run mmcargs; " \
-		"bootm\0" \
-	"netargs=setenv bootargs console=${console},${baudrate} " \
-		"root=/dev/nfs " \
-		"ip=dhcp nfsroot=${serverip}:${nfsroot},v3,tcp\0" \
-	"netboot=echo Booting from net ...; " \
-		"run netargs; " \
-		"dhcp ${uimage}; bootm\0" \
-
-#define CONFIG_BOOTCOMMAND \
-	"mmc dev ${mmcdev};" \
-	"if mmc rescan ${mmcdev}; then " \
-		"if run loadbootscript; then " \
-		"run bootscript; " \
-		"else " \
-			"if run loaduimage; then " \
-				"run mmcboot; " \
-			"else run netboot; " \
-			"fi; " \
-		"fi; " \
-	"else run netboot; fi"
-
-#define CONFIG_ARP_TIMEOUT     200UL
-
-/* Miscellaneous configurable options */
-#define CONFIG_SYS_LONGHELP
-#define CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2     "> "
-#define CONFIG_SYS_PROMPT              "MX6QSABRESD U-Boot > "
-#define CONFIG_AUTO_COMPLETE
-#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
-#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
-
-#define CONFIG_SYS_MEMTEST_START       0x10000000
-#define CONFIG_SYS_MEMTEST_END         0x10010000
-
-#define CONFIG_SYS_LOAD_ADDR           CONFIG_LOADADDR
-#define CONFIG_SYS_HZ                  1000
-
-#define CONFIG_CMDLINE_EDITING
-#define CONFIG_STACKSIZE               (128 * 1024)
-
-/* Physical Memory Map */
-#define CONFIG_NR_DRAM_BANKS           1
-#define PHYS_SDRAM                     MMDC0_ARB_BASE_ADDR
-#define PHYS_SDRAM_SIZE                        (1u * 1024 * 1024 * 1024)
-
-#define CONFIG_SYS_SDRAM_BASE          PHYS_SDRAM
-#define CONFIG_SYS_INIT_RAM_ADDR       IRAM_BASE_ADDR
-#define CONFIG_SYS_INIT_RAM_SIZE       IRAM_SIZE
-
-#define CONFIG_SYS_INIT_SP_OFFSET \
-	(CONFIG_SYS_INIT_RAM_SIZE - GENERATED_GBL_DATA_SIZE)
-#define CONFIG_SYS_INIT_SP_ADDR \
-	(CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET)
-
-/* FLASH and environment organization */
-#define CONFIG_SYS_NO_FLASH
-
-#define CONFIG_ENV_SIZE			(8 * 1024)
-
-#define CONFIG_ENV_IS_IN_MMC
-
-#if defined(CONFIG_ENV_IS_IN_MMC)
-#define CONFIG_ENV_OFFSET		(6 * 64 * 1024)
-#define CONFIG_SYS_MMC_ENV_DEV		0
-#endif
-
-#define CONFIG_OF_LIBFDT
-
-#define CONFIG_SYS_DCACHE_OFF
-
-#ifndef CONFIG_SYS_DCACHE_OFF
-#define CONFIG_CMD_CACHE
-#endif
-
-#endif                         /* __CONFIG_H */
+#endif                         /* __MX6QSABRESD_CONFIG_H */
	1	+/*
	2	+ * Copyright (C) 2012 Freescale Semiconductor, Inc.
	3	+ *
	4	+ * Configuration settings for the Freescale i.MX6Q SabreSD board.
	5	+ *
	6	+ * This program is free software; you can redistribute it and/or
	7	+ * modify it under the terms of the GNU General Public License as
	8	+ * published by the Free Software Foundation; either version 2 of
	9	+ * the License, or (at your option) any later version.
	10	+ *
	11	+ * This program is distributed in the hope that it will be useful,
	12	+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
	13	+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	14	+ * GNU General Public License for more details.
	15	+ */
	16	+
	17	+#ifndef __MX6QSABRE_COMMON_CONFIG_H
	18	+#define __MX6QSABRE_COMMON_CONFIG_H
	19	+
	20	+#define CONFIG_MX6Q
	21	+#define CONFIG_SYS_MX6_HCLK 24000000
	22	+#define CONFIG_SYS_MX6_CLK32 32768
	23	+#define CONFIG_DISPLAY_CPUINFO
	24	+#define CONFIG_DISPLAY_BOARDINFO
	25	+
	26	+#include <asm/arch/imx-regs.h>
	27	+
	28	+#define CONFIG_CMDLINE_TAG
	29	+#define CONFIG_SETUP_MEMORY_TAGS
	30	+#define CONFIG_INITRD_TAG
	31	+#define CONFIG_REVISION_TAG
	32	+
	33	+/* Size of malloc() pool */
	34	+#define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + 2 * 1024 * 1024)
	35	+
	36	+#define CONFIG_BOARD_EARLY_INIT_F
	37	+#define CONFIG_MXC_GPIO
	38	+
	39	+#define CONFIG_MXC_UART
	40	+
	41	+/* MMC Configs */
	42	+#define CONFIG_FSL_ESDHC
	43	+#define CONFIG_FSL_USDHC
	44	+#define CONFIG_SYS_FSL_ESDHC_ADDR 0
	45	+#define CONFIG_SYS_FSL_USDHC_NUM 2
	46	+
	47	+#define CONFIG_MMC
	48	+#define CONFIG_CMD_MMC
	49	+#define CONFIG_GENERIC_MMC
	50	+#define CONFIG_CMD_EXT2
	51	+#define CONFIG_CMD_FAT
	52	+#define CONFIG_DOS_PARTITION
	53	+
	54	+#define CONFIG_CMD_PING
	55	+#define CONFIG_CMD_DHCP
	56	+#define CONFIG_CMD_MII
	57	+#define CONFIG_CMD_NET
	58	+#define CONFIG_FEC_MXC
	59	+#define CONFIG_MII
	60	+#define IMX_FEC_BASE ENET_BASE_ADDR
	61	+#define CONFIG_FEC_XCV_TYPE RGMII
	62	+#define CONFIG_ETHPRIME "FEC"
	63	+#define CONFIG_FEC_MXC_PHYADDR 1
	64	+
	65	+#define CONFIG_PHYLIB
	66	+#define CONFIG_PHY_ATHEROS
	67	+
	68	+/* allow to overwrite serial and ethaddr */
	69	+#define CONFIG_ENV_OVERWRITE
	70	+#define CONFIG_CONS_INDEX 1
	71	+#define CONFIG_BAUDRATE 115200
	72	+
	73	+/* Command definition */
	74	+#include <config_cmd_default.h>
	75	+
	76	+#undef CONFIG_CMD_IMLS
	77	+
	78	+#define CONFIG_BOOTDELAY 3
	79	+
	80	+#define CONFIG_LOADADDR 0x10800000
	81	+#define CONFIG_SYS_TEXT_BASE 0x17800000
	82	+
	83	+#define CONFIG_EXTRA_ENV_SETTINGS \
	84	+ "script=boot.scr\0" \
	85	+ "uimage=uImage\0" \
	86	+ "console=ttymxc0\0" \
	87	+ "fdt_high=0xffffffff\0" \
	88	+ "initrd_high=0xffffffff\0" \
	89	+ "mmcdev=0\0" \
	90	+ "mmcpart=1\0" \
	91	+ "mmcroot=/dev/mmcblk1p2 rootwait rw\0" \
	92	+ "mmcargs=setenv bootargs console=${console},${baudrate} " \
	93	+ "root=${mmcroot}\0" \
	94	+ "loadbootscript=" \
	95	+ "fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${script};\0" \
	96	+ "bootscript=echo Running bootscript from mmc ...; " \
	97	+ "source\0" \
	98	+ "loaduimage=fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${uimage}\0" \
	99	+ "mmcboot=echo Booting from mmc ...; " \
	100	+ "run mmcargs; " \
	101	+ "bootm\0" \
	102	+ "netargs=setenv bootargs console=${console},${baudrate} " \
	103	+ "root=/dev/nfs " \
	104	+ "ip=dhcp nfsroot=${serverip}:${nfsroot},v3,tcp\0" \
	105	+ "netboot=echo Booting from net ...; " \
	106	+ "run netargs; " \
	107	+ "dhcp ${uimage}; bootm\0" \
	108	+
	109	+#define CONFIG_BOOTCOMMAND \
	110	+ "mmc dev ${mmcdev};" \
	111	+ "if mmc rescan ${mmcdev}; then " \
	112	+ "if run loadbootscript; then " \
	113	+ "run bootscript; " \
	114	+ "else " \
	115	+ "if run loaduimage; then " \
	116	+ "run mmcboot; " \
	117	+ "else run netboot; " \
	118	+ "fi; " \
	119	+ "fi; " \
	120	+ "else run netboot; fi"
	121	+
	122	+#define CONFIG_ARP_TIMEOUT 200UL
	123	+
	124	+/* Miscellaneous configurable options */
	125	+#define CONFIG_SYS_LONGHELP
	126	+#define CONFIG_SYS_HUSH_PARSER
	127	+#define CONFIG_SYS_PROMPT_HUSH_PS2 "> "
	128	+#define CONFIG_SYS_PROMPT "U-Boot > "
	129	+#define CONFIG_AUTO_COMPLETE
	130	+#define CONFIG_SYS_CBSIZE 256
	131	+
	132	+/* Print Buffer Size */
	133	+#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16)
	134	+#define CONFIG_SYS_MAXARGS 16
	135	+#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
	136	+
	137	+#define CONFIG_SYS_MEMTEST_START 0x10000000
	138	+#define CONFIG_SYS_MEMTEST_END 0x10010000
	139	+
	140	+#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR
	141	+#define CONFIG_SYS_HZ 1000
	142	+
	143	+#define CONFIG_CMDLINE_EDITING
	144	+#define CONFIG_STACKSIZE (128 * 1024)
	145	+
	146	+/* Physical Memory Map */
	147	+#define CONFIG_NR_DRAM_BANKS 1
	148	+#define PHYS_SDRAM MMDC0_ARB_BASE_ADDR
	149	+
	150	+#define CONFIG_SYS_SDRAM_BASE PHYS_SDRAM
	151	+#define CONFIG_SYS_INIT_RAM_ADDR IRAM_BASE_ADDR
	152	+#define CONFIG_SYS_INIT_RAM_SIZE IRAM_SIZE
	153	+
	154	+#define CONFIG_SYS_INIT_SP_OFFSET \
	155	+ (CONFIG_SYS_INIT_RAM_SIZE - GENERATED_GBL_DATA_SIZE)
	156	+#define CONFIG_SYS_INIT_SP_ADDR \
	157	+ (CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET)
	158	+
	159	+/* FLASH and environment organization */
	160	+#define CONFIG_SYS_NO_FLASH
	161	+
	162	+#define CONFIG_ENV_SIZE (8 * 1024)
	163	+
	164	+#define CONFIG_ENV_IS_IN_MMC
	165	+
	166	+#if defined(CONFIG_ENV_IS_IN_MMC)
	167	+#define CONFIG_ENV_OFFSET (6 * 64 * 1024)
	168	+#define CONFIG_SYS_MMC_ENV_DEV 0
	169	+#endif
	170	+
	171	+#define CONFIG_OF_LIBFDT
	172	+
	173	+#define CONFIG_SYS_DCACHE_OFF
	174	+
	175	+#ifndef CONFIG_SYS_DCACHE_OFF
	176	+#define CONFIG_CMD_CACHE
	177	+#endif
	178	+
	179	+#endif /* __MX6QSABRE_COMMON_CONFIG_H */
...	...	@@ -14,171 +14,13 @@
14	14	* GNU General Public License for more details.
15	15	*/
16	16
17		-#ifndef __CONFIG_H
18		-#define __CONFIG_H
	17	+#ifndef __MX6QSABRESD_CONFIG_H
	18	+#define __MX6QSABRESD_CONFIG_H
	19	+#include "mx6qsabre_common.h"
19	20
20		-#define CONFIG_MX6Q
21		-#define CONFIG_SYS_MX6_HCLK 24000000
22		-#define CONFIG_SYS_MX6_CLK32 32768
23		-#define CONFIG_DISPLAY_CPUINFO
24		-#define CONFIG_DISPLAY_BOARDINFO
25		-
26	21	#define CONFIG_MACH_TYPE 3980
	22	+#define CONFIG_MXC_UART_BASE UART1_BASE
	23	+#define PHYS_SDRAM_SIZE (1u * 1024 * 1024 * 1024)
27	24
28		-#include <asm/arch/imx-regs.h>
29		-
30		-#define CONFIG_CMDLINE_TAG
31		-#define CONFIG_SETUP_MEMORY_TAGS
32		-#define CONFIG_INITRD_TAG
33		-#define CONFIG_REVISION_TAG
34		-
35		-/* Size of malloc() pool */
36		-#define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + 2 * 1024 * 1024)
37		-
38		-#define CONFIG_BOARD_EARLY_INIT_F
39		-#define CONFIG_MXC_GPIO
40		-
41		-#define CONFIG_MXC_UART
42		-#define CONFIG_MXC_UART_BASE UART1_BASE
43		-
44		-/* MMC Configs */
45		-#define CONFIG_FSL_ESDHC
46		-#define CONFIG_FSL_USDHC
47		-#define CONFIG_SYS_FSL_ESDHC_ADDR 0
48		-#define CONFIG_SYS_FSL_USDHC_NUM 2
49		-
50		-#define CONFIG_MMC
51		-#define CONFIG_CMD_MMC
52		-#define CONFIG_GENERIC_MMC
53		-#define CONFIG_CMD_EXT2
54		-#define CONFIG_CMD_FAT
55		-#define CONFIG_DOS_PARTITION
56		-
57		-#define CONFIG_CMD_PING
58		-#define CONFIG_CMD_DHCP
59		-#define CONFIG_CMD_MII
60		-#define CONFIG_CMD_NET
61		-#define CONFIG_FEC_MXC
62		-#define CONFIG_MII
63		-#define IMX_FEC_BASE ENET_BASE_ADDR
64		-#define CONFIG_FEC_XCV_TYPE RGMII
65		-#define CONFIG_ETHPRIME "FEC"
66		-#define CONFIG_FEC_MXC_PHYADDR 1
67		-
68		-#define CONFIG_PHYLIB
69		-#define CONFIG_PHY_ATHEROS
70		-
71		-/* allow to overwrite serial and ethaddr */
72		-#define CONFIG_ENV_OVERWRITE
73		-#define CONFIG_CONS_INDEX 1
74		-#define CONFIG_BAUDRATE 115200
75		-
76		-/* Command definition */
77		-#include <config_cmd_default.h>
78		-
79		-#undef CONFIG_CMD_IMLS
80		-
81		-#define CONFIG_BOOTDELAY 3
82		-
83		-#define CONFIG_LOADADDR 0x10800000
84		-#define CONFIG_SYS_TEXT_BASE 0x17800000
85		-
86		-#define CONFIG_EXTRA_ENV_SETTINGS \
87		- "script=boot.scr\0" \
88		- "uimage=uImage\0" \
89		- "console=ttymxc0\0" \
90		- "fdt_high=0xffffffff\0" \
91		- "initrd_high=0xffffffff\0" \
92		- "mmcdev=0\0" \
93		- "mmcpart=2\0" \
94		- "mmcroot=/dev/mmcblk0p3 rootwait rw\0" \
95		- "mmcargs=setenv bootargs console=${console},${baudrate} " \
96		- "root=${mmcroot}\0" \
97		- "loadbootscript=" \
98		- "fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${script};\0" \
99		- "bootscript=echo Running bootscript from mmc ...; " \
100		- "source\0" \
101		- "loaduimage=fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${uimage}\0" \
102		- "mmcboot=echo Booting from mmc ...; " \
103		- "run mmcargs; " \
104		- "bootm\0" \
105		- "netargs=setenv bootargs console=${console},${baudrate} " \
106		- "root=/dev/nfs " \
107		- "ip=dhcp nfsroot=${serverip}:${nfsroot},v3,tcp\0" \
108		- "netboot=echo Booting from net ...; " \
109		- "run netargs; " \
110		- "dhcp ${uimage}; bootm\0" \
111		-
112		-#define CONFIG_BOOTCOMMAND \
113		- "mmc dev ${mmcdev};" \
114		- "if mmc rescan ${mmcdev}; then " \
115		- "if run loadbootscript; then " \
116		- "run bootscript; " \
117		- "else " \
118		- "if run loaduimage; then " \
119		- "run mmcboot; " \
120		- "else run netboot; " \
121		- "fi; " \
122		- "fi; " \
123		- "else run netboot; fi"
124		-
125		-#define CONFIG_ARP_TIMEOUT 200UL
126		-
127		-/* Miscellaneous configurable options */
128		-#define CONFIG_SYS_LONGHELP
129		-#define CONFIG_SYS_HUSH_PARSER
130		-#define CONFIG_SYS_PROMPT_HUSH_PS2 "> "
131		-#define CONFIG_SYS_PROMPT "MX6QSABRESD U-Boot > "
132		-#define CONFIG_AUTO_COMPLETE
133		-#define CONFIG_SYS_CBSIZE 256
134		-
135		-/* Print Buffer Size */
136		-#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16)
137		-#define CONFIG_SYS_MAXARGS 16
138		-#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
139		-
140		-#define CONFIG_SYS_MEMTEST_START 0x10000000
141		-#define CONFIG_SYS_MEMTEST_END 0x10010000
142		-
143		-#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR
144		-#define CONFIG_SYS_HZ 1000
145		-
146		-#define CONFIG_CMDLINE_EDITING
147		-#define CONFIG_STACKSIZE (128 * 1024)
148		-
149		-/* Physical Memory Map */
150		-#define CONFIG_NR_DRAM_BANKS 1
151		-#define PHYS_SDRAM MMDC0_ARB_BASE_ADDR
152		-#define PHYS_SDRAM_SIZE (1u * 1024 * 1024 * 1024)
153		-
154		-#define CONFIG_SYS_SDRAM_BASE PHYS_SDRAM
155		-#define CONFIG_SYS_INIT_RAM_ADDR IRAM_BASE_ADDR
156		-#define CONFIG_SYS_INIT_RAM_SIZE IRAM_SIZE
157		-
158		-#define CONFIG_SYS_INIT_SP_OFFSET \
159		- (CONFIG_SYS_INIT_RAM_SIZE - GENERATED_GBL_DATA_SIZE)
160		-#define CONFIG_SYS_INIT_SP_ADDR \
161		- (CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET)
162		-
163		-/* FLASH and environment organization */
164		-#define CONFIG_SYS_NO_FLASH
165		-
166		-#define CONFIG_ENV_SIZE (8 * 1024)
167		-
168		-#define CONFIG_ENV_IS_IN_MMC
169		-
170		-#if defined(CONFIG_ENV_IS_IN_MMC)
171		-#define CONFIG_ENV_OFFSET (6 * 64 * 1024)
172		-#define CONFIG_SYS_MMC_ENV_DEV 0
173		-#endif
174		-
175		-#define CONFIG_OF_LIBFDT
176		-
177		-#define CONFIG_SYS_DCACHE_OFF
178		-
179		-#ifndef CONFIG_SYS_DCACHE_OFF
180		-#define CONFIG_CMD_CACHE
181		-#endif
182		-
183		-#endif /* __CONFIG_H */
	25	+#endif /* __MX6QSABRESD_CONFIG_H */