summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2021-02-14 14:08:17 -0500
committerTom Rini <trini@konsulko.com>2021-02-15 10:06:23 -0500
commite31350c3c466f1a548ae6a224be0cc84ad6c2163 (patch)
treee159f10b25959a7e138b7f9f0c6e05c222c7bd64
parenta6ba59583abd4085db5ab00358d751f175e2a451 (diff)
downloadu-boot-e31350c3c466f1a548ae6a224be0cc84ad6c2163.tar.gz
u-boot-e31350c3c466f1a548ae6a224be0cc84ad6c2163.tar.xz
u-boot-e31350c3c466f1a548ae6a224be0cc84ad6c2163.zip
Revert "fdtdec: Use CONFIG_IS_ENABLED in board_fdt_blob_setup()"
On Rockchip platforms we need this area of code in TPL, but there is no TPL_SEPARATE_BSS symbol. This reverts commit 0a2aaab0b678fd1778ff2fc59d0770fc82995532. Reported-by: Markus Reichl <m.reichl@fivetechno.de> Reported-by: Jesper Schmitz Mouridsen <jesper@schmitz.computer> Reported-by: Peter Robinson <pbrobinson@gmail.com> Tested-by: Peter Robinson <pbrobinson@gmail.com> Signed-off-by: Tom Rini <trini@konsulko.com>
-rw-r--r--lib/fdtdec.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/fdtdec.c b/lib/fdtdec.c
index e048f7777d..9d833f6a56 100644
--- a/lib/fdtdec.c
+++ b/lib/fdtdec.c
@@ -1253,7 +1253,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;