diff options
| author | Jeremy Bettis <jbettis@google.com> | 2022-07-18 11:53:25 -0600 |
|---|---|---|
| committer | Chromeos LUCI <chromeos-scoped@luci-project-accounts.iam.gserviceaccount.com> | 2022-07-20 20:00:30 +0000 |
| commit | e4996870081fa1de9dc56b752bf31f5692c3d20d (patch) | |
| tree | a01c25a5960a4a3c16572c57024803a6bb3f9b0e /Makefile.rules | |
| parent | 02697b8e382f34b2b5a1560c67cb5eff4ce86519 (diff) | |
| download | chrome-ec-e4996870081fa1de9dc56b752bf31f5692c3d20d.tar.gz | |
ec: Fix kconfig_check usage in makefile
BRANCH=None
BUG=b:239199935
TEST=make -j$(nproc) buildall && echo SUCCESS
TEST=git commit --allow-empty
./util/compare_build.sh -b dartmonkey
./util/compare_build.sh -b all
Signed-off-by: Jeremy Bettis <jbettis@google.com>
Change-Id: I845ca84920af1ca33457b79fe2a3892867ed693c
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3767853
Commit-Queue: Jeremy Bettis <jbettis@chromium.org>
Tested-by: Jeremy Bettis <jbettis@chromium.org>
Auto-Submit: Jeremy Bettis <jbettis@chromium.org>
Commit-Queue: Jack Rosenthal <jrosenth@chromium.org>
Reviewed-by: Jack Rosenthal <jrosenth@chromium.org>
Diffstat (limited to 'Makefile.rules')
| -rw-r--r-- | Makefile.rules | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/Makefile.rules b/Makefile.rules index ab3281a0b7..0a09f78b45 100644 --- a/Makefile.rules +++ b/Makefile.rules @@ -233,6 +233,11 @@ print-boards: $(call cmd_pretty_print_list,\ $(sort $(boards))) +# The zephyr path can be overridden on invocation, as in the following example: +# $ make ZEPHYR_BASE=~/zephyr/main BOARD=dartmonkey +ZEPHYR_BASE ?= $(abspath ../../../src/third_party/zephyr/main) +export ZEPHYR_BASE + ifeq ($(ALLOW_CONFIG),) # These are options defined by both ECOS and Zephyr. We need to tolerate this @@ -254,11 +259,9 @@ conflicting_options := \ SPI \ UART_CONSOLE -cmd_check_allowed = \ - ZEPHYR_BASE=$(abspath ../../../src/third_party/zephyr/main) \ - ./util/kconfig_check.py -c ${config} \ +cmd_check_allowed = ./util/kconfig_check.py -c ${config} \ -a util/config_allowed.txt -p PLATFORM_EC_ -s zephyr/ \ - -I $(abspath ../../../src/third_party/zephyr/main) \ + -I "${ZEPHYR_BASE}" \ $(foreach opt,$(conflicting_options),-i $(opt)) check else cmd_check_allowed = true |