From fb532427163f8262ad5bf69e455366eabe4ea5b2 Mon Sep 17 00:00:00 2001 From: Aaron Durbin Date: Wed, 2 Aug 2017 10:40:25 -0600 Subject: lib/cbmem: remove cbmem_region_used() The cbmem_region_used() function wasn't being utilized outside this module. Threfore, reduce the surface area. Change-Id: I28a9d02221048ab0aa4cd3d986d17ee7692ce636 Signed-off-by: Aaron Durbin Reviewed-on: https://review.coreboot.org/20858 Tested-by: build bot (Jenkins) Reviewed-by: Sumeet R Pawnikar Reviewed-by: Paul Menzel Reviewed-by: Furquan Shaikh --- src/include/cbmem.h | 2 -- src/lib/imd_cbmem.c | 13 +++---------- 2 files changed, 3 insertions(+), 12 deletions(-) diff --git a/src/include/cbmem.h b/src/include/cbmem.h index 68f3615565..b2d2a8be6c 100644 --- a/src/include/cbmem.h +++ b/src/include/cbmem.h @@ -97,8 +97,6 @@ int cbmem_recovery(int s3resume); void *cbmem_add(u32 id, u64 size); /* Find a cbmem entry of a given id. These return NULL on failure. */ void *cbmem_find(u32 id); -/* Get location and size of CBMEM region in memory */ -void cbmem_region_used(uintptr_t *base, size_t *size); /* Indicate to each hook if cbmem is being recovered or not. */ typedef void (* const cbmem_init_hook_t)(int is_recovery); diff --git a/src/lib/imd_cbmem.c b/src/lib/imd_cbmem.c index dc17f05a8d..4fb78cef96 100644 --- a/src/lib/imd_cbmem.c +++ b/src/lib/imd_cbmem.c @@ -266,20 +266,13 @@ void *cbmem_entry_start(const struct cbmem_entry *entry) return imd_entry_at(imd, cbmem_to_imd(entry)); } -void cbmem_region_used(uintptr_t *base, size_t *size) -{ - void *baseptr; - imd_region_used(cbmem_get_imd(), &baseptr, size); - *base = (uintptr_t)baseptr; -} - void cbmem_add_bootmem(void) { - uintptr_t base = 0; + void *baseptr = NULL; size_t size = 0; - cbmem_region_used(&base, &size); - bootmem_add_range(base, size, LB_MEM_TABLE); + imd_region_used(cbmem_get_imd(), &baseptr, &size); + bootmem_add_range((uintptr_t)baseptr, size, LB_MEM_TABLE); } #if ENV_RAMSTAGE || (IS_ENABLED(CONFIG_EARLY_CBMEM_LIST) \ -- cgit v1.2.3