summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMarc Jones <marc.jones@se-eng.com>2012-05-11 13:23:45 -0600
committerPeter Stuge <peter@stuge.se>2012-05-15 07:39:50 +0200
commit762aa3e19992f061696f692645c7f5aa99bddb39 (patch)
tree69fce8e179505967010d5c6bc6486ed36ea43b9d /src
parent49fe74bd693d02211ce6c34225ab142de988c59f (diff)
Change the name of the romstage bootblock.ld
The bootblock.ld linkerscript is used by romstage. Name it accordingly to avoid confusion. Change-Id: I7ca9147bb821fe6f83224d170f5fe25654ef250f Signed-off-by: Marc Jones <marc.jones@se-eng.com> Reviewed-on: http://review.coreboot.org/1031 Reviewed-by: Peter Stuge <peter@stuge.se> Tested-by: build bot (Jenkins)
Diffstat (limited to 'src')
-rw-r--r--src/arch/x86/Makefile.inc2
-rw-r--r--src/arch/x86/init/romstage.ld (renamed from src/arch/x86/init/bootblock.ld)0
2 files changed, 1 insertions, 1 deletions
diff --git a/src/arch/x86/Makefile.inc b/src/arch/x86/Makefile.inc
index b0aaae945c..9739555271 100644
--- a/src/arch/x86/Makefile.inc
+++ b/src/arch/x86/Makefile.inc
@@ -176,7 +176,7 @@ $(objgenerated)/coreboot_ap.o: $(src)/mainboard/$(MAINBOARDDIR)/ap_romstage.c $(
crt0s = $(src)/arch/x86/init/prologue.inc
ldscripts =
-ldscripts += $(src)/arch/x86/init/bootblock.ld
+ldscripts += $(src)/arch/x86/init/romstage.ld
crt0s += $(src)/cpu/x86/32bit/entry32.inc
ldscripts += $(src)/cpu/x86/32bit/entry32.lds
diff --git a/src/arch/x86/init/bootblock.ld b/src/arch/x86/init/romstage.ld
index ca4e820217..ca4e820217 100644
--- a/src/arch/x86/init/bootblock.ld
+++ b/src/arch/x86/init/romstage.ld