summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBill Richardson <wfrichar@chromium.org>2015-08-31 12:58:22 -0700
committerchrome-bot <chrome-bot@chromium.org>2015-08-31 17:38:01 -0700
commit0860b19a97605a8672ed057261410cc545f7971e (patch)
tree38967de52b9270cc615616bf35f28c540b455dd4
parent323f5e2ccf7403a03f1251ddce5df2e05e066a34 (diff)
downloadchrome-ec-0860b19a97605a8672ed057261410cc545f7971e.tar.gz
cortex-m: CONFIG_RO_HEAD_ROOM should only affect RO image
When we add head room to the RO image, it's generally to provide a chip-specific boot header of some sort. That header is only needed for the RO image, not the RW image. The macro name implies this, but this CL makes it so. BRANCH=none BUG=chrome-os-partner:43025, chrome-os-partner:44625 TEST=the cr50 image validates *and jumps to* the RW image at boot. Change-Id: I0e5b2c32e232418970e01c7409ddcbbabd4786d5 Signed-off-by: Bill Richardson <wfrichar@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/296451 Reviewed-by: Vadim Bendebury <vbendeb@chromium.org>
-rw-r--r--core/cortex-m/ec.lds.S2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/cortex-m/ec.lds.S b/core/cortex-m/ec.lds.S
index d0b90e5ada..e752fe9df7 100644
--- a/core/cortex-m/ec.lds.S
+++ b/core/cortex-m/ec.lds.S
@@ -68,7 +68,7 @@ SECTIONS
} > SHARED_LIB
#endif
.text : {
-#if defined(CONFIG_RO_HEAD_ROOM)
+#if defined(SECTION_IS_RO) && defined(CONFIG_RO_HEAD_ROOM)
. = . + CONFIG_RO_HEAD_ROOM;
#endif
OUTDIR/core/CORE/init.o (.text.vecttable)