* [PATCH] Revert "fdtdec: Use CONFIG_IS_ENABLED in board_fdt_blob_setup()"
@ 2021-02-14 19:11 Tom Rini
2021-02-14 19:18 ` Peter Robinson
2021-02-15 15:43 ` Tom Rini
0 siblings, 2 replies; 3+ messages in thread
From: Tom Rini @ 2021-02-14 19:11 UTC (permalink / raw)
To: u-boot
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>
---
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
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [PATCH] Revert "fdtdec: Use CONFIG_IS_ENABLED in board_fdt_blob_setup()"
2021-02-14 19:11 [PATCH] Revert "fdtdec: Use CONFIG_IS_ENABLED in board_fdt_blob_setup()" Tom Rini
@ 2021-02-14 19:18 ` Peter Robinson
2021-02-15 15:43 ` Tom Rini
1 sibling, 0 replies; 3+ messages in thread
From: Peter Robinson @ 2021-02-14 19:18 UTC (permalink / raw)
To: u-boot
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
>
^ permalink raw reply [flat|nested] 3+ messages in thread
* [PATCH] Revert "fdtdec: Use CONFIG_IS_ENABLED in board_fdt_blob_setup()"
2021-02-14 19:11 [PATCH] Revert "fdtdec: Use CONFIG_IS_ENABLED in board_fdt_blob_setup()" Tom Rini
2021-02-14 19:18 ` Peter Robinson
@ 2021-02-15 15:43 ` Tom Rini
1 sibling, 0 replies; 3+ messages in thread
From: Tom Rini @ 2021-02-15 15:43 UTC (permalink / raw)
To: u-boot
On Sun, Feb 14, 2021 at 02:11:32PM -0500, Tom Rini 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: 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>
Applied to u-boot/master, thanks!
--
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 659 bytes
Desc: not available
URL: <https://lists.denx.de/pipermail/u-boot/attachments/20210215/7692e80c/attachment.sig>
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2021-02-15 15:43 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-02-14 19:11 [PATCH] Revert "fdtdec: Use CONFIG_IS_ENABLED in board_fdt_blob_setup()" Tom Rini
2021-02-14 19:18 ` Peter Robinson
2021-02-15 15:43 ` Tom Rini
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.