[coreboot-gerrit] Patch set updated for coreboot: d73f8ba CBMEM: Drop parameters from cbmem_init()

[Kyösti Mälkki (kyosti.malkki@gmail.com)]

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/3565

-gerrit

commit d73f8bacafcc00606138498e0af256cf25f545ca
Author: Kyösti Mälkki <kyosti.malkki at gmail.com>
Date:   Wed Sep 4 14:36:31 2013 +0300

    CBMEM: Drop parameters from cbmem_init()
    
    The parameters can be dropped as initialisation always happens for
    the region resolved with cbmem_locate_table().
    
    This is no longer referenced externally, make it static.
    
    Change-Id: Ia40350a5232dcbf30aca7b5998e7995114c44551
    Signed-off-by: Kyösti Mälkki <kyosti.malkki at gmail.com>
---
 src/include/cbmem.h |  1 -
 src/lib/cbmem.c     | 17 +++++++++--------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/include/cbmem.h b/src/include/cbmem.h
index 04ecde2..83ccd1b 100644
--- a/src/include/cbmem.h
+++ b/src/include/cbmem.h
@@ -137,7 +137,6 @@ void cbmem_late_set_table(uint64_t base, uint64_t size);
 int cbmem_base_check(void);
 #endif
 
-void cbmem_init(u64 baseaddr, u64 size);
 int cbmem_reinit(void);
 
 void get_cbmem_table(uint64_t *base, uint64_t *size);
diff --git a/src/lib/cbmem.c b/src/lib/cbmem.c
index d7f866b..a394f31 100644
--- a/src/lib/cbmem.c
+++ b/src/lib/cbmem.c
@@ -95,13 +95,16 @@ void cbmem_late_set_table(uint64_t base, uint64_t size)
  *  - suspend/resume backup memory
  */
 
-void cbmem_init(u64 baseaddr, u64 size)
+#if CONFIG_EARLY_CBMEM_INIT || !defined(__PRE_RAM__)
+static void cbmem_init(void)
 {
+	uint64_t baseaddr, size;
 	struct cbmem_entry *cbmem_toc;
-	cbmem_toc = (struct cbmem_entry *)(unsigned long)baseaddr;
 
-	printk(BIOS_DEBUG, "Initializing CBMEM area to 0x%llx (%lld bytes)\n",
-	       baseaddr, size);
+	cbmem_locate_table(&baseaddr, &size);
+	cbmem_trace_location(baseaddr, size, __FUNCTION__);
+
+	cbmem_toc = (struct cbmem_entry *)(unsigned long)baseaddr;
 
 	if (size < (64 * 1024)) {
 		printk(BIOS_DEBUG, "Increase CBMEM size!\n");
@@ -117,6 +120,7 @@ void cbmem_init(u64 baseaddr, u64 size)
 		.size	= size - CBMEM_TOC_RESERVED
 	};
 }
+#endif
 
 int cbmem_reinit(void)
 {
@@ -220,11 +224,8 @@ void *cbmem_find(u32 id)
 /* Returns True if it was not initialized before. */
 int cbmem_initialize(void)
 {
-	uint64_t base = 0, size = 0;
 	int rv = 0;
 
-	cbmem_locate_table(&base, &size);
-
 	/* We expect the romstage to always initialize it. */
 	if (!cbmem_reinit()) {
 #if CONFIG_HAVE_ACPI_RESUME && !defined(__PRE_RAM__)
@@ -232,7 +233,7 @@ int cbmem_initialize(void)
 		if (acpi_slp_type == 3 || acpi_slp_type == 2)
 			acpi_slp_type = 0;
 #endif
-		cbmem_init(base, size);
+		cbmem_init();
 		rv = 1;
 	}
 #ifndef __PRE_RAM__