lmb: remove lmb_init_and_reserve_range() function
With the move to make the LMB allocations persistent and the common
memory regions being reserved during board init, there is no need for
an explicit reservation of a memory range. Remove the
lmb_init_and_reserve_range() function.
Signed-off-by: Sughosh Ganu <sughosh.ganu@linaro.org>
Reviewed-by: Ilias Apalodimas <ilias.apalodimas@linaro.org>
Reviewed-by: Tom Rini <trini@konsulko.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
diff --git a/boot/bootm.c b/boot/bootm.c
index e244b9b..ddede08 100644
--- a/boot/bootm.c
+++ b/boot/bootm.c
@@ -239,18 +239,7 @@
return 0;
}
-#if CONFIG_IS_ENABLED(LMB)
-static void boot_start_lmb(void)
-{
- phys_addr_t mem_start;
- phys_size_t mem_size;
-
- mem_start = env_get_bootm_low();
- mem_size = env_get_bootm_size();
-
- lmb_init_and_reserve_range(mem_start, mem_size, NULL);
-}
-#else
+#if !CONFIG_IS_ENABLED(LMB)
#define lmb_reserve(base, size)
static inline void boot_start_lmb(void) { }
#endif
@@ -260,8 +249,6 @@
memset((void *)&images, 0, sizeof(images));
images.verify = env_get_yesno("verify");
- boot_start_lmb();
-
bootstage_mark_name(BOOTSTAGE_ID_BOOTM_START, "bootm_start");
images.state = BOOTM_STATE_START;
diff --git a/include/lmb.h b/include/lmb.h
index 0455872..2f155d7 100644
--- a/include/lmb.h
+++ b/include/lmb.h
@@ -63,9 +63,6 @@
*/
int lmb_init(void);
-void lmb_init_and_reserve_range(phys_addr_t base, phys_size_t size,
- void *fdt_blob);
-
/**
* lmb_add_memory() - Add memory range for LMB allocations
*
diff --git a/lib/lmb.c b/lib/lmb.c
index de4d0d1..686988e 100644
--- a/lib/lmb.c
+++ b/lib/lmb.c
@@ -227,14 +227,6 @@
efi_lmb_reserve();
}
-/* Initialize the struct, add memory and call arch/board reserve functions */
-void lmb_init_and_reserve_range(phys_addr_t base, phys_size_t size,
- void *fdt_blob)
-{
- lmb_add(base, size);
- lmb_reserve_common(fdt_blob);
-}
-
static __maybe_unused void lmb_reserve_common_spl(void)
{
phys_addr_t rsv_start;