mirror of
				https://github.com/smaeul/u-boot.git
				synced 2025-11-03 21:48:15 +00:00 
			
		
		
		
	Move test for unnecessary memmove to memmove_wd()
Signed-off-by: Larry Johnson <lrj@acm.org>
This commit is contained in:
		
							parent
							
								
									b050c72d52
								
							
						
					
					
						commit
						54fa2c5b51
					
				@ -344,11 +344,8 @@ static int bootm_load_os(image_info_t os, ulong *load_end, int boot_progress)
 | 
			
		||||
			printf ("   XIP %s ... ", type_name);
 | 
			
		||||
		} else {
 | 
			
		||||
			printf ("   Loading %s ... ", type_name);
 | 
			
		||||
 | 
			
		||||
			if (load != image_start) {
 | 
			
		||||
				memmove_wd ((void *)load,
 | 
			
		||||
						(void *)image_start, image_len, CHUNKSZ);
 | 
			
		||||
			}
 | 
			
		||||
			memmove_wd ((void *)load, (void *)image_start,
 | 
			
		||||
					image_len, CHUNKSZ);
 | 
			
		||||
		}
 | 
			
		||||
		*load_end = load + image_len;
 | 
			
		||||
		puts("OK\n");
 | 
			
		||||
 | 
			
		||||
@ -450,6 +450,9 @@ phys_size_t getenv_bootm_size(void)
 | 
			
		||||
 | 
			
		||||
void memmove_wd (void *to, void *from, size_t len, ulong chunksz)
 | 
			
		||||
{
 | 
			
		||||
	if (to == from)
 | 
			
		||||
		return;
 | 
			
		||||
 | 
			
		||||
#if defined(CONFIG_HW_WATCHDOG) || defined(CONFIG_WATCHDOG)
 | 
			
		||||
	while (len > 0) {
 | 
			
		||||
		size_t tail = (len > chunksz) ? chunksz : len;
 | 
			
		||||
 | 
			
		||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user