On Sun, Feb 14, 2021 at 7:11 PM Tom Rini trini@konsulko.com wrote:

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: Jesper Schmitz Mouridsen jesper@schmitz.computer Reported-by: Peter Robinson pbrobinson@gmail.com Signed-off-by: Tom Rini trini@konsulko.com

Tested-by: Peter Robinson pbrobinson@gmail.com

---

lib/fdtdec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/fdtdec.c b/lib/fdtdec.c index e048f7777d62..9d833f6a5633 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;
  

-- 2.17.1