CBMEM: Tidy up CAR migration

Move the  CAR migration call to arch -specific part of CBMEM init,
it is truly a x86 specific thing.

Change-Id: I715417e54f197b8745e0670d6b900a5660178141
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: http://review.coreboot.org/7860
Reviewed-by: Aaron Durbin <adurbin@google.com>
Tested-by: build bot (Jenkins)
This commit is contained in:
Kyösti Mälkki
2014-12-31 20:55:19 +02:00
parent 3bf3854847
commit 91fac61240
9 changed files with 30 additions and 31 deletions

View File

@ -170,18 +170,14 @@ void cbmem_initialize_empty(void)
printk(BIOS_DEBUG, "CBMEM: root @ %p %d entries.\n",
root, root->max_entries);
/* Complete migration to CBMEM. */
cbmem_run_init_hooks();
/* Migrate cache-as-ram variables. */
car_migrate_variables();
}
static inline int cbmem_fail_recovery(void)
{
cbmem_initialize_empty();
cbmem_fail_resume();
/* Migrate cache-as-ram variables. */
car_migrate_variables();
return 1;
}
@ -248,11 +244,9 @@ int cbmem_initialize(void)
root->locked = 1;
#endif
/* Complete migration to CBMEM. */
cbmem_run_init_hooks();
/* Migrate cache-as-ram variables. */
car_migrate_variables();
/* Recovery successful. */
return 0;
}