From 14714e1303a420f9e0bf0bb5bba2efaae2c52efb Mon Sep 17 00:00:00 2001 From: Aaron Durbin Date: Fri, 4 Sep 2015 12:06:05 -0500 Subject: x86: link romstage like the other architectures All the other architectures are using the memlayout for linking romstage. Use that same method on x86 as well for consistency. BUG=chrome-os-partner:44827 BRANCH=None TEST=Built a myriad of boards. Analyzed readelf output. Change-Id: I016666c4b01410df112e588c2949e3fc64540c2e Signed-off-by: Aaron Durbin Reviewed-on: http://review.coreboot.org/11510 Tested-by: build bot (Jenkins) Tested-by: Raptor Engineering Automated Test Stand Reviewed-by: Patrick Georgi --- src/lib/Makefile.inc | 4 ++-- src/lib/program.ld | 6 ++++++ 2 files changed, 8 insertions(+), 2 deletions(-) (limited to 'src/lib') diff --git a/src/lib/Makefile.inc b/src/lib/Makefile.inc index 4aa6bf8392..464d631aab 100644 --- a/src/lib/Makefile.inc +++ b/src/lib/Makefile.inc @@ -192,12 +192,12 @@ smm-y += halt.c secmon-y += halt.c ifneq ($(CONFIG_ARCH_X86),y) -# X86 bootblock and romstage use custom ldscripts that are all glued together, +# X86 bootblock uses custom ldscripts that are all glued together, # so we need to exclude it here or it would pick these up as well bootblock-y += program.ld -romstage-y += program.ld endif +romstage-y += program.ld ramstage-y += program.ld ifeq ($(CONFIG_RELOCATABLE_MODULES),y) diff --git a/src/lib/program.ld b/src/lib/program.ld index 1346eafbf8..cf011e9b08 100644 --- a/src/lib/program.ld +++ b/src/lib/program.ld @@ -27,6 +27,12 @@ .text : { _program = .; _text = .; + /* + * The .rom.* sections are to acommodate x86 romstage. romcc as well + * as the assembly files put their text and data in these sections. + */ + *(.rom.text); + *(.rom.data); *(.text._start); *(.text.stage_entry); *(.text); -- cgit v1.2.3