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>
This commit is contained in:
parent
fee2fdecc2
commit
df9cdcfc38
|
@ -30,7 +30,7 @@ _start:
|
||||||
call gdt_init
|
call gdt_init
|
||||||
|
|
||||||
/* reset stack pointer to CAR stack */
|
/* reset stack pointer to CAR stack */
|
||||||
mov $_car_stack_end, %esp
|
mov $_ecar_stack, %esp
|
||||||
|
|
||||||
/* clear .bss section as it is not shared */
|
/* clear .bss section as it is not shared */
|
||||||
cld
|
cld
|
||||||
|
|
|
@ -37,9 +37,9 @@
|
||||||
* use CAR it can be reused. The chipset/SoC is expected to provide
|
* use CAR it can be reused. The chipset/SoC is expected to provide
|
||||||
* the stack size. */
|
* the stack size. */
|
||||||
#if CONFIG(C_ENVIRONMENT_BOOTBLOCK)
|
#if CONFIG(C_ENVIRONMENT_BOOTBLOCK)
|
||||||
_car_stack_start = .;
|
_car_stack = .;
|
||||||
. += CONFIG_DCACHE_BSP_STACK_SIZE;
|
. += CONFIG_DCACHE_BSP_STACK_SIZE;
|
||||||
_car_stack_end = .;
|
_ecar_stack = .;
|
||||||
#endif
|
#endif
|
||||||
/* The pre-ram cbmem console as well as the timestamp region are fixed
|
/* 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
|
* in size. Therefore place them above the car global section so that
|
||||||
|
@ -59,10 +59,10 @@
|
||||||
|
|
||||||
TIMESTAMP(., 0x200)
|
TIMESTAMP(., 0x200)
|
||||||
|
|
||||||
_car_ehci_dbg_info_start = .;
|
_car_ehci_dbg_info = .;
|
||||||
/* Reserve sizeof(struct ehci_dbg_info). */
|
/* Reserve sizeof(struct ehci_dbg_info). */
|
||||||
. += 80;
|
. += 80;
|
||||||
_car_ehci_dbg_info_end = .;
|
_ecar_ehci_dbg_info = .;
|
||||||
|
|
||||||
/* _bss and _ebss provide symbols to per-stage
|
/* _bss and _ebss provide symbols to per-stage
|
||||||
* variables that are not shared like the timestamp and the pre-ram
|
* variables that are not shared like the timestamp and the pre-ram
|
||||||
|
@ -87,8 +87,8 @@
|
||||||
_car_unallocated_start = .;
|
_car_unallocated_start = .;
|
||||||
|
|
||||||
#if !CONFIG(C_ENVIRONMENT_BOOTBLOCK)
|
#if !CONFIG(C_ENVIRONMENT_BOOTBLOCK)
|
||||||
_car_stack_start = .;
|
_car_stack = .;
|
||||||
_car_stack_end = _car_region_end;
|
_ecar_stack = _car_region_end;
|
||||||
#endif
|
#endif
|
||||||
_car_region_end = . + CONFIG_DCACHE_RAM_SIZE - (. - _car_region_start);
|
_car_region_end = . + CONFIG_DCACHE_RAM_SIZE - (. - _car_region_start);
|
||||||
}
|
}
|
||||||
|
|
|
@ -27,15 +27,15 @@ extern char _car_region_end[];
|
||||||
* This is the stack area used for all stages that execute when cache-as-ram
|
* This is the stack area used for all stages that execute when cache-as-ram
|
||||||
* is up. Area is not cleared in between stages.
|
* is up. Area is not cleared in between stages.
|
||||||
*/
|
*/
|
||||||
extern char _car_stack_start[];
|
extern char _car_stack[];
|
||||||
extern char _car_stack_end[];
|
extern char _ecar_stack[];
|
||||||
#define _car_stack_size (_car_stack_end - _car_stack_start)
|
#define _car_stack_size (_ecar_stack - _car_stack)
|
||||||
|
|
||||||
extern char _car_unallocated_start[];
|
extern char _car_unallocated_start[];
|
||||||
|
|
||||||
extern char _car_ehci_dbg_info_start[];
|
extern char _car_ehci_dbg_info[];
|
||||||
extern char _car_ehci_dbg_info_end[];
|
extern char _ecar_ehci_dbg_info[];
|
||||||
#define _car_ehci_dbg_info_size \
|
#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
|
#endif
|
||||||
|
|
|
@ -173,7 +173,7 @@ addrsize_set_high:
|
||||||
movl %eax, %cr0
|
movl %eax, %cr0
|
||||||
|
|
||||||
/* Setup the stack. */
|
/* Setup the stack. */
|
||||||
mov $_car_stack_end, %esp
|
mov $_ecar_stack, %esp
|
||||||
|
|
||||||
/* Need to align stack to 16 bytes at call instruction. Account for
|
/* Need to align stack to 16 bytes at call instruction. Account for
|
||||||
the pushes below. */
|
the pushes below. */
|
||||||
|
|
|
@ -215,7 +215,7 @@ end_microcode_update:
|
||||||
movl %eax, %cr0
|
movl %eax, %cr0
|
||||||
|
|
||||||
/* Setup the stack. */
|
/* Setup the stack. */
|
||||||
mov $_car_stack_end, %esp
|
mov $_ecar_stack, %esp
|
||||||
|
|
||||||
/* Need to align stack to 16 bytes at call instruction. Account for
|
/* Need to align stack to 16 bytes at call instruction. Account for
|
||||||
the pushes below. */
|
the pushes below. */
|
||||||
|
|
|
@ -161,7 +161,7 @@ addrsize_set_high:
|
||||||
movl %eax, %cr0
|
movl %eax, %cr0
|
||||||
|
|
||||||
/* Setup the stack. */
|
/* Setup the stack. */
|
||||||
mov $_car_stack_end, %esp
|
mov $_ecar_stack, %esp
|
||||||
|
|
||||||
/* Need to align stack to 16 bytes at call instruction. Account for
|
/* Need to align stack to 16 bytes at call instruction. Account for
|
||||||
the pushes below. */
|
the pushes below. */
|
||||||
|
|
|
@ -376,7 +376,7 @@ fill_cache:
|
||||||
rep stosl
|
rep stosl
|
||||||
|
|
||||||
/* Setup the stack. */
|
/* Setup the stack. */
|
||||||
mov $_car_stack_end, %esp
|
mov $_ecar_stack, %esp
|
||||||
|
|
||||||
/* Need to align stack to 16 bytes at call instruction. Account for
|
/* Need to align stack to 16 bytes at call instruction. Account for
|
||||||
the pushes below. */
|
the pushes below. */
|
||||||
|
|
|
@ -46,7 +46,7 @@ static void romstage_main(unsigned long bist)
|
||||||
printk(BIOS_DEBUG, "Romstage stack size limited to 0x%x!\n",
|
printk(BIOS_DEBUG, "Romstage stack size limited to 0x%x!\n",
|
||||||
size);
|
size);
|
||||||
|
|
||||||
stack_base = (u32 *) (_car_stack_end - size);
|
stack_base = (u32 *) (_ecar_stack - size);
|
||||||
|
|
||||||
for (i = 0; i < num_guards; i++)
|
for (i = 0; i < num_guards; i++)
|
||||||
stack_base[i] = stack_guard;
|
stack_base[i] = stack_guard;
|
||||||
|
|
|
@ -34,7 +34,7 @@ cache_as_ram:
|
||||||
|
|
||||||
post_code(0x21)
|
post_code(0x21)
|
||||||
|
|
||||||
movl $_car_stack_end, %esp
|
movl $_ecar_stack, %esp
|
||||||
|
|
||||||
/* Align the stack and keep aligned for call to bootblock_c_entry() */
|
/* Align the stack and keep aligned for call to bootblock_c_entry() */
|
||||||
and $0xfffffff0, %esp
|
and $0xfffffff0, %esp
|
||||||
|
|
|
@ -70,7 +70,7 @@ static inline struct ehci_debug_info *dbgp_ehci_info(void)
|
||||||
/* The message likely does not show if we hit this. */
|
/* The message likely does not show if we hit this. */
|
||||||
if (sizeof(*info) > _car_ehci_dbg_info_size)
|
if (sizeof(*info) > _car_ehci_dbg_info_size)
|
||||||
die("BUG: Increase ehci_dbg_info reserve in CAR");
|
die("BUG: Increase ehci_dbg_info reserve in CAR");
|
||||||
info = (void *)_car_ehci_dbg_info_start;
|
info = (void *)_car_ehci_dbg_info;
|
||||||
} else {
|
} else {
|
||||||
info = &glob_dbg_info;
|
info = &glob_dbg_info;
|
||||||
}
|
}
|
||||||
|
|
|
@ -170,7 +170,7 @@ car_init_done:
|
||||||
post_code(0x29)
|
post_code(0x29)
|
||||||
|
|
||||||
/* Setup bootblock stack */
|
/* Setup bootblock stack */
|
||||||
mov $_car_stack_end, %esp
|
mov $_ecar_stack, %esp
|
||||||
|
|
||||||
/* Need to align stack to 16 bytes at call instruction. Account for
|
/* Need to align stack to 16 bytes at call instruction. Account for
|
||||||
the two pushes below. */
|
the two pushes below. */
|
||||||
|
|
|
@ -502,7 +502,7 @@ L44:
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/* Setup bootblock stack */
|
/* Setup bootblock stack */
|
||||||
movl $_car_stack_end, %esp
|
movl $_ecar_stack, %esp
|
||||||
|
|
||||||
before_carstage:
|
before_carstage:
|
||||||
post_code(0x2b)
|
post_code(0x2b)
|
||||||
|
|
|
@ -118,7 +118,7 @@ void platform_fsp_memory_init_params_cb(FSPM_UPD *fspm_upd, uint32_t version)
|
||||||
_car_unallocated_start);
|
_car_unallocated_start);
|
||||||
printk(BIOS_SPEW, "| coreboot data |\n");
|
printk(BIOS_SPEW, "| coreboot data |\n");
|
||||||
printk(BIOS_SPEW, "+-------------------+ 0x%p\n",
|
printk(BIOS_SPEW, "+-------------------+ 0x%p\n",
|
||||||
_car_stack_end);
|
_ecar_stack);
|
||||||
printk(BIOS_SPEW, "| coreboot stack |\n");
|
printk(BIOS_SPEW, "| coreboot stack |\n");
|
||||||
printk(BIOS_SPEW,
|
printk(BIOS_SPEW,
|
||||||
"+-------------------+ 0x80000000 - ESRAM start\n\n");
|
"+-------------------+ 0x80000000 - ESRAM start\n\n");
|
||||||
|
|
Loading…
Reference in New Issue