diff options
Diffstat (limited to 'lib/fdtdec.c')
| -rw-r--r-- | lib/fdtdec.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/fdtdec.c b/lib/fdtdec.c index a2d2fb4e1fe..864589193b4 100644 --- a/lib/fdtdec.c +++ b/lib/fdtdec.c @@ -21,6 +21,7 @@ #include <mapmem.h> #include <linux/libfdt.h> #include <serial.h> +#include <asm/global_data.h> #include <asm/sections.h> #include <linux/ctype.h> #include <linux/lzo.h> @@ -1253,7 +1254,7 @@ __weak void *board_fdt_blob_setup(void) void *fdt_blob = NULL; #ifdef CONFIG_SPL_BUILD /* FDT is at end of BSS unless it is in a different memory region */ - if (CONFIG_IS_ENABLED(SEPARATE_BSS)) + if (IS_ENABLED(CONFIG_SPL_SEPARATE_BSS)) fdt_blob = (ulong *)&_image_binary_end; else fdt_blob = (ulong *)&__bss_end; @@ -1572,7 +1573,7 @@ int fdtdec_setup(void) return -1; } # elif defined(CONFIG_OF_PRIOR_STAGE) - gd->fdt_blob = (void *)prior_stage_fdt_address; + gd->fdt_blob = (void *)(uintptr_t)prior_stage_fdt_address; # endif # ifndef CONFIG_SPL_BUILD /* Allow the early environment to override the fdt address */ |