mirror of
				https://github.com/smaeul/u-boot.git
				synced 2025-11-03 21:48:15 +00:00 
			
		
		
		
	env: common: Drop env_get_char_memory()
This function is the same as env_get_char_spec() apart from dropping the brackets. Drop the brackets from env_get_char_spec() and use that instead of env_get_char_memory(). Signed-off-by: Simon Glass <sjg@chromium.org> Reviewed-by: Tom Rini <trini@konsulko.com>
This commit is contained in:
		
							parent
							
								
									81a4dea228
								
							
						
					
					
						commit
						75de597d2d
					
				
							
								
								
									
										7
									
								
								env/common.c
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										7
									
								
								env/common.c
									
									
									
									
										vendored
									
									
								
							@ -28,11 +28,6 @@ struct hsearch_data env_htab = {
 | 
				
			|||||||
};
 | 
					};
 | 
				
			||||||
 | 
					
 | 
				
			||||||
__weak uchar env_get_char_spec(int index)
 | 
					__weak uchar env_get_char_spec(int index)
 | 
				
			||||||
{
 | 
					 | 
				
			||||||
	return *((uchar *)(gd->env_addr + index));
 | 
					 | 
				
			||||||
}
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
static uchar env_get_char_memory(int index)
 | 
					 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
	return *(uchar *)(gd->env_addr + index);
 | 
						return *(uchar *)(gd->env_addr + index);
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
@ -42,8 +37,6 @@ uchar env_get_char(int index)
 | 
				
			|||||||
	/* if env is not set up, or crc was bad, use the default environment */
 | 
						/* if env is not set up, or crc was bad, use the default environment */
 | 
				
			||||||
	if (!gd->env_valid)
 | 
						if (!gd->env_valid)
 | 
				
			||||||
		return default_environment[index];
 | 
							return default_environment[index];
 | 
				
			||||||
	else if (gd->flags & GD_FLG_RELOC)  /* if relocated to RAM */
 | 
					 | 
				
			||||||
		return env_get_char_memory(index);
 | 
					 | 
				
			||||||
	else
 | 
						else
 | 
				
			||||||
		return env_get_char_spec(index);
 | 
							return env_get_char_spec(index);
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user