From 65168910adaae3a4ac91fd5acf30941a28facc0e Mon Sep 17 00:00:00 2001 From: Ashok Reddy Soma Date: Thu, 7 Jul 2022 10:45:37 +0200 Subject: zynqmp: Run board_get_usable_ram_top() only on main U-Boot With commit ce39ee28ec31 ("zynqmp: Do not place u-boot to reserved memory location"), the function board_get_usable_ram_top() is allocating MMU_SECTION_SIZE of about 2MB using lmb_alloc(). But we dont have this much memory in case of mini U-Boot. Keep these functions which use lmb under CONFIG_LMB so that they are compiled and used only when LMB is enabled. Signed-off-by: Ashok Reddy Soma Signed-off-by: Michal Simek Signed-off-by: Michal Simek Link: https://lore.kernel.org/r/75e52def75f573e554a6b177a78504c128cb0c4a.1657183534.git.michal.simek@amd.com --- arch/x86/lib/bootm.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'arch/x86') diff --git a/arch/x86/lib/bootm.c b/arch/x86/lib/bootm.c index 57cba5c65d..1bcdb3e30d 100644 --- a/arch/x86/lib/bootm.c +++ b/arch/x86/lib/bootm.c @@ -78,15 +78,14 @@ static int boot_prep_linux(bootm_headers_t *images) size_t len; int ret; -#ifdef CONFIG_OF_LIBFDT - if (images->ft_len) { + if (CONFIG_IS_ENABLED(OF_LIBFDT) && CONFIG_IS_ENABLED(LMB) && images->ft_len) { debug("using: FDT\n"); if (image_setup_linux(images)) { puts("FDT creation failed! hanging..."); hang(); } } -#endif + if (images->legacy_hdr_valid) { hdr = images->legacy_hdr_os; if (image_check_type(hdr, IH_TYPE_MULTI)) { -- cgit v1.2.3