aboutsummaryrefslogtreecommitdiff
path: root/src/arch/x86/memlayout.ld
diff options
context:
space:
mode:
authorAaron Durbin <adurbin@chromium.org>2015-09-15 17:04:13 -0500
committerAaron Durbin <adurbin@chromium.org>2015-09-16 14:11:18 +0000
commit294ce854241db5c50af7ab012f5fdb23b033fabf (patch)
tree1f4c2ac17509803ab0e9d5d7b0d56f59b4d14041 /src/arch/x86/memlayout.ld
parent4be1674d32f7027a69a253704081599463188462 (diff)
x86: remove double link step for romstage
Now that cbfstool supports XIP for romstage utilize it. This removes the double link steps with the cbfstool locate and add-stage sandwich. BUG=chrome-os-partner:44827 BRANCH=None TEST=Built and booted on glados. Change-Id: I1ec555f523a94dd4b15fe8186cbe530520c622c0 Signed-off-by: Aaron Durbin <adurbin@chromium.org> Reviewed-on: http://review.coreboot.org/11670 Tested-by: build bot (Jenkins) Tested-by: Raptor Engineering Automated Test Stand <noreply@raptorengineeringinc.com> Reviewed-by: Patrick Georgi <pgeorgi@google.com>
Diffstat (limited to 'src/arch/x86/memlayout.ld')
-rw-r--r--src/arch/x86/memlayout.ld5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/arch/x86/memlayout.ld b/src/arch/x86/memlayout.ld
index 43c522918f..475f9bc912 100644
--- a/src/arch/x86/memlayout.ld
+++ b/src/arch/x86/memlayout.ld
@@ -33,8 +33,9 @@ SECTIONS
RAMSTAGE(CONFIG_RAMBASE, CONFIG_RAMTOP - CONFIG_RAMBASE)
#elif ENV_ROMSTAGE
- /* The 1M size is not allocated. It's just for basic size checking. */
- ROMSTAGE(ROMSTAGE_BASE, 1M)
+ /* The 1M size is not allocated. It's just for basic size checking.
+ * Link at 32MiB address and rely on cbfstool to relocate to XIP. */
+ ROMSTAGE(32M, 1M)
/* Pull in the cache-as-ram rules. */
#include "car.ld"