summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon Glass <sjg@chromium.org>2021-02-18 14:43:54 -0700
committerCommit Bot <commit-bot@chromium.org>2021-02-19 16:27:16 +0000
commit5ea4311b70f6e13aae7d5620fe2e1cf54b8356e2 (patch)
treecf3e5e66f6cafe3f8f3c5e1def59ebb85ebfaee9
parent3b22d002ef2cc59b32f6ce629d67831402de6600 (diff)
downloadchrome-ec-5ea4311b70f6e13aae7d5620fe2e1cf54b8356e2.tar.gz
zephyr: Drop duplicate IS_BIT_SET()
This gives a warning about a duplicate definition since it is defined in Zephyr now. BUG=b:180409973 BRANCH=none TEST=warning is gone Change-Id: I6d7a7b5f344bf6ab4168a2dee062c9199175faf9 Signed-off-by: Simon Glass <sjg@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2705443 Reviewed-by: Jack Rosenthal <jrosenth@chromium.org> Commit-Queue: Jack Rosenthal <jrosenth@chromium.org>
-rw-r--r--zephyr/shim/chip/npcx/system_external_storage.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/zephyr/shim/chip/npcx/system_external_storage.c b/zephyr/shim/chip/npcx/system_external_storage.c
index 873686e44a..4c4c5c0e6c 100644
--- a/zephyr/shim/chip/npcx/system_external_storage.c
+++ b/zephyr/shim/chip/npcx/system_external_storage.c
@@ -16,6 +16,9 @@
#define NPCX_FWCTRL_FW_SLOT 1
#define SET_BIT(reg, bit) ((reg) |= (0x1 << (bit)))
#define CLEAR_BIT(reg, bit) ((reg) &= (~(0x1 << (bit))))
+
+/* TODO(b:179900857) Clean this up too */
+#undef IS_BIT_SET
#define IS_BIT_SET(reg, bit) (((reg) >> (bit)) & (0x1))
void system_jump_to_booter(void)