diff options
| author | Ashok Reddy Soma <ashok.reddy.soma@xilinx.com> | 2022-07-07 10:45:37 +0200 |
|---|---|---|
| committer | Michal Simek <michal.simek@amd.com> | 2022-07-26 08:23:54 +0200 |
| commit | 65168910adaae3a4ac91fd5acf30941a28facc0e (patch) | |
| tree | f358cb9e735ce8793b4c612fd605d1b84bfd1556 /arch/x86 | |
| parent | 7c1860fce4e369bdcabc1f574feb6b9af19999a3 (diff) | |
| download | u-boot-65168910adaae3a4ac91fd5acf30941a28facc0e.zip u-boot-65168910adaae3a4ac91fd5acf30941a28facc0e.tar.gz u-boot-65168910adaae3a4ac91fd5acf30941a28facc0e.tar.bz2 | |
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 <ashok.reddy.soma@xilinx.com>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
Signed-off-by: Michal Simek <michal.simek@amd.com>
Link: https://lore.kernel.org/r/75e52def75f573e554a6b177a78504c128cb0c4a.1657183534.git.michal.simek@amd.com
Diffstat (limited to 'arch/x86')
| -rw-r--r-- | arch/x86/lib/bootm.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/x86/lib/bootm.c b/arch/x86/lib/bootm.c index 57cba5c..1bcdb3e 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)) { |