summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAseda Aboagye <aaboagye@google.com>2017-07-19 11:11:40 -0700
committerchrome-bot <chrome-bot@chromium.org>2017-07-20 12:26:31 -0700
commit42411ace424dfacd357532fca2e42885708e2b08 (patch)
tree4fef38c9ce5412568ff2f461a1ae929260fd8072
parent31ceb6a6da0cef5fae59707203b453d2294371d6 (diff)
downloadchrome-ec-42411ace424dfacd357532fca2e42885708e2b08.tar.gz
CNL: Don't build CNL in tests w/o chipset tasks.
When compiling target tests for a board that defines CONFIG_CHIPSET_CANNONLAKE, the build would fail due to the chipset code being built without a chipset task. This commit removes the Cannonlake chipset code when building a test that does not have a chipset task (and use Cannonlake). BUG=None BRANCH=None TEST=make -j BOARD=zoombini tests; verify that build succeeds. Change-Id: I15a5729db64314a8d6566be879f7c356ffa95725 Signed-off-by: Aseda Aboagye <aaboagye@google.com> Reviewed-on: https://chromium-review.googlesource.com/578316 Commit-Ready: Aseda Aboagye <aaboagye@chromium.org> Tested-by: Aseda Aboagye <aaboagye@chromium.org> Reviewed-by: Shawn N <shawnn@chromium.org>
-rw-r--r--include/config.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/config.h b/include/config.h
index 411fc30f6a..521a588af2 100644
--- a/include/config.h
+++ b/include/config.h
@@ -2894,6 +2894,7 @@
#ifndef HAS_TASK_CHIPSET
#undef CONFIG_CHIPSET_APOLLOLAKE
#undef CONFIG_CHIPSET_BRASWELL
+#undef CONFIG_CHIPSET_CANNONLAKE
#undef CONFIG_CHIPSET_MEDIATEK
#undef CONFIG_CHIPSET_RK3399
#undef CONFIG_CHIPSET_ROCKCHIP