arm: mvebu: Check that kwbimage blockid matches boot mode

Each boot mode has its own kwbimage specified by blockid. So check that
kwbimage is valid by blockid.

Signed-off-by: Pali Rohár <pali@kernel.org>
Signed-off-by: Marek Behún <marek.behun@nic.cz>
Reviewed-by: Stefan Roese <sr@denx.de>

diff --git a/arch/arm/mach-mvebu/spl.c b/arch/arm/mach-mvebu/spl.c
index fe22951e16c083f1197430c6a08ae26fcb1e205b..62e4fe12d65c2cc77d833843d149f401a2ae03b0 100644 (file)
--- a/arch/arm/mach-mvebu/spl.c
+++ b/arch/arm/mach-mvebu/spl.c
@@ -117,22 +117,39 @@ int spl_parse_board_header(struct spl_image_info *spl_image,
         * (including SPL content) which is not included in U-Boot image_header.
         */
        if (mhdr->version != 1 ||
-           ((mhdr->headersz_msb << 16) | mhdr->headersz_lsb) < sizeof(*mhdr) ||
-           (
+           ((mhdr->headersz_msb << 16) | mhdr->headersz_lsb) < sizeof(*mhdr)) {
+               printf("ERROR: Invalid kwbimage v1\n");
+               return -EINVAL;
+       }
+
 #ifdef CONFIG_SPL_SPI_FLASH_SUPPORT
-            mhdr->blockid != IBR_HDR_SPI_ID &&
+       if (bootdev->boot_device == BOOT_DEVICE_SPI &&
+           mhdr->blockid != IBR_HDR_SPI_ID) {
+               printf("ERROR: Wrong blockid (0x%x) in SPI kwbimage\n",
+                      mhdr->blockid);
+               return -EINVAL;
+       }
 #endif
+
 #ifdef CONFIG_SPL_SATA
-            mhdr->blockid != IBR_HDR_SATA_ID &&
+       if (bootdev->boot_device == BOOT_DEVICE_SATA &&
+           mhdr->blockid != IBR_HDR_SATA_ID) {
+               printf("ERROR: Wrong blockid (0x%x) in SATA kwbimage\n",
+                      mhdr->blockid);
+               return -EINVAL;
+       }
 #endif
+
 #ifdef CONFIG_SPL_MMC
-            mhdr->blockid != IBR_HDR_SDIO_ID &&
-#endif
-            1
-           )) {
-               printf("ERROR: Not valid SPI/NAND/SATA/SDIO kwbimage v1\n");
+       if ((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) {
+               printf("ERROR: Wrong blockid (0x%x) in SDIO kwbimage\n",
+                      mhdr->blockid);
                return -EINVAL;
        }
+#endif
 
        spl_image->offset = mhdr->srcaddr;