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 /include | |
| 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 'include')
| -rw-r--r-- | include/asm-generic/sections.h | 34 |
1 files changed, 6 insertions, 28 deletions
diff --git a/include/asm-generic/sections.h b/include/asm-generic/sections.h index 267f1db73f..1e1657a016 100644 --- a/include/asm-generic/sections.h +++ b/include/asm-generic/sections.h @@ -61,8 +61,12 @@ static inline int arch_is_kernel_data(unsigned long addr) /* Start of U-Boot text region */ extern char __text_start[]; -/* This marks the end of the text region which must be relocated */ -extern char __image_copy_end[]; +/* This marks the text region which must be relocated */ +extern char __image_copy_start[], __image_copy_end[]; + +extern char __bss_end[]; +extern char __rel_dyn_start[], __rel_dyn_end[]; +extern char _image_binary_end[]; /* * This is the U-Boot entry point - prior to relocation it should be same @@ -70,30 +74,4 @@ extern char __image_copy_end[]; */ extern void _start(void); -/* - * ARM defines its symbols as char[]. Other arches define them as ulongs. - */ -#ifdef CONFIG_ARM - -extern char __bss_start[]; -extern char __bss_end[]; -extern char __image_copy_start[]; -extern char __image_copy_end[]; -extern char _image_binary_end[]; -extern char __rel_dyn_start[]; -extern char __rel_dyn_end[]; - -#else /* don't use offsets: */ - -/* Exports from the Linker Script */ -extern ulong __data_end; -extern ulong __rel_dyn_start; -extern ulong __rel_dyn_end; -extern ulong __bss_end; -extern ulong _image_binary_end; - -extern ulong _TEXT_BASE; /* code start */ - -#endif - #endif /* _ASM_GENERIC_SECTIONS_H_ */ |