[coreboot-gerrit] New patch to review for coreboot: bc0fc33 CBMEM: Rename cbmem_reinit()

Kyösti Mälkki (kyosti.malkki@gmail.com) gerrit at coreboot.org
Sat Jan 11 20:56:32 CET 2014


Kyösti Mälkki (kyosti.malkki at gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/4669

-gerrit

commit bc0fc33fc27d3b83f2dd0d0c59fd1b30facb257d
Author: Kyösti Mälkki <kyosti.malkki at gmail.com>
Date:   Sat Jan 4 08:46:32 2014 +0200

    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 at gmail.com>
---
 src/include/cbmem.h | 2 --
 src/lib/cbmem.c     | 4 ++--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/include/cbmem.h b/src/include/cbmem.h
index eff1895..9e894a9 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 704733f..5fe8216 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;
 
 #if defined(__PRE_RAM__) && CONFIG_EARLY_CBMEM_INIT



More information about the coreboot-gerrit mailing list