diff options
Diffstat (limited to 'lib/fdtdec.c')
| -rw-r--r-- | lib/fdtdec.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/lib/fdtdec.c b/lib/fdtdec.c index 5edc8dd2f9f..b0655988029 100644 --- a/lib/fdtdec.c +++ b/lib/fdtdec.c @@ -608,7 +608,7 @@ int fdtdec_get_chosen_node(const void *blob, const char *name) static int fdtdec_prepare_fdt(const void *blob) { if (!blob || ((uintptr_t)blob & 3) || fdt_check_header(blob)) { - if (spl_phase() <= PHASE_SPL) { + if (xpl_phase() <= PHASE_SPL) { puts("Missing DTB\n"); } else { printf("No valid device tree binary found at %p\n", @@ -1172,10 +1172,10 @@ static int uncompress_blob(const void *src, ulong sz_src, void **dstp) void *dst; int rc; - if (CONFIG_IS_ENABLED(GZIP)) + if (CONFIG_IS_ENABLED(GZIP) && CONFIG_IS_ENABLED(MULTI_DTB_FIT_GZIP)) if (gzip_parse_header(src, sz_in) >= 0) gzip = 1; - if (CONFIG_IS_ENABLED(LZO)) + if (CONFIG_IS_ENABLED(LZO) && CONFIG_IS_ENABLED(MULTI_DTB_FIT_LZO)) if (!gzip && lzop_is_valid_header(src)) lzo = 1; @@ -1230,9 +1230,9 @@ static void *fdt_find_separate(void) if (IS_ENABLED(CONFIG_SANDBOX)) return NULL; -#ifdef CONFIG_SPL_BUILD +#ifdef CONFIG_XPL_BUILD /* FDT is at end of BSS unless it is in a different memory region */ - if (IS_ENABLED(CONFIG_SPL_SEPARATE_BSS)) + if (CONFIG_IS_ENABLED(SEPARATE_BSS)) fdt_blob = (ulong *)_image_binary_end; else fdt_blob = (ulong *)__bss_end; @@ -1676,7 +1676,7 @@ int fdtdec_setup(void) * not whether this phase creates one. */ if (CONFIG_IS_ENABLED(BLOBLIST) && - (spl_prev_phase() != PHASE_TPL || + (xpl_prev_phase() != PHASE_TPL || !IS_ENABLED(CONFIG_TPL_BLOBLIST))) { ret = bloblist_maybe_init(); if (!ret) { @@ -1714,7 +1714,7 @@ int fdtdec_setup(void) } /* Allow the early environment to override the fdt address */ - if (!IS_ENABLED(CONFIG_SPL_BUILD)) { + if (!IS_ENABLED(CONFIG_XPL_BUILD)) { ulong addr; addr = env_get_hex("fdtcontroladdr", 0); |