summaryrefslogtreecommitdiff
path: root/common/spl
diff options
context:
space:
mode:
Diffstat (limited to 'common/spl')
-rw-r--r--common/spl/Kconfig2
-rw-r--r--common/spl/spl.c4
-rw-r--r--common/spl/spl_spi.c2
3 files changed, 4 insertions, 4 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.c b/common/spl/spl.c
index ed443c645a7..55ad497c86d 100644
--- a/common/spl/spl.c
+++ b/common/spl/spl.c
@@ -278,8 +278,8 @@ void spl_set_header_raw_uboot(struct spl_image_info *spl_image)
} else {
spl_image->entry_point = CONFIG_SYS_UBOOT_START;
spl_image->load_addr = CONFIG_TEXT_BASE;
- log_debug("Default load addr %x (u_boot_pos=%lx)\n",
- CONFIG_TEXT_BASE, u_boot_pos);
+ log_debug("Default load addr %lx (u_boot_pos=%lx)\n",
+ spl_image->load_addr, u_boot_pos);
}
spl_image->os = IH_OS_U_BOOT;
spl_image->name = xpl_name(xpl_next_phase());
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);