From: Dimitrios Siganos <dimitris@siganos.org>
Date: Tue, 17 Feb 2026 13:56:20 +0000 (+0000)
Subject: spl: spi: fix loss of spl_load() error on soft reset
X-Git-Tag: v2026.07-rc1~53^2~28
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e7ad95aa3f1180823e07dd30c8c24494a07ca814;p=thirdparty%2Fu-boot.git

spl: spi: fix loss of spl_load() error on soft reset

When CONFIG_SPI_FLASH_SOFT_RESET is enabled, spi_nor_remove() is called
after spl_load() to switch the flash back to legacy SPI mode. However,
the return value of spi_nor_remove() unconditionally overwrites the
return value of spl_load(), discarding any load error.

Fix this by preserving the spl_load() error and only propagating the
spi_nor_remove() error as a fallback. Also log a message when
spi_nor_remove() fails, since in the case where spl_load() already
failed its error would otherwise be silently discarded.

Signed-off-by: Dimitrios Siganos <dimitris@siganos.org>
---

diff --git a/common/spl/spl_spi.c b/common/spl/spl_spi.c
index e8e62d5f9fb..3d4b70f7c33 100644
--- a/common/spl/spl_spi.c
+++ b/common/spl/spl_spi.c
@@ -124,8 +124,16 @@ static int spl_spi_load_image(struct spl_image_info *spl_image,
 	}
 
 	err = spl_load(spl_image, bootdev, &load, 0, payload_offs);
-	if (IS_ENABLED(CONFIG_SPI_FLASH_SOFT_RESET))
-		err = spi_nor_remove(flash);
+	if (IS_ENABLED(CONFIG_SPI_FLASH_SOFT_RESET)) {
+		int ret = spi_nor_remove(flash);
+
+		if (ret) {
+			printf("%s: Failed to remove SPI NOR flash: %d\n",
+			       __func__, ret);
+			if (!err)
+				err = ret;
+		}
+	}
 	return err;
 }
 /* Use priorty 1 so that boards can override this */