diff options
| author | Arthur Heymans <arthur@aheymans.xyz> | 2019-11-09 06:50:20 +0100 |
|---|---|---|
| committer | Patrick Georgi <pgeorgi@google.com> | 2019-11-12 18:25:42 +0000 |
| commit | df9cdcfc383ac38c2238fd6d640c9260028906f7 (patch) | |
| tree | c72389e5b014119ecc632dc279c6c7162acc433a /src/arch | |
| parent | fee2fdecc2b6c260fcb6caf3348ee948a83cdbd7 (diff) | |
| download | coreboot-df9cdcfc383ac38c2238fd6d640c9260028906f7.tar.xz | |
arch/x86/car.ld: Rename suffix _start/_end
This is more in line with how linker symbol for regions are defined.
Change-Id: I0bd7ae59a27909ed0fd38e6f7193816cb57e76af
Signed-off-by: Arthur Heymans <arthur@aheymans.xyz>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/36695
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
Diffstat (limited to 'src/arch')
| -rw-r--r-- | src/arch/x86/assembly_entry.S | 2 | ||||
| -rw-r--r-- | src/arch/x86/car.ld | 12 | ||||
| -rw-r--r-- | src/arch/x86/include/arch/symbols.h | 12 |
3 files changed, 13 insertions, 13 deletions
diff --git a/src/arch/x86/assembly_entry.S b/src/arch/x86/assembly_entry.S index c36dc1cb10..d9d6d4ecef 100644 --- a/src/arch/x86/assembly_entry.S +++ b/src/arch/x86/assembly_entry.S @@ -30,7 +30,7 @@ _start: call gdt_init /* reset stack pointer to CAR stack */ - mov $_car_stack_end, %esp + mov $_ecar_stack, %esp /* clear .bss section as it is not shared */ cld diff --git a/src/arch/x86/car.ld b/src/arch/x86/car.ld index 6ccbd8c236..74fc74b58e 100644 --- a/src/arch/x86/car.ld +++ b/src/arch/x86/car.ld @@ -37,9 +37,9 @@ * use CAR it can be reused. The chipset/SoC is expected to provide * the stack size. */ #if CONFIG(C_ENVIRONMENT_BOOTBLOCK) - _car_stack_start = .; + _car_stack = .; . += CONFIG_DCACHE_BSP_STACK_SIZE; - _car_stack_end = .; + _ecar_stack = .; #endif /* The pre-ram cbmem console as well as the timestamp region are fixed * in size. Therefore place them above the car global section so that @@ -59,10 +59,10 @@ TIMESTAMP(., 0x200) - _car_ehci_dbg_info_start = .; + _car_ehci_dbg_info = .; /* Reserve sizeof(struct ehci_dbg_info). */ . += 80; - _car_ehci_dbg_info_end = .; + _ecar_ehci_dbg_info = .; /* _bss and _ebss provide symbols to per-stage * variables that are not shared like the timestamp and the pre-ram @@ -87,8 +87,8 @@ _car_unallocated_start = .; #if !CONFIG(C_ENVIRONMENT_BOOTBLOCK) - _car_stack_start = .; - _car_stack_end = _car_region_end; + _car_stack = .; + _ecar_stack = _car_region_end; #endif _car_region_end = . + CONFIG_DCACHE_RAM_SIZE - (. - _car_region_start); } diff --git a/src/arch/x86/include/arch/symbols.h b/src/arch/x86/include/arch/symbols.h index f715e0a6d1..efe10fe524 100644 --- a/src/arch/x86/include/arch/symbols.h +++ b/src/arch/x86/include/arch/symbols.h @@ -27,15 +27,15 @@ extern char _car_region_end[]; * This is the stack area used for all stages that execute when cache-as-ram * is up. Area is not cleared in between stages. */ -extern char _car_stack_start[]; -extern char _car_stack_end[]; -#define _car_stack_size (_car_stack_end - _car_stack_start) +extern char _car_stack[]; +extern char _ecar_stack[]; +#define _car_stack_size (_ecar_stack - _car_stack) extern char _car_unallocated_start[]; -extern char _car_ehci_dbg_info_start[]; -extern char _car_ehci_dbg_info_end[]; +extern char _car_ehci_dbg_info[]; +extern char _ecar_ehci_dbg_info[]; #define _car_ehci_dbg_info_size \ - (_car_ehci_dbg_info_end - _car_ehci_dbg_info_start) + (_ecar_ehci_dbg_info - _car_ehci_dbg_info) #endif |