From: Simon Glass <sjg@chromium.org> This fix turns out to be insufficient in the corner case where mon_len is smaller than available, emulated RAM but large enough that there isn't enough left. This reverts commit 88b810e241e7d1ccdf1d7329339cf5d5d9cef474. Signed-off-by: Simon Glass <sjg@chromium.org> --- common/board_f.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/common/board_f.c b/common/board_f.c index ef8b0ff7ef1..e23134a8403 100644 --- a/common/board_f.c +++ b/common/board_f.c @@ -464,11 +464,7 @@ static int reserve_uboot(void) * reserve memory for U-Boot code, data & bss * round down to next 4 kB limit */ - if (IS_ENABLED(CONFIG_SANDBOX) && gd->mon_len > gd->relocaddr) - log_debug("Cannot reserve space for U-Boot\n"); - else - gd->relocaddr -= gd->mon_len; - + gd->relocaddr -= gd->mon_len; gd->relocaddr &= ~(4096 - 1); #if defined(CONFIG_E500) || defined(CONFIG_MIPS) /* round down to next 64 kB limit so that IVPR stays aligned */ -- 2.43.0 base-commit: ec32a6ef1554369aa114c2c032fb9e72460fd192 branch: ulig