[PATCH v2 13/32] lmb: remove lmb_init_and_reserve_range() function

[Sughosh Ganu]

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.g...@linaro.org>
Reviewed-by: Ilias Apalodimas <ilias.apalodi...@linaro.org>
Reviewed-by: Tom Rini <tr...@konsulko.com>
Reviewed-by: Simon Glass <s...@chromium.org>
---
Changes since V1: None

 boot/bootm.c  | 15 +--------------
 include/lmb.h |  2 --
 lib/lmb.c     |  8 --------
 3 files changed, 1 insertion(+), 24 deletions(-)

diff --git a/boot/bootm.c b/boot/bootm.c
index e244b9b410..ddede08979 100644
--- a/boot/bootm.c
+++ b/boot/bootm.c
@@ -239,18 +239,7 @@ static int boot_get_kernel(const char *addr_fit, struct 
bootm_headers *images,
        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 @@ static int bootm_start(void)
        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 4a9070799e..f6b2a81546 100644
--- a/include/lmb.h
+++ b/include/lmb.h
@@ -63,8 +63,6 @@ struct lmb {
  */
 int lmb_init(void);
 
-void lmb_init_and_reserve_range(phys_addr_t base, phys_size_t size,
-                               void *fdt_blob);
 long lmb_add(phys_addr_t base, phys_size_t size);
 long lmb_reserve(phys_addr_t base, phys_size_t size);
 /**
diff --git a/lib/lmb.c b/lib/lmb.c
index f803b5f63f..3ccee26a46 100644
--- a/lib/lmb.c
+++ b/lib/lmb.c
@@ -225,14 +225,6 @@ static void lmb_reserve_common(void *fdt_blob)
                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 long lmb_resize_regions(struct alist *lmb_rgn_lst,
                               unsigned long idx_start,
                               phys_addr_t base, phys_size_t size)
-- 
2.34.1