mirror of
				https://source.denx.de/u-boot/u-boot.git
				synced 2025-11-04 10:21:25 +01:00 
			
		
		
		
	mpc83xx: bump loadaddr over fdtaddr to 0x500000
this seems as a good compromise between human memory, typing, and last but not least, to accommodate for current and future kernel bloat. Signed-off-by: Kim Phillips <kim.phillips@freescale.com> Acked-by: Dave Liu <daveliu@freescale.com>
This commit is contained in:
		
							parent
							
								
									be5a719026
								
							
						
					
					
						commit
						b211575740
					
				@ -543,7 +543,7 @@
 | 
				
			|||||||
#define CONFIG_UBOOTPATH	u-boot.bin	/* U-Boot image on TFTP server */
 | 
					#define CONFIG_UBOOTPATH	u-boot.bin	/* U-Boot image on TFTP server */
 | 
				
			||||||
#define CONFIG_FDTFILE		mpc8313erdb.dtb
 | 
					#define CONFIG_FDTFILE		mpc8313erdb.dtb
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#define CONFIG_LOADADDR		200000	/* default location for tftp and bootm */
 | 
					#define CONFIG_LOADADDR		500000	/* default location for tftp and bootm */
 | 
				
			||||||
#define CONFIG_BOOTDELAY	-1	/* -1 disables auto-boot */
 | 
					#define CONFIG_BOOTDELAY	-1	/* -1 disables auto-boot */
 | 
				
			||||||
#define CONFIG_BAUDRATE		115200
 | 
					#define CONFIG_BAUDRATE		115200
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
				
			|||||||
@ -531,7 +531,7 @@
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
#define CONFIG_BAUDRATE 115200
 | 
					#define CONFIG_BAUDRATE 115200
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#define CONFIG_LOADADDR 200000	/* default location for tftp and bootm */
 | 
					#define CONFIG_LOADADDR 500000	/* default location for tftp and bootm */
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#define CONFIG_BOOTDELAY 6	/* -1 disables auto-boot */
 | 
					#define CONFIG_BOOTDELAY 6	/* -1 disables auto-boot */
 | 
				
			||||||
#undef CONFIG_BOOTARGS		/* the boot command will set bootargs */
 | 
					#undef CONFIG_BOOTARGS		/* the boot command will set bootargs */
 | 
				
			||||||
 | 
				
			|||||||
@ -568,7 +568,7 @@
 | 
				
			|||||||
#define CONFIG_UBOOTPATH	u-boot.bin	/* U-Boot image on TFTP server */
 | 
					#define CONFIG_UBOOTPATH	u-boot.bin	/* U-Boot image on TFTP server */
 | 
				
			||||||
#define CONFIG_FDTFILE		mpc832x_rdb.dtb
 | 
					#define CONFIG_FDTFILE		mpc832x_rdb.dtb
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#define CONFIG_LOADADDR		200000	/* default location for tftp and bootm */
 | 
					#define CONFIG_LOADADDR		500000	/* default location for tftp and bootm */
 | 
				
			||||||
#define CONFIG_BOOTDELAY	-1	/* -1 disables auto-boot */
 | 
					#define CONFIG_BOOTDELAY	-1	/* -1 disables auto-boot */
 | 
				
			||||||
#define CONFIG_BAUDRATE		115200
 | 
					#define CONFIG_BAUDRATE		115200
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
				
			|||||||
@ -572,7 +572,7 @@
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
#define CONFIG_BAUDRATE	115200
 | 
					#define CONFIG_BAUDRATE	115200
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#define CONFIG_LOADADDR	200000	/* default location for tftp and bootm */
 | 
					#define CONFIG_LOADADDR	500000	/* default location for tftp and bootm */
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#define CONFIG_BOOTDELAY 6 	/* -1 disables auto-boot */
 | 
					#define CONFIG_BOOTDELAY 6 	/* -1 disables auto-boot */
 | 
				
			||||||
#undef  CONFIG_BOOTARGS		/* the boot command will set bootargs */
 | 
					#undef  CONFIG_BOOTARGS		/* the boot command will set bootargs */
 | 
				
			||||||
 | 
				
			|||||||
@ -709,7 +709,7 @@
 | 
				
			|||||||
#define CONFIG_GATEWAYIP	192.168.1.1
 | 
					#define CONFIG_GATEWAYIP	192.168.1.1
 | 
				
			||||||
#define CONFIG_NETMASK		255.255.255.0
 | 
					#define CONFIG_NETMASK		255.255.255.0
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#define CONFIG_LOADADDR		200000	/* default location for tftp and bootm */
 | 
					#define CONFIG_LOADADDR		500000	/* default location for tftp and bootm */
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#define CONFIG_BOOTDELAY	6	/* -1 disables auto-boot */
 | 
					#define CONFIG_BOOTDELAY	6	/* -1 disables auto-boot */
 | 
				
			||||||
#undef  CONFIG_BOOTARGS			/* the boot command will set bootargs */
 | 
					#undef  CONFIG_BOOTARGS			/* the boot command will set bootargs */
 | 
				
			||||||
 | 
				
			|||||||
@ -474,7 +474,7 @@ boards, we say we have two, but don't display a message if we find only one. */
 | 
				
			|||||||
#define CFG_PROMPT_HUSH_PS2 "> "
 | 
					#define CFG_PROMPT_HUSH_PS2 "> "
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#define CFG_LOAD_ADDR	0x2000000	/* default load address */
 | 
					#define CFG_LOAD_ADDR	0x2000000	/* default load address */
 | 
				
			||||||
#define CONFIG_LOADADDR	200000	/* default location for tftp and bootm */
 | 
					#define CONFIG_LOADADDR	500000	/* default location for tftp and bootm */
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#ifdef CONFIG_MPC8349ITX
 | 
					#ifdef CONFIG_MPC8349ITX
 | 
				
			||||||
#define CFG_PROMPT	"MPC8349E-mITX> "	/* Monitor Command Prompt */
 | 
					#define CFG_PROMPT	"MPC8349E-mITX> "	/* Monitor Command Prompt */
 | 
				
			||||||
 | 
				
			|||||||
@ -605,7 +605,7 @@
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
#define CONFIG_BAUDRATE 115200
 | 
					#define CONFIG_BAUDRATE 115200
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#define CONFIG_LOADADDR 200000	/* default location for tftp and bootm */
 | 
					#define CONFIG_LOADADDR 500000	/* default location for tftp and bootm */
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#define CONFIG_BOOTDELAY 6	/* -1 disables auto-boot */
 | 
					#define CONFIG_BOOTDELAY 6	/* -1 disables auto-boot */
 | 
				
			||||||
#undef	CONFIG_BOOTARGS		/* the boot command will set bootargs */
 | 
					#undef	CONFIG_BOOTARGS		/* the boot command will set bootargs */
 | 
				
			||||||
 | 
				
			|||||||
@ -595,7 +595,7 @@
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
#define CONFIG_BAUDRATE 115200
 | 
					#define CONFIG_BAUDRATE 115200
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#define CONFIG_LOADADDR 200000	/* default location for tftp and bootm */
 | 
					#define CONFIG_LOADADDR 500000	/* default location for tftp and bootm */
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#define CONFIG_BOOTDELAY 6	/* -1 disables auto-boot */
 | 
					#define CONFIG_BOOTDELAY 6	/* -1 disables auto-boot */
 | 
				
			||||||
#undef CONFIG_BOOTARGS		/* the boot command will set bootargs */
 | 
					#undef CONFIG_BOOTARGS		/* the boot command will set bootargs */
 | 
				
			||||||
 | 
				
			|||||||
@ -629,7 +629,7 @@
 | 
				
			|||||||
#define CONFIG_UBOOTPATH	u-boot.bin	/* U-Boot image on TFTP server */
 | 
					#define CONFIG_UBOOTPATH	u-boot.bin	/* U-Boot image on TFTP server */
 | 
				
			||||||
#define CONFIG_FDTFILE		mpc8379_rdb.dtb
 | 
					#define CONFIG_FDTFILE		mpc8379_rdb.dtb
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#define CONFIG_LOADADDR		200000	/* default location for tftp and bootm */
 | 
					#define CONFIG_LOADADDR		500000	/* default location for tftp and bootm */
 | 
				
			||||||
#define CONFIG_BOOTDELAY	-1	/* -1 disables auto-boot */
 | 
					#define CONFIG_BOOTDELAY	-1	/* -1 disables auto-boot */
 | 
				
			||||||
#define CONFIG_BAUDRATE		115200
 | 
					#define CONFIG_BAUDRATE		115200
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
				
			|||||||
@ -662,7 +662,7 @@
 | 
				
			|||||||
#define CONFIG_GATEWAYIP	192.168.1.1
 | 
					#define CONFIG_GATEWAYIP	192.168.1.1
 | 
				
			||||||
#define CONFIG_NETMASK		255.255.255.0
 | 
					#define CONFIG_NETMASK		255.255.255.0
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#define CONFIG_LOADADDR		200000	/* default location for tftp and bootm */
 | 
					#define CONFIG_LOADADDR		500000	/* default location for tftp and bootm */
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#define CONFIG_BOOTDELAY	6	/* -1 disables auto-boot */
 | 
					#define CONFIG_BOOTDELAY	6	/* -1 disables auto-boot */
 | 
				
			||||||
#undef  CONFIG_BOOTARGS			/* the boot command will set bootargs */
 | 
					#undef  CONFIG_BOOTARGS			/* the boot command will set bootargs */
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user