summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKyösti Mälkki <kyosti.malkki@gmail.com>2018-06-03 14:18:23 +0300
committerPatrick Georgi <pgeorgi@google.com>2018-06-06 10:36:04 +0000
commitd30c129ad44aacf4cccf98a7cac353b7f9fdedca (patch)
treedb9078cb0a86809eb50a419743cf28b0a5f8d668
parent39d0e2a2cf45e28cdddd0fe0c88f94ce527ab1ef (diff)
downloadcoreboot-d30c129ad44aacf4cccf98a7cac353b7f9fdedca.tar.xz
arch/x86: Use fixed size limit with RELOCATABLE_RAMSTAGE
With RELOCATABLE_RAMSTAGE, variables RAMBASE and RAMTOP have no meaning any more. Change-Id: I711fe98a399177c2d3cb2a9dcdefba61031fb76d Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com> Reviewed-on: https://review.coreboot.org/26812 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Aaron Durbin <adurbin@chromium.org>
-rw-r--r--src/arch/x86/memlayout.ld3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/arch/x86/memlayout.ld b/src/arch/x86/memlayout.ld
index e6db0b8fe6..5831723466 100644
--- a/src/arch/x86/memlayout.ld
+++ b/src/arch/x86/memlayout.ld
@@ -26,7 +26,8 @@ SECTIONS
* conditionalize with macros.
*/
#if ENV_RAMSTAGE
- RAMSTAGE(CONFIG_RAMBASE, CONFIG_RAMTOP - CONFIG_RAMBASE)
+ RAMSTAGE(CONFIG_RAMBASE, (CONFIG_RELOCATABLE_RAMSTAGE ? 8M :
+ CONFIG_RAMTOP - CONFIG_RAMBASE))
#elif ENV_ROMSTAGE
/* The 1M size is not allocated. It's just for basic size checking.