From: Patrice Chotard <patrice.chotard@st.com>
Date: Thu, 13 Feb 2020 18:29:50 +0000 (+0100)
Subject: ARM: bootm: take into account gd->ram_top
X-Git-Tag: v2020.07-rc1~27^2~24
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=8ce1f10cf2b139258c890774f263bec55c4df8ce;p=oweals%2Fu-boot.git

ARM: bootm: take into account gd->ram_top

If gd->ram_top has been tuned using board_get_usable_ram_top(),
it must be taken into account when reserving arch lmb.

Signed-off-by: Patrice Chotard <patrice.chotard@st.com>
Reviewed-by: Patrick DELAUNAY <patrick.delaunay@st.com>
Signed-off-by: Patrick Delaunay <patrick.delaunay@st.com>
---

diff --git a/arch/arm/lib/bootm.c b/arch/arm/lib/bootm.c
index a135bcfc7b..f4b5ca6de0 100644
--- a/arch/arm/lib/bootm.c
+++ b/arch/arm/lib/bootm.c
@@ -75,6 +75,9 @@ void arch_lmb_reserve(struct lmb *lmb)
 			gd->bd->bi_dram[bank].size - 1;
 		if (sp > bank_end)
 			continue;
+		if (bank_end > gd->ram_top)
+			bank_end = gd->ram_top - 1;
+
 		lmb_reserve(lmb, sp, bank_end - sp + 1);
 		break;
 	}