From 294ce854241db5c50af7ab012f5fdb23b033fabf Mon Sep 17 00:00:00 2001 From: Aaron Durbin Date: Tue, 15 Sep 2015 17:04:13 -0500 Subject: 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 Reviewed-on: http://review.coreboot.org/11670 Tested-by: build bot (Jenkins) Tested-by: Raptor Engineering Automated Test Stand Reviewed-by: Patrick Georgi --- src/arch/x86/memlayout.ld | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src/arch/x86/memlayout.ld') 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" -- cgit v1.2.3