summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorShawn Nematbakhsh <shawnn@chromium.org>2015-08-11 15:09:27 -0700
committerChromeOS Commit Bot <chromeos-commit-bot@chromium.org>2015-08-12 04:25:14 +0000
commitc41174c5e57ab95082f2c412715179e97ca1026f (patch)
treeb93613914e1ca046304d9de181e2ee7c04a06590
parent263b66204ceb84b9d89a4a06254fb8c281bbbf02 (diff)
downloadchrome-ec-c41174c5e57ab95082f2c412715179e97ca1026f.tar.gz
glados: Enable `tests` build
`tests` build was previously disabled for glados due to errors building power/skylake.c. Properly undef the chipset config to make `tests` work for all skylake platforms. BUG=None TEST=`make BOARD=glados tests` BRANCH=None Signed-off-by: Shawn Nematbakhsh <shawnn@chromium.org> Change-Id: I7a730cdd5e30a932ff0cd1f3beef77873b9e0630 Reviewed-on: https://chromium-review.googlesource.com/292910 Reviewed-by: Aaron Durbin <adurbin@chromium.org>
-rw-r--r--board/glados/board.c2
-rw-r--r--include/config.h1
-rw-r--r--test/build.mk5
3 files changed, 3 insertions, 5 deletions
diff --git a/board/glados/board.c b/board/glados/board.c
index 3473179cb8..be33741bcc 100644
--- a/board/glados/board.c
+++ b/board/glados/board.c
@@ -43,8 +43,10 @@
/* Exchange status with PD MCU. */
static void pd_mcu_interrupt(enum gpio_signal signal)
{
+#ifdef HAS_TASK_PDCMD
/* Exchange status with PD MCU to determine interrupt cause */
host_command_pd_send_status(0);
+#endif
}
void vbus0_evt(enum gpio_signal signal)
diff --git a/include/config.h b/include/config.h
index 3d7271d07c..77972c4941 100644
--- a/include/config.h
+++ b/include/config.h
@@ -1847,6 +1847,7 @@
#undef CONFIG_CHIPSET_HASWELL
#undef CONFIG_CHIPSET_MEDIATEK
#undef CONFIG_CHIPSET_ROCKCHIP
+#undef CONFIG_CHIPSET_SKYLAKE
#undef CONFIG_CHIPSET_TEGRA
#undef CONFIG_POWER_COMMON
#endif
diff --git a/test/build.mk b/test/build.mk
index db162cd702..b1403bd90b 100644
--- a/test/build.mk
+++ b/test/build.mk
@@ -16,11 +16,6 @@ test-list-$(BOARD_PIT)+=kb_scan stress
# compile with it. Disable them for now.
test-list-$(BOARD_SAMUS)=
-# Glados board-specific chipset code, and the tests don't
-# compile with it. Disable them for now.
-test-list-$(BOARD_GLADOS)=
-test-list-$(BOARD_GLADOS_PD)=
-
# Ryu has issues when building tests
test-list-$(BOARD_RYU)=