summaryrefslogtreecommitdiff
path: root/chip
diff options
context:
space:
mode:
authorJack Rosenthal <jrosenth@chromium.org>2019-07-30 15:45:41 -0600
committerCommit Bot <commit-bot@chromium.org>2019-07-31 18:55:48 +0000
commit3e1c72ea23fe3c37f5a4e4e8bceea38c0322ba31 (patch)
tree3dfe5a8708d231c7b260ec2659d63d0faf2fdc01 /chip
parentb224441aaaa5dd08274811d65bb795b4abc231d8 (diff)
downloadchrome-ec-3e1c72ea23fe3c37f5a4e4e8bceea38c0322ba31.tar.gz
common/system: refactor some confusing ifdefs
I had a hard time reading this section, so figured I may as well rewrite it to use IS_ENABLED while I was here. Gave CONFIG_{RO,RW}_HEAD_ROOM a default value of zero here, which makes the math work out for boards without it anyway. BUG=none BRANCH=none TEST=buildall Change-Id: I87dc2d73838c350088916b57aa51d5f368c5592f Signed-off-by: Jack Rosenthal <jrosenth@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/1727570 Reviewed-by: Denis Brockus <dbrockus@chromium.org>
Diffstat (limited to 'chip')
-rw-r--r--chip/g/config_chip.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/chip/g/config_chip.h b/chip/g/config_chip.h
index 36b88697b1..493cb0eb0f 100644
--- a/chip/g/config_chip.h
+++ b/chip/g/config_chip.h
@@ -29,7 +29,10 @@
#define CONFIG_PROGRAM_MEMORY_BASE 0x40000
#define CONFIG_FLASH_SIZE (512 * 1024)
#define CONFIG_FLASH_ERASED_VALUE32 (-1U)
+
+#undef CONFIG_RO_HEAD_ROOM
#define CONFIG_RO_HEAD_ROOM 1024 /* Room for ROM signature. */
+#undef CONFIG_RW_HEAD_ROOM
#define CONFIG_RW_HEAD_ROOM CONFIG_RO_HEAD_ROOM /* same for RW */
/* Memory-mapped internal flash */