katmai: fix section overlap problem
Since we didn't want to remove features from the configuration, we decided to increase the U-Boot image size (add one flash sector). Also changed the default environment definition to make it independent of such changes. Signed-off-by: Wolfgang Denk <wd@denx.de> Acked-by: Stefan Roese <sr@denx.de>
This commit is contained in:
		
							parent
							
								
									03c6cd39f9
								
							
						
					
					
						commit
						941d696d25
					
				| 
						 | 
					@ -25,7 +25,7 @@
 | 
				
			||||||
# AMCC 440SPe Evaluation (Katmai) board
 | 
					# AMCC 440SPe Evaluation (Katmai) board
 | 
				
			||||||
#
 | 
					#
 | 
				
			||||||
 | 
					
 | 
				
			||||||
TEXT_BASE = 0xfffc0000
 | 
					TEXT_BASE = 0xFFFA0000
 | 
				
			||||||
 | 
					
 | 
				
			||||||
PLATFORM_CPPFLAGS += -DCONFIG_440=1
 | 
					PLATFORM_CPPFLAGS += -DCONFIG_440=1
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -178,6 +178,9 @@
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#undef	CONFIG_BOOTARGS
 | 
					#undef	CONFIG_BOOTARGS
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					#define xstr(s) str(s)
 | 
				
			||||||
 | 
					#define str(s) #s
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#define	CONFIG_EXTRA_ENV_SETTINGS					\
 | 
					#define	CONFIG_EXTRA_ENV_SETTINGS					\
 | 
				
			||||||
	"netdev=eth0\0"							\
 | 
						"netdev=eth0\0"							\
 | 
				
			||||||
	"hostname=katmai\0"						\
 | 
						"hostname=katmai\0"						\
 | 
				
			||||||
| 
						 | 
					@ -206,8 +209,9 @@
 | 
				
			||||||
	"ramdisk_addr=fff20000\0"					\
 | 
						"ramdisk_addr=fff20000\0"					\
 | 
				
			||||||
	"initrd_high=30000000\0"					\
 | 
						"initrd_high=30000000\0"					\
 | 
				
			||||||
	"load=tftp 200000 katmai/u-boot.bin\0"				\
 | 
						"load=tftp 200000 katmai/u-boot.bin\0"				\
 | 
				
			||||||
	"update=protect off fffc0000 ffffffff;era fffc0000 ffffffff;"	\
 | 
						"update=protect off " xstr(CFG_MONITOR_BASE) " FFFFFFFF;"	\
 | 
				
			||||||
		"cp.b ${fileaddr} fffc0000 ${filesize};"		\
 | 
							"era " xstr(CFG_MONITOR_BASE) " FFFFFFFF;"		\
 | 
				
			||||||
 | 
							"cp.b ${fileaddr} " xstr(CFG_MONITOR_BASE) " ${filesize};" \
 | 
				
			||||||
		"setenv filesize;saveenv\0"				\
 | 
							"setenv filesize;saveenv\0"				\
 | 
				
			||||||
	"upd=run load update\0"						\
 | 
						"upd=run load update\0"						\
 | 
				
			||||||
	"kozio=bootm ffc60000\0"					\
 | 
						"kozio=bootm ffc60000\0"					\
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in New Issue