colin/u-boot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

lmb: remove lmb_init_and_reserve_range() function

Browse Source 
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>
This commit is contained in:
Sughosh Ganu
2024-08-26 17:29:26 +05:30
committed by Tom Rini
parent c7ce26cb36
commit 30ffdd61de
3 changed files with 1 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
boot/bootm.c
View File

@@ -239,18 +239,7 @@ static int boot_get_kernel(const char *addr_fit, struct bootm_headers *images,
return 0; return 0;
} }
#if CONFIG_IS_ENABLED(LMB) #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
#define lmb_reserve(base, size) #define lmb_reserve(base, size)
static inline void boot_start_lmb(void) { } static inline void boot_start_lmb(void) { }
#endif #endif
@@ -260,8 +249,6 @@ static int bootm_start(void)
memset((void *)&images, 0, sizeof(images)); memset((void *)&images, 0, sizeof(images));
images.verify = env_get_yesno("verify"); images.verify = env_get_yesno("verify");
boot_start_lmb();
bootstage_mark_name(BOOTSTAGE_ID_BOOTM_START, "bootm_start"); bootstage_mark_name(BOOTSTAGE_ID_BOOTM_START, "bootm_start");
images.state = BOOTM_STATE_START; images.state = BOOTM_STATE_START;

3
include/lmb.h
View File

@@ -63,9 +63,6 @@ struct lmb {
*/ */
int lmb_init(void); 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 * lmb_add_memory() - Add memory range for LMB allocations
* *

8
lib/lmb.c
View File

@@ -227,14 +227,6 @@ static void lmb_reserve_common(void *fdt_blob)
efi_lmb_reserve(); 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) static __maybe_unused void lmb_reserve_common_spl(void)
{ {
phys_addr_t rsv_start; phys_addr_t rsv_start;