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>

diff --git a/arch/arm/mach-mvebu/spl.c b/arch/arm/mach-mvebu/spl.c
index 6a398612628ee1f60c1efd5b21bec774e0b3bcd3..e14c7a9c6cf2a48becba2dcb99458d5d6324781b 100644 (file)
--- a/arch/arm/mach-mvebu/spl.c
+++ b/arch/arm/mach-mvebu/spl.c
@@ -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);