mirror of
				https://source.denx.de/u-boot/u-boot.git
				synced 2025-11-04 02:11:25 +01:00 
			
		
		
		
	arm: mvebu: spl: Remove checks for BOOT_DEVICE_MMC2 and BOOT_DEVICE_MMC2_2
BOOT_DEVICE_MMC2 and BOOT_DEVICE_MMC2_2 are representing mmc dev 1 but all
Armada SoCs have only one mmc controller. So remove references to
non-existent second mmc controller.
Fixes: f830703f4284 ("arm: mvebu: Check that kwbimage blockid matches boot mode")
Signed-off-by: Pali Rohár <pali@kernel.org>
			
			
This commit is contained in:
		
							parent
							
								
									a2cd076b7f
								
							
						
					
					
						commit
						8b49e63e09
					
				@ -169,9 +169,7 @@ int spl_parse_board_header(struct spl_image_info *spl_image,
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	if (IS_ENABLED(CONFIG_SPL_MMC) &&
 | 
			
		||||
	    (bootdev->boot_device == BOOT_DEVICE_MMC1 ||
 | 
			
		||||
	     bootdev->boot_device == BOOT_DEVICE_MMC2 ||
 | 
			
		||||
	     bootdev->boot_device == BOOT_DEVICE_MMC2_2) &&
 | 
			
		||||
	    (bootdev->boot_device == BOOT_DEVICE_MMC1) &&
 | 
			
		||||
	    mhdr->blockid != IBR_HDR_SDIO_ID) {
 | 
			
		||||
		printf("ERROR: Wrong blockid (0x%x) in SDIO kwbimage\n",
 | 
			
		||||
		       mhdr->blockid);
 | 
			
		||||
 | 
			
		||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user