Merge https://source.denx.de/u-boot/custodians/u-boot-sunxi

[platform/kernel/u-boot.git] / common / spl / spl_spi.c

diff --git a/common/spl/spl_spi.c b/common/spl/spl_spi.c
index 4e20a23..d959ad1 100644 (file)
--- a/common/spl/spl_spi.c
+++ b/common/spl/spl_spi.c
@@ -24,6 +24,7 @@
  * the kernel and then device tree.
  */
 static int spi_load_image_os(struct spl_image_info *spl_image,
+                            struct spl_boot_device *bootdev,
                             struct spi_flash *flash,
                             struct image_header *header)
 {
@@ -36,7 +37,7 @@ static int spi_load_image_os(struct spl_image_info *spl_image,
        if (image_get_magic(header) != IH_MAGIC)
                return -1;
 
-       err = spl_parse_image_header(spl_image, header);
+       err = spl_parse_image_header(spl_image, bootdev, header);
        if (err)
                return err;
 
@@ -70,6 +71,16 @@ unsigned int __weak spl_spi_get_uboot_offs(struct spi_flash *flash)
        return CONFIG_SYS_SPI_U_BOOT_OFFS;
 }
 
+u32 __weak spl_spi_boot_bus(void)
+{
+       return CONFIG_SF_DEFAULT_BUS;
+}
+
+u32 __weak spl_spi_boot_cs(void)
+{
+       return CONFIG_SF_DEFAULT_CS;
+}
+
 /*
  * The main entry for SPI booting. It's necessary that SDRAM is already
  * configured and available since this code loads the main U-Boot image
@@ -82,15 +93,15 @@ static int spl_spi_load_image(struct spl_image_info *spl_image,
        unsigned int payload_offs;
        struct spi_flash *flash;
        struct image_header *header;
+       unsigned int sf_bus = spl_spi_boot_bus();
+       unsigned int sf_cs = spl_spi_boot_cs();
 
        /*
         * Load U-Boot image from SPI flash into RAM
         * In DM mode: defaults speed and mode will be
         * taken from DT when available
         */
-
-       flash = spi_flash_probe(CONFIG_SF_DEFAULT_BUS,
-                               CONFIG_SF_DEFAULT_CS,
+       flash = spi_flash_probe(sf_bus, sf_cs,
                                CONFIG_SF_DEFAULT_SPEED,
                                CONFIG_SF_DEFAULT_MODE);
        if (!flash) {
@@ -108,7 +119,7 @@ static int spl_spi_load_image(struct spl_image_info *spl_image,
        }
 
 #if CONFIG_IS_ENABLED(OS_BOOT)
-       if (spl_start_uboot() || spi_load_image_os(spl_image, flash, header))
+       if (spl_start_uboot() || spi_load_image_os(spl_image, bootdev, flash, header))
 #endif
        {
                /* Load u-boot, mkimage header is 64 bytes. */
@@ -127,7 +138,7 @@ static int spl_spi_load_image(struct spl_image_info *spl_image,
                                             (void *)CONFIG_SYS_LOAD_ADDR);
                        if (err)
                                return err;
-                       err = spl_parse_image_header(spl_image,
+                       err = spl_parse_image_header(spl_image, bootdev,
                                        (struct image_header *)CONFIG_SYS_LOAD_ADDR);
                } else if (IS_ENABLED(CONFIG_SPL_LOAD_FIT) &&
                           image_get_magic(header) == FDT_MAGIC) {
@@ -154,13 +165,18 @@ static int spl_spi_load_image(struct spl_image_info *spl_image,
                        err = spl_load_imx_container(spl_image, &load,
                                                     payload_offs);
                } else {
-                       err = spl_parse_image_header(spl_image, header);
+                       err = spl_parse_image_header(spl_image, bootdev, header);
                        if (err)
                                return err;
                        err = spi_flash_read(flash, payload_offs + spl_image->offset,
                                             spl_image->size,
                                             (void *)spl_image->load_addr);
                }
+               if (IS_ENABLED(CONFIG_SPI_FLASH_SOFT_RESET)) {
+                       err = spi_nor_remove(flash);
+                       if (err)
+                               return err;
+               }
        }
 
        return err;