From ea9f30801822716349772157e12d943b11975521 Mon Sep 17 00:00:00 2001 From: Patrick Georgi Date: Fri, 27 Mar 2015 13:50:11 +0100 Subject: build system: normalize linker script file names We have .lb, .lds, and .ld in the tree. Go for .ld everywhere. This is inspired by the commit listed below, but rewritten to match upstream, and split in smaller pieces to keep intent clear. Change-Id: I3126af608afe4937ec4551a78df5a7824e09b04b Signed-off-by: Patrick Georgi Based-On-Change-Id: I50af7dacf616e0f8ff4c43f4acc679089ad7022b Based-On-Signed-off-by: Julius Werner Based-On-Reviewed-on: https://chromium-review.googlesource.com/219170 Reviewed-on: http://review.coreboot.org/9107 Tested-by: build bot (Jenkins) Reviewed-by: Stefan Reinauer Reviewed-by: Paul Menzel --- src/cpu/x86/16bit/entry16.ld | 2 ++ src/cpu/x86/16bit/entry16.lds | 2 -- src/cpu/x86/16bit/reset16.ld | 16 ++++++++++++++++ src/cpu/x86/16bit/reset16.lds | 16 ---------------- 4 files changed, 18 insertions(+), 18 deletions(-) create mode 100644 src/cpu/x86/16bit/entry16.ld delete mode 100644 src/cpu/x86/16bit/entry16.lds create mode 100644 src/cpu/x86/16bit/reset16.ld delete mode 100644 src/cpu/x86/16bit/reset16.lds (limited to 'src/cpu/x86/16bit') diff --git a/src/cpu/x86/16bit/entry16.ld b/src/cpu/x86/16bit/entry16.ld new file mode 100644 index 0000000000..112d429953 --- /dev/null +++ b/src/cpu/x86/16bit/entry16.ld @@ -0,0 +1,2 @@ + gdtptr16_offset = gdtptr16 & 0xffff; + nullidt_offset = nullidt & 0xffff; diff --git a/src/cpu/x86/16bit/entry16.lds b/src/cpu/x86/16bit/entry16.lds deleted file mode 100644 index 112d429953..0000000000 --- a/src/cpu/x86/16bit/entry16.lds +++ /dev/null @@ -1,2 +0,0 @@ - gdtptr16_offset = gdtptr16 & 0xffff; - nullidt_offset = nullidt & 0xffff; diff --git a/src/cpu/x86/16bit/reset16.ld b/src/cpu/x86/16bit/reset16.ld new file mode 100644 index 0000000000..a31a580d12 --- /dev/null +++ b/src/cpu/x86/16bit/reset16.ld @@ -0,0 +1,16 @@ +/* + * _ROMTOP : The top of the rom used where we + * need to put the reset vector. + */ + +SECTIONS { + /* Trigger an error if I have an unuseable start address */ + _bogus = ASSERT(_start >= 0xffff0000, "_start too low. Please report."); + _ROMTOP = 0xfffffff0; + . = _ROMTOP; + .reset . : { + *(.reset) + . = 15 ; + BYTE(0x00); + } +} diff --git a/src/cpu/x86/16bit/reset16.lds b/src/cpu/x86/16bit/reset16.lds deleted file mode 100644 index a31a580d12..0000000000 --- a/src/cpu/x86/16bit/reset16.lds +++ /dev/null @@ -1,16 +0,0 @@ -/* - * _ROMTOP : The top of the rom used where we - * need to put the reset vector. - */ - -SECTIONS { - /* Trigger an error if I have an unuseable start address */ - _bogus = ASSERT(_start >= 0xffff0000, "_start too low. Please report."); - _ROMTOP = 0xfffffff0; - . = _ROMTOP; - .reset . : { - *(.reset) - . = 15 ; - BYTE(0x00); - } -} -- cgit v1.2.3