summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBill Richardson <wfrichar@chromium.org>2015-02-26 15:36:14 -0800
committerChromeOS Commit Bot <chromeos-commit-bot@chromium.org>2015-02-27 19:56:40 +0000
commitca8cf312a3f75ed9e903ae6867490b8105c7a0b3 (patch)
tree093890fd081089c5723149e780c7c4ff75d97b03
parent28b14468137d816575ef286f314c857bd92fdd7e (diff)
downloadchrome-ec-ca8cf312a3f75ed9e903ae6867490b8105c7a0b3.tar.gz
cr50: avoid shell errors when building for host
When building hosttests, CONFIG_FLASH_BASE is not a numeric constant (it's a pointer to a buffer). This makes the the shell complain when the Makefile tries to convert it from hex to decimal. Since the Makefile only needs that value to convert .bin to .hex, let's just wait to calculate it until we need it. BUG=chrome-os-partner:37071 BRANCH=none TEST=manual Before, "make hosttests" printed a bunch of this: sh: ((uintptr_t)__host_flash): missing `)' (error token is "__host_flash)") Now it doesn't. Change-Id: If408eb347b4f2385893d53cdfbf8fd5033868737 Signed-off-by: Bill Richardson <wfrichar@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/254410 Reviewed-by: Randall Spangler <rspangler@chromium.org>
-rw-r--r--Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 5689872a4e..77347bd697 100644
--- a/Makefile
+++ b/Makefile
@@ -101,7 +101,7 @@ _rw_size_str:=$(shell echo "CONFIG_FW_RW_SIZE" | $(CPP) $(CPPFLAGS) -P \
_rw_size:=$(shell echo "$$(($(_rw_size_str)))")
_flash_base_str:=$(shell echo "CONFIG_FLASH_BASE" | $(CPP) $(CPPFLAGS) -P \
-Ichip/$(CHIP) -Iboard/$(BOARD) -imacros include/config.h)
-_flash_base:=$(shell echo "$$(($(_flash_base_str)))")
+_flash_base=$(shell echo "$$(($(_flash_base_str)))")
# Get RSA key size from board defines
_rsa_size:=$(shell echo "CONFIG_RSA_KEY_SIZE" | $(CPP) $(CPPFLAGS) -P \