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

4
src/cpu/amd/car/post_cache_as_ram.c
View File

@@ -101,11 +101,11 @@ asmlinkage void *post_cache_as_ram(void)
void *migrated_car = (void *)(CONFIG_RAMTOP - car_size);
print_car_debug("Copying data from cache to RAM...");
memcpy_(migrated_car, _car_relocatable_data_start, car_size);
memcpy_(migrated_car, _car_global_start, car_size);
print_car_debug(" Done\n");
print_car_debug("Verifying data integrity in RAM...");
if (memcmp_(migrated_car, _car_relocatable_data_start, car_size) == 0)
if (memcmp_(migrated_car, _car_global_start, car_size) == 0)
print_car_debug(" Done\n");
else
print_car_debug(" FAILED\n");

6
src/cpu/x86/car.c
View File

@@ -44,8 +44,8 @@ void *car_get_var_ptr(void *var)
{
char *migrated_base = NULL;
int offset;
void *_car_start = _car_relocatable_data_start;
void *_car_end = _car_relocatable_data_end;
void *_car_start = _car_global_start;
void *_car_end = _car_global_end;
/* If the cache-as-ram has not been migrated return the pointer
* passed in. */
@@ -127,7 +127,7 @@ static void do_car_migrate_variables(void)
return;
}
memcpy(migrated_base, _car_relocatable_data_start, car_size);
memcpy(migrated_base, _car_global_start, car_size);
/* Mark that the data has been moved. */
car_migrated = ~0;