summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPatrick Georgi <pgeorgi@chromium.org>2015-04-03 10:12:40 +0200
committerStefan Reinauer <stefan.reinauer@coreboot.org>2015-04-04 00:41:35 +0200
commitf1df82a458abfde8aa6d5d72c5f09c98870b0226 (patch)
treed463d6996a534ef618e030d466d963e588504d92
parent604fe254c9c94179f36b6a801666c9dcaaf0c2aa (diff)
x86: rename ldscript_failover.ld to failover.ld
The ldscript_ prefix is redundant. This is inspired by the commit listed below, but rewritten to match upstream, and split in smaller pieces to keep intent clear. Change-Id: I0f005c0c2abe2fdd6911a2c579cb7ec49ae5c0b7 Signed-off-by: Patrick Georgi <pgeorgi@chromium.org> Based-On-Change-Id: I50af7dacf616e0f8ff4c43f4acc679089ad7022b Based-On-Signed-off-by: Julius Werner <jwerner@chromium.org> Based-On-Reviewed-on: https://chromium-review.googlesource.com/219170 Reviewed-on: http://review.coreboot.org/9284 Tested-by: build bot (Jenkins) Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net> Reviewed-by: Aaron Durbin <adurbin@google.com>
-rw-r--r--src/arch/x86/Makefile.inc2
-rw-r--r--src/arch/x86/init/failover.ld (renamed from src/arch/x86/init/ldscript_failover.ld)0
2 files changed, 1 insertions, 1 deletions
diff --git a/src/arch/x86/Makefile.inc b/src/arch/x86/Makefile.inc
index 8e6ad6d932..fe92a22723 100644
--- a/src/arch/x86/Makefile.inc
+++ b/src/arch/x86/Makefile.inc
@@ -73,7 +73,7 @@ endif
ifeq ($(CONFIG_ARCH_BOOTBLOCK_X86_32),y)
-bootblock_lds = $(src)/arch/x86/init/ldscript_failover.ld
+bootblock_lds = $(src)/arch/x86/init/failover.ld
bootblock_lds += $(src)/cpu/x86/16bit/entry16.ld
bootblock_lds += $(src)/cpu/x86/16bit/reset16.ld
bootblock_lds += $(src)/arch/x86/lib/id.ld
diff --git a/src/arch/x86/init/ldscript_failover.ld b/src/arch/x86/init/failover.ld
index 318f4299b3..318f4299b3 100644
--- a/src/arch/x86/init/ldscript_failover.ld
+++ b/src/arch/x86/init/failover.ld