mirrors/u-boot
1
0
Fork 0
mirror of https://source.denx.de/u-boot/u-boot.git synced 2025-08-20 22:21:27 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

arm: mvebu: spl: Remove checks for BOOT_DEVICE_MMC2 and BOOT_DEVICE_MMC2_2

Browse Source 
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:
Pali Rohár 2023-01-08 13:27:07 +01:00 committed by Stefan Roese
parent a2cd076b7f
commit 8b49e63e09
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arch/arm/mach-mvebu/spl.c
View File

@ -169,9 +169,7 @@ int spl_parse_board_header(struct spl_image_info *spl_image,
} }
if (IS_ENABLED(CONFIG_SPL_MMC) && if (IS_ENABLED(CONFIG_SPL_MMC) &&
(bootdev->boot_device == BOOT_DEVICE_MMC1 || (bootdev->boot_device == BOOT_DEVICE_MMC1) &&
bootdev->boot_device == BOOT_DEVICE_MMC2 ||
bootdev->boot_device == BOOT_DEVICE_MMC2_2) &&
mhdr->blockid != IBR_HDR_SDIO_ID) { mhdr->blockid != IBR_HDR_SDIO_ID) {
printf("ERROR: Wrong blockid (0x%x) in SDIO kwbimage\n", printf("ERROR: Wrong blockid (0x%x) in SDIO kwbimage\n",
mhdr->blockid); mhdr->blockid);