diff options
| author | Tom Rini <trini@konsulko.com> | 2021-11-05 15:38:46 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2021-11-05 15:38:46 -0400 |
| commit | 52207514ba419a69a8105d16997b025f966c8879 (patch) | |
| tree | 910be34154c25de5cb431cecfd87836ff50b2c5d /common/spl/spl_spi.c | |
| parent | 2a5ad542e6c238ff5c0b490b49354e780ab46d71 (diff) | |
| parent | ce5bae5ccd3809366a3ffb4d8b2046e8f2f6f0f1 (diff) | |
Merge branch '2021-11-05-Kconfig-syncs'
- An assortment of changes to finish migration of a number of symbols,
and move YAFFS2 related options that we enable to Kconfig as well.
Diffstat (limited to 'common/spl/spl_spi.c')
| -rw-r--r-- | common/spl/spl_spi.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/common/spl/spl_spi.c b/common/spl/spl_spi.c index 46ee4058e76..4e20a23dea0 100644 --- a/common/spl/spl_spi.c +++ b/common/spl/spl_spi.c @@ -18,7 +18,7 @@ #include <asm/global_data.h> #include <dm/ofnode.h> -#ifdef CONFIG_SPL_OS_BOOT +#if CONFIG_IS_ENABLED(OS_BOOT) /* * Load the kernel, check for a valid header we can parse, and if found load * the kernel and then device tree. @@ -107,7 +107,7 @@ static int spl_spi_load_image(struct spl_image_info *spl_image, payload_offs); } -#ifdef CONFIG_SPL_OS_BOOT +#if CONFIG_IS_ENABLED(OS_BOOT) if (spl_start_uboot() || spi_load_image_os(spl_image, flash, header)) #endif { |