summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGabe Black <gabeblack@chromium.org>2013-07-01 05:03:47 -0700
committerRonald G. Minnich <rminnich@gmail.com>2013-07-15 18:33:41 +0200
commit978c21512751c50ad92d459cbca39d98d9fc39a9 (patch)
treeb3188c219b61b65c25929c53e9eade9e7505d1cc
parentc392b6477f656331c7e19b22f6eb240cdd5465a1 (diff)
downloadcoreboot-978c21512751c50ad92d459cbca39d98d9fc39a9.tar.xz
ARM: Define custom ELF headers for ARM.
At least when building with the gnu toolchain, the headers the linker automatically generate save space for the actual ELF headers in one of the loadable segments. This creates two problems. First, the data you intended to be at the start of the image doesn't actually show up there, it's actually the ELF headers. Second, the ELF headers are essentially useless for firmware since there's currently nothing to tell you where they are, and even if there was, there isn't much of a reason to look at them. They're useful in userspace for, for instance, the dynamic linker, but not really in firmware. This change adds a PHDRS construct to each of the linker scripts used on ARM which define a single segment called to_load which does not have the flag set which would tell the linker to put headers in it. The first section defined in the script has ": to_load" to tell the linker which segment to put it in, and from that point on the other sections go in there by default. Change-Id: I24b721eb436d17afd234002ae82f9166d2fcf65d Signed-off-by: Gabe Black <gabeblack@chromium.org> Reviewed-on: http://review.coreboot.org/3580 Tested-by: build bot (Jenkins) Reviewed-by: Ronald G. Minnich <rminnich@gmail.com>
-rw-r--r--src/arch/armv7/bootblock.lds7
-rw-r--r--src/arch/armv7/coreboot_ram.ld7
-rw-r--r--src/arch/armv7/romstage.ld7
3 files changed, 18 insertions, 3 deletions
diff --git a/src/arch/armv7/bootblock.lds b/src/arch/armv7/bootblock.lds
index 837039653b..f16e72b858 100644
--- a/src/arch/armv7/bootblock.lds
+++ b/src/arch/armv7/bootblock.lds
@@ -22,6 +22,11 @@
OUTPUT_FORMAT("elf32-littlearm", "elf32-littlearm", "elf32-littlearm")
OUTPUT_ARCH(arm)
+PHDRS
+{
+ to_load PT_LOAD;
+}
+
TARGET(binary)
SECTIONS
{
@@ -39,7 +44,7 @@ SECTIONS
*(.rom.data.*);
*(.rodata.*);
_erom = .;
- } = 0xff
+ } : to_load = 0xff
/DISCARD/ : {
*(.comment)
diff --git a/src/arch/armv7/coreboot_ram.ld b/src/arch/armv7/coreboot_ram.ld
index 487f610b84..38eaca3667 100644
--- a/src/arch/armv7/coreboot_ram.ld
+++ b/src/arch/armv7/coreboot_ram.ld
@@ -24,6 +24,11 @@ INCLUDE ldoptions
ENTRY(stage_entry)
+PHDRS
+{
+ to_load PT_LOAD;
+}
+
SECTIONS
{
. = CONFIG_SYS_SDRAM_BASE;
@@ -38,7 +43,7 @@ SECTIONS
*(.text.*);
. = ALIGN(16);
_etext = .;
- }
+ } : to_load
.ctors : {
. = ALIGN(0x100);
diff --git a/src/arch/armv7/romstage.ld b/src/arch/armv7/romstage.ld
index 568ac1aa94..0555fc45ff 100644
--- a/src/arch/armv7/romstage.ld
+++ b/src/arch/armv7/romstage.ld
@@ -30,6 +30,11 @@ OUTPUT_ARCH(arm)
ENTRY(stage_entry)
+PHDRS
+{
+ to_load PT_LOAD;
+}
+
SECTIONS
{
/* TODO make this a configurable option (per chipset). */
@@ -41,7 +46,7 @@ SECTIONS
*(.text.stage_entry.armv7);
*(.text.startup);
*(.text);
- }
+ } : to_load
.romdata . : {
*(.rodata);