diff options
| author | Tom Rini <[email protected]> | 2024-10-03 11:52:42 -0600 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2024-10-03 11:52:42 -0600 |
| commit | 0d28900dd171d3444ea16d9cc18af35a90c03e27 (patch) | |
| tree | 246e8a9bb1b15c7c2791f6a8b60e6420bcf35216 /arch | |
| parent | 08990e2254ffd63ade7f633b78b6573abc9b7e90 (diff) | |
| parent | fe38b88453d2ed40e1009d22f3f4d4213d2016b7 (diff) | |
Merge patch series "vbe: Series part D"
Simon Glass <[email protected]> says:
This includes various patches towards implementing the VBE abrec
bootmeth in U-Boot.
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/cpu/armv8/u-boot-spl.lds | 12 | ||||
| -rw-r--r-- | arch/arm/lib/cache.c | 2 | ||||
| -rw-r--r-- | arch/arm/lib/sections.c | 2 | ||||
| -rw-r--r-- | arch/sandbox/include/asm/sections.h | 1 |
4 files changed, 14 insertions, 3 deletions
diff --git a/arch/arm/cpu/armv8/u-boot-spl.lds b/arch/arm/cpu/armv8/u-boot-spl.lds index 215cedd69a8..fed69644b55 100644 --- a/arch/arm/cpu/armv8/u-boot-spl.lds +++ b/arch/arm/cpu/armv8/u-boot-spl.lds @@ -13,8 +13,10 @@ MEMORY { .sram : ORIGIN = IMAGE_TEXT_BASE, LENGTH = IMAGE_MAX_SIZE } +#ifdef CONFIG_SPL_SEPARATE_BSS MEMORY { .sdram : ORIGIN = CONFIG_SPL_BSS_START_ADDR, LENGTH = CONFIG_SPL_BSS_MAX_SIZE } +#endif OUTPUT_FORMAT("elf64-littleaarch64", "elf64-littleaarch64", "elf64-littleaarch64") OUTPUT_ARCH(aarch64) @@ -56,12 +58,22 @@ SECTIONS _end = .; _image_binary_end = .; +#ifdef CONFIG_SPL_SEPARATE_BSS .bss : { __bss_start = .; *(.bss*) . = ALIGN(8); __bss_end = .; } >.sdram +#else + .bss (NOLOAD) : { + __bss_start = .; + *(.bss*) + . = ALIGN(8); + __bss_end = .; + } >.sram +#endif + __bss_size = __bss_end - __bss_start; /DISCARD/ : { *(.rela*) } /DISCARD/ : { *(.dynsym) } diff --git a/arch/arm/lib/cache.c b/arch/arm/lib/cache.c index b2ae74a59f1..648edf308f6 100644 --- a/arch/arm/lib/cache.c +++ b/arch/arm/lib/cache.c @@ -4,8 +4,6 @@ * Wolfgang Denk, DENX Software Engineering, [email protected]. */ -/* for now: just dummy functions to satisfy the linker */ - #include <config.h> #include <cpu_func.h> #include <log.h> diff --git a/arch/arm/lib/sections.c b/arch/arm/lib/sections.c index 07efabaa7dc..8955aa6111c 100644 --- a/arch/arm/lib/sections.c +++ b/arch/arm/lib/sections.c @@ -5,7 +5,7 @@ #include <linux/compiler.h> /** - * These two symbols are declared in a C file so that the linker + * These symbols are declared in a C file so that the linker * uses R_ARM_RELATIVE relocation, rather than the R_ARM_ABS32 one * it would use if the symbols were defined in the linker file. * Using only R_ARM_RELATIVE relocation ensures that references to diff --git a/arch/sandbox/include/asm/sections.h b/arch/sandbox/include/asm/sections.h index 88837bb35c8..5e1577419b0 100644 --- a/arch/sandbox/include/asm/sections.h +++ b/arch/sandbox/include/asm/sections.h @@ -10,6 +10,7 @@ #define __SANDBOX_SECTIONS_H #include <asm-generic/sections.h> +#include <linux/compiler_attributes.h> struct sandbox_cmdline_option; |