]> git.dujemihanovic.xyz Git - u-boot.git/commitdiff
Revert "fdtdec: Use CONFIG_IS_ENABLED in board_fdt_blob_setup()"
authorTom Rini <trini@konsulko.com>
Sun, 14 Feb 2021 19:08:17 +0000 (14:08 -0500)
committerTom Rini <trini@konsulko.com>
Mon, 15 Feb 2021 15:06:23 +0000 (10:06 -0500)
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>
lib/fdtdec.c

index e048f7777d62877a101a8a2ed34ead0e41ff0898..9d833f6a5633d8abedc2a582a8baba97ad00a325 100644 (file)
@@ -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;