summaryrefslogtreecommitdiff
path: root/common
diff options
context:
space:
mode:
authorJohn Keeping <john@metanate.com>2021-05-19 15:05:53 +0100
committerTom Rini <trini@konsulko.com>2021-07-23 07:13:24 -0400
commit674afa6b3588dafe02b99406278ed81216fbefcb (patch)
tree269290d8969172427c90acf359216b31db5396d4 /common
parent4906d698d3960b70cf8000299da35412efd4f51d (diff)
downloadu-boot-674afa6b3588dafe02b99406278ed81216fbefcb.tar.gz
spl: use CONFIG_IS_ENABLED(LOAD_FIT_FULL)
It's possible that LOAD_FIT_FULL will have different values for TPL and SPL, in which case just checking CONFIG_SPL_LOAD_FIT_FULL causes this to be compiled in to the TPL even though functions and struct members it depends on are not. Use CONFIG_IS_ENABLED() to ensure the correct TPL/SPL variant is checked. Signed-off-by: John Keeping <john@metanate.com> Reviewed-by: Bin Meng <bmeng.cn@gmail.com> Reviewed-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'common')
-rw-r--r--common/spl/spl.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/common/spl/spl.c b/common/spl/spl.c
index 3b96f2fc31..3ec16d0de6 100644
--- a/common/spl/spl.c
+++ b/common/spl/spl.c
@@ -200,7 +200,7 @@ void spl_set_header_raw_uboot(struct spl_image_info *spl_image)
spl_image->name = "U-Boot";
}
-#ifdef CONFIG_SPL_LOAD_FIT_FULL
+#if CONFIG_IS_ENABLED(LOAD_FIT_FULL)
/* Parse and load full fitImage in SPL */
static int spl_load_fit_image(struct spl_image_info *spl_image,
const struct image_header *header)
@@ -307,7 +307,7 @@ __weak int spl_parse_legacy_header(struct spl_image_info *spl_image,
int spl_parse_image_header(struct spl_image_info *spl_image,
const struct image_header *header)
{
-#ifdef CONFIG_SPL_LOAD_FIT_FULL
+#if CONFIG_IS_ENABLED(LOAD_FIT_FULL)
int ret = spl_load_fit_image(spl_image, header);
if (!ret)