ARM: uniphier: use $loadaddr for source command
If the "source" command is not given the address, it uses CONFIG_SYS_LOAD_ADDR, which is compile-time determined. Using the "loadaddr" environment variable is handier because it is relocated according to the memory base when CONFIG_POSITION_INDEPENDENT is enabled. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
This commit is contained in:
		
							parent
							
								
									6da69d33f5
								
							
						
					
					
						commit
						76cd7d47fb
					
				| 
						 | 
					@ -169,17 +169,17 @@
 | 
				
			||||||
		"ubi part UBI && " \
 | 
							"ubi part UBI && " \
 | 
				
			||||||
		"ubifsmount ubi0:boot && " \
 | 
							"ubifsmount ubi0:boot && " \
 | 
				
			||||||
		"ubifsload ${loadaddr} ${script} && " \
 | 
							"ubifsload ${loadaddr} ${script} && " \
 | 
				
			||||||
		"source\0" \
 | 
							"source $loadaddr\0" \
 | 
				
			||||||
	"norscript=echo Running ${script} from tftp ... && " \
 | 
						"norscript=echo Running ${script} from tftp ... && " \
 | 
				
			||||||
		"tftpboot ${script} &&" \
 | 
							"tftpboot ${script} &&" \
 | 
				
			||||||
		"source\0" \
 | 
							"source $loadaddr\0" \
 | 
				
			||||||
	"usbscript=usb start && " \
 | 
						"usbscript=usb start && " \
 | 
				
			||||||
		"setenv devtype usb && " \
 | 
							"setenv devtype usb && " \
 | 
				
			||||||
		"setenv devnum 0 && " \
 | 
							"setenv devnum 0 && " \
 | 
				
			||||||
		"run loadscript_fat\0" \
 | 
							"run loadscript_fat\0" \
 | 
				
			||||||
	"loadscript_fat=echo Running ${script} from ${devtype}${devnum} ... && " \
 | 
						"loadscript_fat=echo Running ${script} from ${devtype}${devnum} ... && " \
 | 
				
			||||||
		"load ${devtype} ${devnum}:1 ${loadaddr} ${script} && " \
 | 
							"load ${devtype} ${devnum}:1 ${loadaddr} ${script} && " \
 | 
				
			||||||
		"source\0" \
 | 
							"source $loadaddr\0" \
 | 
				
			||||||
	"sramupdate=setexpr tmp_addr $nor_base + 0x50000 &&"	\
 | 
						"sramupdate=setexpr tmp_addr $nor_base + 0x50000 &&"	\
 | 
				
			||||||
		"tftpboot $tmp_addr $second_image && " \
 | 
							"tftpboot $tmp_addr $second_image && " \
 | 
				
			||||||
		"setexpr tmp_addr $nor_base + 0x70000 && " \
 | 
							"setexpr tmp_addr $nor_base + 0x70000 && " \
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in New Issue