summaryrefslogtreecommitdiff
path: root/src/lib
diff options
context:
space:
mode:
authorKyösti Mälkki <kyosti.malkki@gmail.com>2014-12-31 20:55:19 +0200
committerKyösti Mälkki <kyosti.malkki@gmail.com>2015-01-27 22:47:35 +0100
commit91fac61240612291f7be3362f7acad31803e8b03 (patch)
tree31c604a58e7b389b45d2f397eb7b37171c45dcc8 /src/lib
parent3bf38548474697d11c935f23a610222c36df90c0 (diff)
downloadcoreboot-91fac61240612291f7be3362f7acad31803e8b03.tar.xz
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)
Diffstat (limited to 'src/lib')
-rw-r--r--src/lib/cbmem.c3
-rw-r--r--src/lib/dynamic_cbmem.c10
2 files changed, 4 insertions, 9 deletions
diff --git a/src/lib/cbmem.c b/src/lib/cbmem.c
index ba6560c499..d5f89a188d 100644
--- a/src/lib/cbmem.c
+++ b/src/lib/cbmem.c
@@ -242,8 +242,9 @@ int cbmem_recovery(int is_wakeup)
cbmem_fail_resume();
}
+ /* Complete migration to CBMEM. */
cbmem_run_init_hooks();
- car_migrate_variables();
+
return !found;
}
diff --git a/src/lib/dynamic_cbmem.c b/src/lib/dynamic_cbmem.c
index a5f2fc2db6..6455217760 100644
--- a/src/lib/dynamic_cbmem.c
+++ b/src/lib/dynamic_cbmem.c
@@ -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;
}