summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKyösti Mälkki <kyosti.malkki@gmail.com>2014-01-04 08:46:32 +0200
committerKyösti Mälkki <kyosti.malkki@gmail.com>2014-01-22 21:38:57 +0100
commitd1443aa60bfab1e00523731f20608f4cae04193b (patch)
tree785b779c0a2b45ba38155d77db7dc0c68a2dc8c0
parent6f1d26e25839ffddd89843ac631b1e2a892bc72f (diff)
downloadcoreboot-d1443aa60bfab1e00523731f20608f4cae04193b.tar.xz
CBMEM: Rename cbmem_reinit()
This function does not really initialize anything, but only checks for the TOC. Change-Id: I9d100d1823a0b630f5d1175e42a6a15f45266de4 Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com> Reviewed-on: http://review.coreboot.org/4669 Tested-by: build bot (Jenkins) Reviewed-by: Aaron Durbin <adurbin@google.com>
-rw-r--r--src/include/cbmem.h2
-rw-r--r--src/lib/cbmem.c4
2 files changed, 2 insertions, 4 deletions
diff --git a/src/include/cbmem.h b/src/include/cbmem.h
index eff18956cc..9e894a9494 100644
--- a/src/include/cbmem.h
+++ b/src/include/cbmem.h
@@ -145,8 +145,6 @@ void backup_top_of_ram(uint64_t ramtop);
void cbmem_late_set_table(uint64_t base, uint64_t size);
#endif
-int cbmem_reinit(void);
-
void get_cbmem_table(uint64_t *base, uint64_t *size);
struct cbmem_entry *get_cbmem_toc(void);
diff --git a/src/lib/cbmem.c b/src/lib/cbmem.c
index 05f195a43b..d97f6afdb0 100644
--- a/src/lib/cbmem.c
+++ b/src/lib/cbmem.c
@@ -119,7 +119,7 @@ static void cbmem_initialize_empty(void)
};
}
-int cbmem_reinit(void)
+static int cbmem_check_toc(void)
{
uint64_t baseaddr, size;
struct cbmem_entry *cbmem_toc;
@@ -220,7 +220,7 @@ void *cbmem_find(u32 id)
/* Returns True if it was not initialized before. */
int cbmem_recovery(int is_wakeup)
{
- int found = cbmem_reinit();
+ int found = cbmem_check_toc();
int wipe = 0;
/* CBMEM TOC is wiped clean when we are not waking up from S3