diff options
| author | Tom Rini <trini@konsulko.com> | 2023-08-09 13:15:51 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2023-08-09 13:15:51 -0400 |
| commit | 321d7b4d875a77552a969dd6ea5bbed2644fcb0c (patch) | |
| tree | df15c6c203dcdd35fe15f7dae4ff024f82d5a618 /lib/fdtdec.c | |
| parent | 1e1437d9f8b5be362afdd0212dbae6c41f53f3d8 (diff) | |
| parent | 06b51f77f5be60200a5f0037509c191b102e5e00 (diff) | |
Merge branch '2023-08-09-misc-cleanups' into next
- Rework the arch linker scripts to be consistent for all, support
Kconfig fragments in the board directory and fix some Kconfig options
that were hex-type by default of 0 not 0x0.
Diffstat (limited to 'lib/fdtdec.c')
| -rw-r--r-- | lib/fdtdec.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/fdtdec.c b/lib/fdtdec.c index c60972dfbe8..7a691676483 100644 --- a/lib/fdtdec.c +++ b/lib/fdtdec.c @@ -1230,12 +1230,12 @@ static void *fdt_find_separate(void) #ifdef CONFIG_SPL_BUILD /* FDT is at end of BSS unless it is in a different memory region */ if (IS_ENABLED(CONFIG_SPL_SEPARATE_BSS)) - fdt_blob = (ulong *)&_image_binary_end; + fdt_blob = (ulong *)_image_binary_end; else - fdt_blob = (ulong *)&__bss_end; + fdt_blob = (ulong *)__bss_end; #else /* FDT is at end of image */ - fdt_blob = (ulong *)&_end; + fdt_blob = (ulong *)_end; if (_DEBUG && !fdtdec_prepare_fdt(fdt_blob)) { int stack_ptr; |