diff options
| author | Tom Rini <[email protected]> | 2025-09-23 08:24:59 -0600 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2025-09-23 08:24:59 -0600 |
| commit | b82a1fa7ddc7f3be2f3b75898d5dc44c34420bdd (patch) | |
| tree | 6f9b7dceb47e46af0d1a40916eb8a66564ebd2c4 /common | |
| parent | d81c1118580f3481b864b830fe5b789519993bd3 (diff) | |
| parent | 2f2ab7e13a69367cc9b88a45899e24dba02667c6 (diff) | |
Merge tag 'v2025.10-rc5' into next
Prepare v2025.10-rc5
Diffstat (limited to 'common')
| -rw-r--r-- | common/spl/Kconfig | 2 | ||||
| -rw-r--r-- | common/spl/spl_spi.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/common/spl/Kconfig b/common/spl/Kconfig index ab05536bd02..f34b96efc02 100644 --- a/common/spl/Kconfig +++ b/common/spl/Kconfig @@ -1141,7 +1141,7 @@ config SPL_DM_SPI config SPL_DM_SPI_FLASH bool "Support SPI DM FLASH drivers in SPL" - depends on SPL_DM + depends on SPL_DM_SPI help Enable support for SPI DM flash drivers in SPL. diff --git a/common/spl/spl_spi.c b/common/spl/spl_spi.c index 00dbd3011f0..c2b188371c2 100644 --- a/common/spl/spl_spi.c +++ b/common/spl/spl_spi.c @@ -80,7 +80,7 @@ static int spl_spi_load_image(struct spl_image_info *spl_image, spl_load_init(&load, spl_spi_fit_read, flash, 1); #if CONFIG_IS_ENABLED(OS_BOOT) - if (spl_start_uboot()) { + if (!spl_start_uboot()) { int err = spl_load(spl_image, bootdev, &load, 0, CONFIG_SYS_SPI_KERNEL_OFFS); |