imx6: centralise common boot options in mx6_common.h
Define common LOADADDR and BOOTDELAY to ensure a consistent experience across mx6 boards Signed-off-by: Peter Robinson <pbrobinson@gmail.com>
This commit is contained in:
		
							parent
							
								
									302b2e5bab
								
							
						
					
					
						commit
						8183058188
					
				|  | @ -75,11 +75,6 @@ | ||||||
| #define CONFIG_CMD_BOOTZ | #define CONFIG_CMD_BOOTZ | ||||||
| #define CONFIG_CMD_SETEXPR | #define CONFIG_CMD_SETEXPR | ||||||
| 
 | 
 | ||||||
| #define CONFIG_BOOTDELAY		3 |  | ||||||
| 
 |  | ||||||
| #define CONFIG_LOADADDR			0x12000000 |  | ||||||
| #define CONFIG_SYS_TEXT_BASE		0x17800000 |  | ||||||
| 
 |  | ||||||
| #define CONFIG_EXTRA_ENV_SETTINGS \ | #define CONFIG_EXTRA_ENV_SETTINGS \ | ||||||
| 	"script=u-boot.scr\0" \ | 	"script=u-boot.scr\0" \ | ||||||
| 	"fit_file=/boot/system.itb\0" \ | 	"fit_file=/boot/system.itb\0" \ | ||||||
|  | @ -196,8 +191,6 @@ | ||||||
| #define CONFIG_SYS_MEMTEST_END		(CONFIG_SYS_MEMTEST_START + 0x100000) | #define CONFIG_SYS_MEMTEST_END		(CONFIG_SYS_MEMTEST_START + 0x100000) | ||||||
| #define CONFIG_SYS_MEMTEST_SCRATCH	0x10800000 | #define CONFIG_SYS_MEMTEST_SCRATCH	0x10800000 | ||||||
| 
 | 
 | ||||||
| #define CONFIG_SYS_LOAD_ADDR		CONFIG_LOADADDR |  | ||||||
| 
 |  | ||||||
| #define CONFIG_CMDLINE_EDITING | #define CONFIG_CMDLINE_EDITING | ||||||
| #define CONFIG_STACKSIZE		(128 * 1024) | #define CONFIG_STACKSIZE		(128 * 1024) | ||||||
| 
 | 
 | ||||||
|  |  | ||||||
|  | @ -49,11 +49,6 @@ | ||||||
| 
 | 
 | ||||||
| /* Command definition */ | /* Command definition */ | ||||||
| 
 | 
 | ||||||
| #define CONFIG_BOOTDELAY	       3 |  | ||||||
| 
 |  | ||||||
| #define CONFIG_LOADADDR			       0x12000000 |  | ||||||
| #define CONFIG_SYS_TEXT_BASE	       0x17800000 |  | ||||||
| 
 |  | ||||||
| #define CONFIG_DEFAULT_FDT_FILE "imx6q-congatec.dtb" | #define CONFIG_DEFAULT_FDT_FILE "imx6q-congatec.dtb" | ||||||
| 
 | 
 | ||||||
| #define CONFIG_EXTRA_ENV_SETTINGS \ | #define CONFIG_EXTRA_ENV_SETTINGS \ | ||||||
|  | @ -125,8 +120,6 @@ | ||||||
| #define CONFIG_SYS_MEMTEST_END	       0x10010000 | #define CONFIG_SYS_MEMTEST_END	       0x10010000 | ||||||
| #define CONFIG_SYS_MEMTEST_SCRATCH     0x10800000 | #define CONFIG_SYS_MEMTEST_SCRATCH     0x10800000 | ||||||
| 
 | 
 | ||||||
| #define CONFIG_SYS_LOAD_ADDR	       CONFIG_LOADADDR |  | ||||||
| 
 |  | ||||||
| #define CONFIG_CMDLINE_EDITING | #define CONFIG_CMDLINE_EDITING | ||||||
| 
 | 
 | ||||||
| /* Physical Memory Map */ | /* Physical Memory Map */ | ||||||
|  |  | ||||||
|  | @ -247,9 +247,6 @@ | ||||||
| #define CONFIG_DWC_AHSATA_BASE_ADDR	SATA_ARB_BASE_ADDR | #define CONFIG_DWC_AHSATA_BASE_ADDR	SATA_ARB_BASE_ADDR | ||||||
| 
 | 
 | ||||||
| /* Boot */ | /* Boot */ | ||||||
| #define CONFIG_ZERO_BOOTDELAY_CHECK |  | ||||||
| #define CONFIG_LOADADDR			0x10800000 |  | ||||||
| #define CONFIG_SYS_LOAD_ADDR		CONFIG_LOADADDR |  | ||||||
| #define CONFIG_SYS_BOOTMAPSZ	        (8 << 20) | #define CONFIG_SYS_BOOTMAPSZ	        (8 << 20) | ||||||
| #define CONFIG_SERIAL_TAG | #define CONFIG_SERIAL_TAG | ||||||
| 
 | 
 | ||||||
|  |  | ||||||
|  | @ -97,9 +97,6 @@ | ||||||
| #define CONFIG_CMD_BMODE | #define CONFIG_CMD_BMODE | ||||||
| #define CONFIG_CMD_SETEXPR | #define CONFIG_CMD_SETEXPR | ||||||
| 
 | 
 | ||||||
| #define CONFIG_LOADADDR                        0x12000000 |  | ||||||
| #define CONFIG_SYS_TEXT_BASE           0x17800000 |  | ||||||
| 
 |  | ||||||
| #define CONFIG_ARP_TIMEOUT     200UL | #define CONFIG_ARP_TIMEOUT     200UL | ||||||
| 
 | 
 | ||||||
| /* Miscellaneous configurable options */ | /* Miscellaneous configurable options */ | ||||||
|  | @ -115,8 +112,6 @@ | ||||||
| #define CONFIG_SYS_MEMTEST_END         0x10010000 | #define CONFIG_SYS_MEMTEST_END         0x10010000 | ||||||
| #define CONFIG_SYS_MEMTEST_SCRATCH     0x10800000 | #define CONFIG_SYS_MEMTEST_SCRATCH     0x10800000 | ||||||
| 
 | 
 | ||||||
| #define CONFIG_SYS_LOAD_ADDR           CONFIG_LOADADDR |  | ||||||
| 
 |  | ||||||
| #define CONFIG_STACKSIZE               (128 * 1024) | #define CONFIG_STACKSIZE               (128 * 1024) | ||||||
| 
 | 
 | ||||||
| /* Physical Memory Map */ | /* Physical Memory Map */ | ||||||
|  |  | ||||||
|  | @ -270,8 +270,6 @@ | ||||||
| #define CONFIG_SYS_MEMTEST_START       0x10000000 | #define CONFIG_SYS_MEMTEST_START       0x10000000 | ||||||
| #define CONFIG_SYS_MEMTEST_END	       0x10010000 | #define CONFIG_SYS_MEMTEST_END	       0x10010000 | ||||||
| #define CONFIG_SYS_MEMTEST_SCRATCH     0x10800000 | #define CONFIG_SYS_MEMTEST_SCRATCH     0x10800000 | ||||||
| #define CONFIG_SYS_TEXT_BASE	         0x17800000 |  | ||||||
| #define CONFIG_SYS_LOAD_ADDR           0x12000000 |  | ||||||
| 
 | 
 | ||||||
| /* Physical Memory Map */ | /* Physical Memory Map */ | ||||||
| #define CONFIG_NR_DRAM_BANKS           1 | #define CONFIG_NR_DRAM_BANKS           1 | ||||||
|  | @ -329,8 +327,6 @@ | ||||||
| #endif | #endif | ||||||
| 
 | 
 | ||||||
| /* Environment */ | /* Environment */ | ||||||
| #define CONFIG_BOOTDELAY          3 |  | ||||||
| #define CONFIG_LOADADDR           CONFIG_SYS_LOAD_ADDR |  | ||||||
| #define CONFIG_IPADDR             192.168.1.1 | #define CONFIG_IPADDR             192.168.1.1 | ||||||
| #define CONFIG_SERVERIP           192.168.1.146 | #define CONFIG_SERVERIP           192.168.1.146 | ||||||
| #define HWCONFIG_DEFAULT \ | #define HWCONFIG_DEFAULT \ | ||||||
|  |  | ||||||
|  | @ -52,6 +52,16 @@ | ||||||
| #define CONFIG_INITRD_TAG | #define CONFIG_INITRD_TAG | ||||||
| #define CONFIG_REVISION_TAG | #define CONFIG_REVISION_TAG | ||||||
| 
 | 
 | ||||||
|  | /* Boot options */ | ||||||
|  | #define CONFIG_LOADADDR		0x12000000 | ||||||
|  | #define CONFIG_SYS_LOAD_ADDR	CONFIG_LOADADDR | ||||||
|  | #ifndef CONFIG_SYS_TEXT_BASE | ||||||
|  | #define CONFIG_SYS_TEXT_BASE	0x17800000 | ||||||
|  | #endif | ||||||
|  | #ifndef CONFIG_BOOTDELAY | ||||||
|  | #define CONFIG_BOOTDELAY	3 | ||||||
|  | #endif | ||||||
|  | 
 | ||||||
| /* GPIO */ | /* GPIO */ | ||||||
| #define CONFIG_MXC_GPIO | #define CONFIG_MXC_GPIO | ||||||
| #define CONFIG_CMD_GPIO | #define CONFIG_CMD_GPIO | ||||||
|  |  | ||||||
|  | @ -99,11 +99,6 @@ | ||||||
| #define CONFIG_CMD_BOOTZ | #define CONFIG_CMD_BOOTZ | ||||||
| #define CONFIG_CMD_SETEXPR | #define CONFIG_CMD_SETEXPR | ||||||
| 
 | 
 | ||||||
| #define CONFIG_BOOTDELAY		1 |  | ||||||
| 
 |  | ||||||
| #define CONFIG_LOADADDR			0x12000000 |  | ||||||
| #define CONFIG_SYS_TEXT_BASE		0x17800000 |  | ||||||
| 
 |  | ||||||
| #define CONFIG_MXC_UART_BASE	UART1_BASE | #define CONFIG_MXC_UART_BASE	UART1_BASE | ||||||
| #define CONFIG_CONSOLE_DEV	"ttymxc0" | #define CONFIG_CONSOLE_DEV	"ttymxc0" | ||||||
| #define CONFIG_MMCROOT		"/dev/mmcblk0p2" | #define CONFIG_MMCROOT		"/dev/mmcblk0p2" | ||||||
|  | @ -217,8 +212,6 @@ | ||||||
| #define CONFIG_SYS_MAXARGS             16 | #define CONFIG_SYS_MAXARGS             16 | ||||||
| #define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE | #define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE | ||||||
| 
 | 
 | ||||||
| #define CONFIG_SYS_LOAD_ADDR           CONFIG_LOADADDR |  | ||||||
| 
 |  | ||||||
| #define CONFIG_CMDLINE_EDITING | #define CONFIG_CMDLINE_EDITING | ||||||
| 
 | 
 | ||||||
| /* Physical Memory Map */ | /* Physical Memory Map */ | ||||||
|  |  | ||||||
|  | @ -49,11 +49,6 @@ | ||||||
| 
 | 
 | ||||||
| /* Command definition */ | /* Command definition */ | ||||||
| 
 | 
 | ||||||
| #define CONFIG_BOOTDELAY		3 |  | ||||||
| 
 |  | ||||||
| #define CONFIG_LOADADDR			0x12000000 |  | ||||||
| #define CONFIG_SYS_TEXT_BASE		0x17800000 |  | ||||||
| 
 |  | ||||||
| #define CONFIG_EXTRA_ENV_SETTINGS \ | #define CONFIG_EXTRA_ENV_SETTINGS \ | ||||||
| 	"script=boot.scr\0" \ | 	"script=boot.scr\0" \ | ||||||
| 	"image=zImage\0" \ | 	"image=zImage\0" \ | ||||||
|  | @ -142,8 +137,6 @@ | ||||||
| #define CONFIG_SYS_MEMTEST_START	0x10000000 | #define CONFIG_SYS_MEMTEST_START	0x10000000 | ||||||
| #define CONFIG_SYS_MEMTEST_END		0x10010000 | #define CONFIG_SYS_MEMTEST_END		0x10010000 | ||||||
| 
 | 
 | ||||||
| #define CONFIG_SYS_LOAD_ADDR		CONFIG_LOADADDR |  | ||||||
| 
 |  | ||||||
| #define CONFIG_CMDLINE_EDITING | #define CONFIG_CMDLINE_EDITING | ||||||
| 
 | 
 | ||||||
| /* Physical Memory Map */ | /* Physical Memory Map */ | ||||||
|  |  | ||||||
|  | @ -76,11 +76,6 @@ | ||||||
| #define CONFIG_CMD_BOOTZ | #define CONFIG_CMD_BOOTZ | ||||||
| #define CONFIG_CMD_SETEXPR | #define CONFIG_CMD_SETEXPR | ||||||
| 
 | 
 | ||||||
| #define CONFIG_BOOTDELAY               1 |  | ||||||
| 
 |  | ||||||
| #define CONFIG_LOADADDR                        0x12000000 |  | ||||||
| #define CONFIG_SYS_TEXT_BASE           0x17800000 |  | ||||||
| 
 |  | ||||||
| #ifdef CONFIG_SUPPORT_EMMC_BOOT | #ifdef CONFIG_SUPPORT_EMMC_BOOT | ||||||
| #define EMMC_ENV \ | #define EMMC_ENV \ | ||||||
| 	"emmcdev=2\0" \ | 	"emmcdev=2\0" \ | ||||||
|  | @ -204,8 +199,6 @@ | ||||||
| #define CONFIG_SYS_MEMTEST_END         0x10010000 | #define CONFIG_SYS_MEMTEST_END         0x10010000 | ||||||
| #define CONFIG_SYS_MEMTEST_SCRATCH     0x10800000 | #define CONFIG_SYS_MEMTEST_SCRATCH     0x10800000 | ||||||
| 
 | 
 | ||||||
| #define CONFIG_SYS_LOAD_ADDR           CONFIG_LOADADDR |  | ||||||
| 
 |  | ||||||
| #define CONFIG_CMDLINE_EDITING | #define CONFIG_CMDLINE_EDITING | ||||||
| #define CONFIG_STACKSIZE               (128 * 1024) | #define CONFIG_STACKSIZE               (128 * 1024) | ||||||
| 
 | 
 | ||||||
|  |  | ||||||
|  | @ -67,11 +67,6 @@ | ||||||
| 
 | 
 | ||||||
| /* Command definition */ | /* Command definition */ | ||||||
| 
 | 
 | ||||||
| #define CONFIG_BOOTDELAY		3 |  | ||||||
| 
 |  | ||||||
| #define CONFIG_LOADADDR			0x82000000 |  | ||||||
| #define CONFIG_SYS_TEXT_BASE		0x87800000 |  | ||||||
| 
 |  | ||||||
| #define CONFIG_EXTRA_ENV_SETTINGS \ | #define CONFIG_EXTRA_ENV_SETTINGS \ | ||||||
| 	"script=boot.scr\0" \ | 	"script=boot.scr\0" \ | ||||||
| 	"image=zImage\0" \ | 	"image=zImage\0" \ | ||||||
|  | @ -158,8 +153,6 @@ | ||||||
| #define CONFIG_SYS_MEMTEST_START	0x80000000 | #define CONFIG_SYS_MEMTEST_START	0x80000000 | ||||||
| #define CONFIG_SYS_MEMTEST_END		(CONFIG_SYS_MEMTEST_START + SZ_512M) | #define CONFIG_SYS_MEMTEST_END		(CONFIG_SYS_MEMTEST_START + SZ_512M) | ||||||
| 
 | 
 | ||||||
| #define CONFIG_SYS_LOAD_ADDR		CONFIG_LOADADDR |  | ||||||
| 
 |  | ||||||
| #define CONFIG_CMDLINE_EDITING | #define CONFIG_CMDLINE_EDITING | ||||||
| #define CONFIG_STACKSIZE		SZ_128K | #define CONFIG_STACKSIZE		SZ_128K | ||||||
| 
 | 
 | ||||||
|  |  | ||||||
|  | @ -33,11 +33,6 @@ | ||||||
| 
 | 
 | ||||||
| /* Command definition */ | /* Command definition */ | ||||||
| 
 | 
 | ||||||
| #define CONFIG_BOOTDELAY		3 |  | ||||||
| 
 |  | ||||||
| #define CONFIG_LOADADDR			0x80800000 |  | ||||||
| #define CONFIG_SYS_TEXT_BASE		0x87800000 |  | ||||||
| 
 |  | ||||||
| #define CONFIG_EXTRA_ENV_SETTINGS \ | #define CONFIG_EXTRA_ENV_SETTINGS \ | ||||||
| 	"script=boot.scr\0" \ | 	"script=boot.scr\0" \ | ||||||
| 	"image=zImage\0" \ | 	"image=zImage\0" \ | ||||||
|  | @ -124,8 +119,6 @@ | ||||||
| #define CONFIG_SYS_MEMTEST_START	0x80000000 | #define CONFIG_SYS_MEMTEST_START	0x80000000 | ||||||
| #define CONFIG_SYS_MEMTEST_END		(CONFIG_SYS_MEMTEST_START + 0x10000) | #define CONFIG_SYS_MEMTEST_END		(CONFIG_SYS_MEMTEST_START + 0x10000) | ||||||
| 
 | 
 | ||||||
| #define CONFIG_SYS_LOAD_ADDR		CONFIG_LOADADDR |  | ||||||
| 
 |  | ||||||
| #define CONFIG_CMDLINE_EDITING | #define CONFIG_CMDLINE_EDITING | ||||||
| #define CONFIG_STACKSIZE		SZ_128K | #define CONFIG_STACKSIZE		SZ_128K | ||||||
| 
 | 
 | ||||||
|  |  | ||||||
|  | @ -146,13 +146,8 @@ | ||||||
| 
 | 
 | ||||||
| /* Command definition */ | /* Command definition */ | ||||||
| 
 | 
 | ||||||
| #define CONFIG_BOOTDELAY	       1 |  | ||||||
| 
 |  | ||||||
| #define CONFIG_PREBOOT                 "" | #define CONFIG_PREBOOT                 "" | ||||||
| 
 | 
 | ||||||
| #define CONFIG_LOADADDR			       0x12000000 |  | ||||||
| #define CONFIG_SYS_TEXT_BASE	       0x17800000 |  | ||||||
| 
 |  | ||||||
| #ifdef CONFIG_CMD_SATA | #ifdef CONFIG_CMD_SATA | ||||||
| #define CONFIG_DRIVE_SATA "sata " | #define CONFIG_DRIVE_SATA "sata " | ||||||
| #else | #else | ||||||
|  | @ -319,8 +314,6 @@ | ||||||
| #define CONFIG_SYS_MEMTEST_END	       0x10010000 | #define CONFIG_SYS_MEMTEST_END	       0x10010000 | ||||||
| #define CONFIG_SYS_MEMTEST_SCRATCH     0x10800000 | #define CONFIG_SYS_MEMTEST_SCRATCH     0x10800000 | ||||||
| 
 | 
 | ||||||
| #define CONFIG_SYS_LOAD_ADDR	       CONFIG_LOADADDR |  | ||||||
| 
 |  | ||||||
| #define CONFIG_CMDLINE_EDITING | #define CONFIG_CMDLINE_EDITING | ||||||
| 
 | 
 | ||||||
| /* Physical Memory Map */ | /* Physical Memory Map */ | ||||||
|  |  | ||||||
|  | @ -77,12 +77,9 @@ | ||||||
| #endif | #endif | ||||||
| 
 | 
 | ||||||
| /* Booting Linux */ | /* Booting Linux */ | ||||||
| #define CONFIG_BOOTDELAY		5 |  | ||||||
| #define CONFIG_BOOTFILE			"fitImage" | #define CONFIG_BOOTFILE			"fitImage" | ||||||
| #define CONFIG_BOOTARGS			"console=ttymxc1,115200 " | #define CONFIG_BOOTARGS			"console=ttymxc1,115200 " | ||||||
| #define CONFIG_BOOTCOMMAND		"run net_nfs" | #define CONFIG_BOOTCOMMAND		"run net_nfs" | ||||||
| #define CONFIG_LOADADDR			0x18000000 |  | ||||||
| #define CONFIG_SYS_LOAD_ADDR		CONFIG_LOADADDR |  | ||||||
| #define CONFIG_HOSTNAME			novena | #define CONFIG_HOSTNAME			novena | ||||||
| 
 | 
 | ||||||
| /* Physical Memory Map */ | /* Physical Memory Map */ | ||||||
|  |  | ||||||
|  | @ -140,13 +140,8 @@ | ||||||
| 
 | 
 | ||||||
| /* Command definition */ | /* Command definition */ | ||||||
| 
 | 
 | ||||||
| #define CONFIG_BOOTDELAY               2 |  | ||||||
| 
 |  | ||||||
| #define CONFIG_PREBOOT                 "" | #define CONFIG_PREBOOT                 "" | ||||||
| 
 | 
 | ||||||
| #define CONFIG_LOADADDR                0x12000000 |  | ||||||
| #define CONFIG_SYS_TEXT_BASE           0x17800000 |  | ||||||
| 
 |  | ||||||
| /* Miscellaneous configurable options */ | /* Miscellaneous configurable options */ | ||||||
| #define CONFIG_SYS_LONGHELP | #define CONFIG_SYS_LONGHELP | ||||||
| #define CONFIG_SYS_HUSH_PARSER | #define CONFIG_SYS_HUSH_PARSER | ||||||
|  | @ -157,8 +152,6 @@ | ||||||
| #define CONFIG_SYS_MAXARGS             16 | #define CONFIG_SYS_MAXARGS             16 | ||||||
| #define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE | #define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE | ||||||
| 
 | 
 | ||||||
| #define CONFIG_SYS_LOAD_ADDR           CONFIG_LOADADDR |  | ||||||
| 
 |  | ||||||
| #define CONFIG_CMDLINE_EDITING | #define CONFIG_CMDLINE_EDITING | ||||||
| 
 | 
 | ||||||
| /* Physical Memory Map */ | /* Physical Memory Map */ | ||||||
|  |  | ||||||
|  | @ -150,14 +150,10 @@ | ||||||
| /* Device tree support */ | /* Device tree support */ | ||||||
| #define CONFIG_OF_LIBFDT | #define CONFIG_OF_LIBFDT | ||||||
| 
 | 
 | ||||||
| #define CONFIG_LOADADDR				0x12000000 |  | ||||||
| #define CONFIG_SYS_TEXT_BASE			0x17800000 |  | ||||||
| 
 |  | ||||||
| #define CONFIG_SYS_MEMTEST_START		PHYS_SDRAM | #define CONFIG_SYS_MEMTEST_START		PHYS_SDRAM | ||||||
| #define CONFIG_SYS_MEMTEST_END			(CONFIG_SYS_MEMTEST_START + \ | #define CONFIG_SYS_MEMTEST_END			(CONFIG_SYS_MEMTEST_START + \ | ||||||
| 						 PHYS_SDRAM_SIZE - (12 << 20)) | 						 PHYS_SDRAM_SIZE - (12 << 20)) | ||||||
| 
 | 
 | ||||||
| #define CONFIG_BOOTDELAY			3 |  | ||||||
| #define CONFIG_BOOTCOMMAND			"run bootubi_scr" | #define CONFIG_BOOTCOMMAND			"run bootubi_scr" | ||||||
| 
 | 
 | ||||||
| /* Miscellaneous configurable options */ | /* Miscellaneous configurable options */ | ||||||
|  | @ -176,8 +172,6 @@ | ||||||
| #define CONFIG_SYS_MAXARGS			16 | #define CONFIG_SYS_MAXARGS			16 | ||||||
| #define CONFIG_SYS_BARGSIZE			CONFIG_SYS_CBSIZE | #define CONFIG_SYS_BARGSIZE			CONFIG_SYS_CBSIZE | ||||||
| 
 | 
 | ||||||
| #define CONFIG_SYS_LOAD_ADDR			CONFIG_LOADADDR |  | ||||||
| 
 |  | ||||||
| /* MTD/UBI/UBIFS config */ | /* MTD/UBI/UBIFS config */ | ||||||
| #define CONFIG_LZO | #define CONFIG_LZO | ||||||
| #define CONFIG_MTD_DEVICE | #define CONFIG_MTD_DEVICE | ||||||
|  |  | ||||||
|  | @ -31,12 +31,8 @@ | ||||||
| #define CONFIG_CMD_BMODE | #define CONFIG_CMD_BMODE | ||||||
| #define CONFIG_CMD_SETEXPR | #define CONFIG_CMD_SETEXPR | ||||||
| 
 | 
 | ||||||
| #define CONFIG_BOOTDELAY		3 |  | ||||||
| 
 |  | ||||||
| #define CONFIG_SYS_MEMTEST_START	0x10000000 | #define CONFIG_SYS_MEMTEST_START	0x10000000 | ||||||
| #define CONFIG_SYS_MEMTEST_END		(CONFIG_SYS_MEMTEST_START + 500 * SZ_1M) | #define CONFIG_SYS_MEMTEST_END		(CONFIG_SYS_MEMTEST_START + 500 * SZ_1M) | ||||||
| #define CONFIG_LOADADDR			0x12000000 |  | ||||||
| #define CONFIG_SYS_TEXT_BASE		0x17800000 |  | ||||||
| 
 | 
 | ||||||
| /* MMC Configuration */ | /* MMC Configuration */ | ||||||
| #define CONFIG_FSL_ESDHC | #define CONFIG_FSL_ESDHC | ||||||
|  | @ -110,7 +106,6 @@ | ||||||
| #define CONFIG_SYS_MAXARGS		16 | #define CONFIG_SYS_MAXARGS		16 | ||||||
| #define CONFIG_SYS_BARGSIZE		CONFIG_SYS_CBSIZE | #define CONFIG_SYS_BARGSIZE		CONFIG_SYS_CBSIZE | ||||||
| 
 | 
 | ||||||
| #define CONFIG_SYS_LOAD_ADDR		CONFIG_LOADADDR |  | ||||||
| #define CONFIG_SYS_HZ			1000 | #define CONFIG_SYS_HZ			1000 | ||||||
| 
 | 
 | ||||||
| #define CONFIG_CMDLINE_EDITING | #define CONFIG_CMDLINE_EDITING | ||||||
|  |  | ||||||
|  | @ -21,7 +21,6 @@ | ||||||
| #define CONFIG_SYS_LONGHELP | #define CONFIG_SYS_LONGHELP | ||||||
| #define CONFIG_SYS_HUSH_PARSER | #define CONFIG_SYS_HUSH_PARSER | ||||||
| #define CONFIG_SYS_PROMPT		"Matrix U-Boot> " | #define CONFIG_SYS_PROMPT		"Matrix U-Boot> " | ||||||
| #define CONFIG_BOOTDELAY		3 |  | ||||||
| #define CONFIG_AUTO_COMPLETE | #define CONFIG_AUTO_COMPLETE | ||||||
| #define CONFIG_CMDLINE_EDITING | #define CONFIG_CMDLINE_EDITING | ||||||
| #define CONFIG_SYS_MAXARGS		16 | #define CONFIG_SYS_MAXARGS		16 | ||||||
|  | @ -45,9 +44,7 @@ | ||||||
| #define CONFIG_SYS_MEMTEST_END \ | #define CONFIG_SYS_MEMTEST_END \ | ||||||
| 	(CONFIG_SYS_MEMTEST_START + 500 * 1024 * 1024) | 	(CONFIG_SYS_MEMTEST_START + 500 * 1024 * 1024) | ||||||
| 
 | 
 | ||||||
| #define CONFIG_SYS_TEXT_BASE		0x80000000 |  | ||||||
| #define CONFIG_SYS_BOOTMAPSZ		0x6C000000 | #define CONFIG_SYS_BOOTMAPSZ		0x6C000000 | ||||||
| #define CONFIG_SYS_LOAD_ADDR		0x10800000 |  | ||||||
| 
 | 
 | ||||||
| /* Serial console */ | /* Serial console */ | ||||||
| #define CONFIG_MXC_UART | #define CONFIG_MXC_UART | ||||||
|  |  | ||||||
|  | @ -83,11 +83,6 @@ | ||||||
| 
 | 
 | ||||||
| /* Command definition */ | /* Command definition */ | ||||||
| 
 | 
 | ||||||
| #define CONFIG_BOOTDELAY		3 |  | ||||||
| 
 |  | ||||||
| #define CONFIG_LOADADDR			0x12000000 |  | ||||||
| #define CONFIG_SYS_TEXT_BASE		0x17800000 |  | ||||||
| 
 |  | ||||||
| #define CONFIG_SYS_MEMTEST_START	0x10000000 | #define CONFIG_SYS_MEMTEST_START	0x10000000 | ||||||
| #define CONFIG_SYS_MEMTEST_END		(CONFIG_SYS_MEMTEST_START + (500 << 20)) | #define CONFIG_SYS_MEMTEST_END		(CONFIG_SYS_MEMTEST_START + (500 << 20)) | ||||||
| 
 | 
 | ||||||
|  | @ -181,8 +176,6 @@ | ||||||
| #define CONFIG_SYS_MAXARGS		16 | #define CONFIG_SYS_MAXARGS		16 | ||||||
| #define CONFIG_SYS_BARGSIZE		CONFIG_SYS_CBSIZE | #define CONFIG_SYS_BARGSIZE		CONFIG_SYS_CBSIZE | ||||||
| 
 | 
 | ||||||
| #define CONFIG_SYS_LOAD_ADDR		CONFIG_LOADADDR |  | ||||||
| 
 |  | ||||||
| /* Physical Memory Map */ | /* Physical Memory Map */ | ||||||
| #define CONFIG_NR_DRAM_BANKS		1 | #define CONFIG_NR_DRAM_BANKS		1 | ||||||
| #define PHYS_SDRAM			MMDC0_ARB_BASE_ADDR | #define PHYS_SDRAM			MMDC0_ARB_BASE_ADDR | ||||||
|  |  | ||||||
|  | @ -138,10 +138,6 @@ | ||||||
| #define CONFIG_CMD_ITEST | #define CONFIG_CMD_ITEST | ||||||
| #define CONFIG_CMD_SETEXPR | #define CONFIG_CMD_SETEXPR | ||||||
| 
 | 
 | ||||||
| #define CONFIG_BOOTDELAY		3 |  | ||||||
| 
 |  | ||||||
| #define CONFIG_LOADADDR			0x12000000 |  | ||||||
| 
 |  | ||||||
| /* place code in last 4 MiB of RAM */ | /* place code in last 4 MiB of RAM */ | ||||||
| #if defined(CONFIG_MX6DL) || defined(CONFIG_MX6S) | #if defined(CONFIG_MX6DL) || defined(CONFIG_MX6S) | ||||||
| #define CONFIG_SYS_TEXT_BASE		0x2fc00000 | #define CONFIG_SYS_TEXT_BASE		0x2fc00000 | ||||||
|  | @ -407,8 +403,6 @@ | ||||||
| #define CONFIG_SYS_MAXARGS		16 | #define CONFIG_SYS_MAXARGS		16 | ||||||
| #define CONFIG_SYS_BARGSIZE		CONFIG_SYS_CBSIZE | #define CONFIG_SYS_BARGSIZE		CONFIG_SYS_CBSIZE | ||||||
| 
 | 
 | ||||||
| #define CONFIG_SYS_LOAD_ADDR		CONFIG_LOADADDR |  | ||||||
| 
 |  | ||||||
| #define CONFIG_CMDLINE_EDITING | #define CONFIG_CMDLINE_EDITING | ||||||
| #define CONFIG_STACKSIZE		(128u * SZ_1K) | #define CONFIG_STACKSIZE		(128u * SZ_1K) | ||||||
| 
 | 
 | ||||||
|  |  | ||||||
|  | @ -60,12 +60,8 @@ | ||||||
| #define CONFIG_CMD_BMODE | #define CONFIG_CMD_BMODE | ||||||
| #define CONFIG_CMD_SETEXPR | #define CONFIG_CMD_SETEXPR | ||||||
| 
 | 
 | ||||||
| #define CONFIG_BOOTDELAY		3 |  | ||||||
| 
 |  | ||||||
| #define CONFIG_SYS_MEMTEST_START	0x10000000 | #define CONFIG_SYS_MEMTEST_START	0x10000000 | ||||||
| #define CONFIG_SYS_MEMTEST_END		(CONFIG_SYS_MEMTEST_START + 500 * SZ_1M) | #define CONFIG_SYS_MEMTEST_END		(CONFIG_SYS_MEMTEST_START + 500 * SZ_1M) | ||||||
| #define CONFIG_LOADADDR			0x12000000 |  | ||||||
| #define CONFIG_SYS_TEXT_BASE		0x17800000 |  | ||||||
| 
 | 
 | ||||||
| /* MMC Configuration */ | /* MMC Configuration */ | ||||||
| #define CONFIG_FSL_ESDHC | #define CONFIG_FSL_ESDHC | ||||||
|  | @ -181,8 +177,6 @@ | ||||||
| #define CONFIG_SYS_MAXARGS	       16 | #define CONFIG_SYS_MAXARGS	       16 | ||||||
| #define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE | #define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE | ||||||
| 
 | 
 | ||||||
| #define CONFIG_SYS_LOAD_ADDR		CONFIG_LOADADDR |  | ||||||
| 
 |  | ||||||
| #define CONFIG_CMDLINE_EDITING | #define CONFIG_CMDLINE_EDITING | ||||||
| 
 | 
 | ||||||
| /* Physical Memory Map */ | /* Physical Memory Map */ | ||||||
|  |  | ||||||
|  | @ -37,12 +37,8 @@ | ||||||
| #define CONFIG_CMD_BMODE | #define CONFIG_CMD_BMODE | ||||||
| #define CONFIG_CMD_SETEXPR | #define CONFIG_CMD_SETEXPR | ||||||
| 
 | 
 | ||||||
| #define CONFIG_BOOTDELAY		5 |  | ||||||
| 
 |  | ||||||
| #define CONFIG_SYS_MEMTEST_START	0x10000000 | #define CONFIG_SYS_MEMTEST_START	0x10000000 | ||||||
| #define CONFIG_SYS_MEMTEST_END		(CONFIG_SYS_MEMTEST_START + 500 * SZ_1M) | #define CONFIG_SYS_MEMTEST_END		(CONFIG_SYS_MEMTEST_START + 500 * SZ_1M) | ||||||
| #define CONFIG_LOADADDR			0x12000000 |  | ||||||
| #define CONFIG_SYS_TEXT_BASE		0x17800000 |  | ||||||
| 
 | 
 | ||||||
| /* I2C Configs */ | /* I2C Configs */ | ||||||
| #define CONFIG_CMD_I2C | #define CONFIG_CMD_I2C | ||||||
|  | @ -242,8 +238,6 @@ | ||||||
| #define CONFIG_SYS_MAXARGS	       16 | #define CONFIG_SYS_MAXARGS	       16 | ||||||
| #define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE | #define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE | ||||||
| 
 | 
 | ||||||
| #define CONFIG_SYS_LOAD_ADDR		CONFIG_LOADADDR |  | ||||||
| 
 |  | ||||||
| #define CONFIG_CMDLINE_EDITING | #define CONFIG_CMDLINE_EDITING | ||||||
| 
 | 
 | ||||||
| /* Physical Memory Map */ | /* Physical Memory Map */ | ||||||
|  |  | ||||||
|  | @ -50,11 +50,6 @@ | ||||||
| #undef CONFIG_CMD_NET | #undef CONFIG_CMD_NET | ||||||
| #undef CONFIG_CMD_NFS | #undef CONFIG_CMD_NFS | ||||||
| 
 | 
 | ||||||
| #define CONFIG_BOOTDELAY		3 |  | ||||||
| 
 |  | ||||||
| #define CONFIG_LOADADDR			0x82000000 |  | ||||||
| #define CONFIG_SYS_TEXT_BASE		0x87800000 |  | ||||||
| 
 |  | ||||||
| /* Miscellaneous configurable options */ | /* Miscellaneous configurable options */ | ||||||
| #define CONFIG_SYS_LONGHELP | #define CONFIG_SYS_LONGHELP | ||||||
| #define CONFIG_SYS_HUSH_PARSER | #define CONFIG_SYS_HUSH_PARSER | ||||||
|  | @ -71,8 +66,6 @@ | ||||||
| #define CONFIG_SYS_MEMTEST_START	0x80000000 | #define CONFIG_SYS_MEMTEST_START	0x80000000 | ||||||
| #define CONFIG_SYS_MEMTEST_END		(CONFIG_SYS_MEMTEST_START + SZ_256M) | #define CONFIG_SYS_MEMTEST_END		(CONFIG_SYS_MEMTEST_START + SZ_256M) | ||||||
| 
 | 
 | ||||||
| #define CONFIG_SYS_LOAD_ADDR		CONFIG_LOADADDR |  | ||||||
| 
 |  | ||||||
| #define CONFIG_CMDLINE_EDITING | #define CONFIG_CMDLINE_EDITING | ||||||
| #define CONFIG_STACKSIZE		SZ_128K | #define CONFIG_STACKSIZE		SZ_128K | ||||||
| 
 | 
 | ||||||
|  |  | ||||||
		Loading…
	
		Reference in New Issue