summaryrefslogtreecommitdiff
path: root/core
diff options
context:
space:
mode:
authorMary Ruthven <mruthven@chromium.org>2021-11-09 13:44:44 -0600
committerCommit Bot <commit-bot@chromium.org>2021-11-18 04:46:43 +0000
commit16b414e7b7617ca4cb58880b41c410891b8c0c48 (patch)
tree8b05d6105d8950782cc395bf97a69c37e185a822 /core
parent6a6594031f47d462c6c319283752e715a358c6b5 (diff)
downloadchrome-ec-16b414e7b7617ca4cb58880b41c410891b8c0c48.tar.gz
Revert "common/system: refactor some confusing ifdefs"
This reverts commit 3e1c72ea23fe3c37f5a4e4e8bceea38c0322ba31. BUG=b:200823466 TEST=make buildall -j Change-Id: I172b5fd55529754d913f4d18258beccac0bade58 Signed-off-by: Mary Ruthven <mruthven@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3273364 Reviewed-by: Vadim Sukhomlinov <sukhomlinov@chromium.org>
Diffstat (limited to 'core')
-rw-r--r--core/cortex-m/ec.lds.S4
1 files changed, 2 insertions, 2 deletions
diff --git a/core/cortex-m/ec.lds.S b/core/cortex-m/ec.lds.S
index 91b7df3bc0..0e712f7e9c 100644
--- a/core/cortex-m/ec.lds.S
+++ b/core/cortex-m/ec.lds.S
@@ -85,10 +85,10 @@ SECTIONS
} > SHARED_LIB
#endif
.text : {
-#ifdef SECTION_IS_RO
+#if defined(SECTION_IS_RO) && defined(CONFIG_RO_HEAD_ROOM)
. = . + CONFIG_RO_HEAD_ROOM;
#endif
-#ifdef SECTION_IS_RW
+#if defined(SECTION_IS_RW) && defined(CONFIG_RW_HEAD_ROOM)
. = . + CONFIG_RW_HEAD_ROOM;
#endif
*(.text.vecttable)