[coreboot-gerrit] Change in coreboot[master]: lib/program.ld: Guard .id section placement

[Nico Huber (Code Review)]

Nico Huber has uploaded this change for review. ( https://review.coreboot.org/20810


Change subject: lib/program.ld: Guard .id section placement
......................................................................

lib/program.ld: Guard .id section placement

For x86, we place the .id section at 4GiB - CONFIG_ID_SECTION_OFFSET.
To take effect, we have to guard the conflicting default placement in
`program.ld`. Also, as we only include the .id section into the boot-
block, guard it by ENV_BOOTBLOCK too.

Change-Id: Idc7cbd670ce4f75b7790ff8d95578683e355ba7e
Signed-off-by: Nico Huber <nico.h at gmx.de>
---
M src/lib/program.ld
1 file changed, 3 insertions(+), 0 deletions(-)



  git pull ssh://review.coreboot.org:29418/coreboot refs/changes/10/20810/1

diff --git a/src/lib/program.ld b/src/lib/program.ld
index 1526aad..668b29b 100644
--- a/src/lib/program.ld
+++ b/src/lib/program.ld
@@ -34,7 +34,10 @@
 	*(.rom.data);
 	*(.text._start);
 	*(.text.stage_entry);
+#if ENV_BOOTBLOCK && !(IS_ENABLED(CONFIG_ARCH_BOOTBLOCK_X86_32) || \
+		       IS_ENABLED(CONFIG_ARCH_BOOTBLOCK_X86_64))
 	KEEP(*(.id));
+#endif
 	*(.text);
 	*(.text.*);
 

-- 
To view, visit https://review.coreboot.org/20810
To unsubscribe, visit https://review.coreboot.org/settings

Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: Idc7cbd670ce4f75b7790ff8d95578683e355ba7e
Gerrit-Change-Number: 20810
Gerrit-PatchSet: 1
Gerrit-Owner: Nico Huber <nico.h at gmx.de>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.coreboot.org/pipermail/coreboot-gerrit/attachments/20170728/1cef725d/attachment.html>