mirror of
				https://review.coreboot.org/flashrom.git
				synced 2025-11-04 07:00:39 +01:00 
			
		
		
		
	jedec.c: Collapse erase_sector_jedec() indirection
Change-Id: I9cc9e8c88c0442dc2602bbb2de2073113e9c484b Signed-off-by: Edward O'Callaghan <quasisec@google.com> Reviewed-on: https://review.coreboot.org/c/flashrom/+/72500 Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org> Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
This commit is contained in:
		
				
					committed by
					
						
						Edward O'Callaghan
					
				
			
			
				
	
			
			
			
						parent
						
							d01e694a22
						
					
				
				
					commit
					8fd4aeb8ec
				
			
							
								
								
									
										11
									
								
								jedec.c
									
									
									
									
									
								
							
							
						
						
									
										11
									
								
								jedec.c
									
									
									
									
									
								
							@@ -281,11 +281,11 @@ static int probe_jedec_common(struct flashctx *flash, unsigned int mask)
 | 
			
		||||
	return 1;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
static int erase_sector_jedec_common(struct flashctx *flash, unsigned int page,
 | 
			
		||||
				     unsigned int pagesize, unsigned int mask)
 | 
			
		||||
int erase_sector_jedec(struct flashctx *flash, unsigned int page, unsigned int size)
 | 
			
		||||
{
 | 
			
		||||
	chipaddr bios = flash->virtual_memory;
 | 
			
		||||
	bool shifted = (flash->chip->feature_bits & FEATURE_ADDR_SHIFTED);
 | 
			
		||||
	const unsigned int mask = getaddrmask(flash->chip);
 | 
			
		||||
	unsigned int delay_us = 0;
 | 
			
		||||
 | 
			
		||||
	if(flash->chip->probe_timing != TIMING_ZERO)
 | 
			
		||||
@@ -529,13 +529,6 @@ int probe_jedec(struct flashctx *flash)
 | 
			
		||||
	return probe_jedec_common(flash, mask);
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
int erase_sector_jedec(struct flashctx *flash, unsigned int page,
 | 
			
		||||
		       unsigned int size)
 | 
			
		||||
{
 | 
			
		||||
	const unsigned int mask = getaddrmask(flash->chip);
 | 
			
		||||
	return erase_sector_jedec_common(flash, page, size, mask);
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
int erase_block_jedec(struct flashctx *flash, unsigned int page,
 | 
			
		||||
		      unsigned int size)
 | 
			
		||||
{
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user