sravan/system76-coreboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

arch/x86: Drop _car_relocatable_data symbols

Browse Source 
These have become aliases to _car_global_[start|end].

Change-Id: Ibdcaaafdc0e4c6df4a795474903768230d41680d
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/35033
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Marshall Dawson <marshalldawson3rd@gmail.com>
This commit is contained in:
Kyösti Mälkki
2019-08-22 12:56:22 +03:00
parent 3de9d774b1
commit 1095bfafed
7 changed files with 16 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/arch/x86/car.ld
View File

@@ -64,8 +64,6 @@
. += 80;
_car_ehci_dbg_info_end = .;
_car_relocatable_data_start = .;
/* _car_global_start and _car_global_end provide symbols to per-stage
* variables that are not shared like the timestamp and the pre-ram
* cbmem console. This is useful for clearing this area on a per-stage
@@ -78,13 +76,11 @@
*(.sbss)
*(.sbss.*)
#else
/* .car.global_data objects only around when
* CONFIG_CAR_GLOBAL_MIGRATION is employed. */
*(.car.global_data);
#endif
. = ALIGN(ARCH_POINTER_ALIGN_SIZE);
_car_global_end = .;
_car_relocatable_data_end = .;
_car_unallocated_start = .;
#if !CONFIG(C_ENVIRONMENT_BOOTBLOCK)
_car_stack_start = .;

6
src/arch/x86/include/arch/early_variables.h
View File

@@ -52,13 +52,13 @@ void car_set_reloc_ptr(void *var, void *val);
static inline size_t car_data_size(void)
{
size_t car_size = _car_relocatable_data_size;
return ALIGN_UP(car_size, 64);
size_t car_size = _car_global_size;
return ALIGN(car_size, 64);
}
static inline size_t car_object_offset(void *ptr)
{
return (char *)ptr - &_car_relocatable_data_start[0];
return (char *)ptr - &_car_global_start[0];
}
#else

14
src/arch/x86/include/arch/symbols.h
View File

@@ -31,22 +31,18 @@ extern char _car_stack_start[];
extern char _car_stack_end[];
#define _car_stack_size (_car_stack_end - _car_stack_start)
extern char _car_unallocated_start[];
extern char _car_ehci_dbg_info_start[];
extern char _car_ehci_dbg_info_end[];
#define _car_ehci_dbg_info_size \
(_car_ehci_dbg_info_end - _car_ehci_dbg_info_start)
/*
* The _car_relocatable_data_[start|end] symbols cover CAR data which is
* relocatable once memory comes online. Variables with CAR_GLOBAL decoration
* reside within this region. The _car_global_[start|end] is a subset of the
* relocatable region which excludes the timestamp region because of
* intricacies in the timestamp code.
* The _car_global_[start|end]symbols cover CAR data which is relocatable
* once memory comes online. Variables with CAR_GLOBAL decoration
* reside within this region.
*/
extern char _car_relocatable_data_start[];
extern char _car_relocatable_data_end[];
#define _car_relocatable_data_size \
(_car_relocatable_data_end - _car_relocatable_data_start)
extern char _car_global_start[];
extern char _car_global_end[];
#define _car_global_size (_car_global_end - _car_global_start)