summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorRandall Spangler <rspangler@chromium.org>2013-10-24 10:19:55 -0700
committerchrome-internal-fetch <chrome-internal-fetch@google.com>2013-10-30 23:10:13 +0000
commitd16a246ea9c7d5982d4eb932c09310146ab3463e (patch)
tree780645ec6acc8496e367d5a34f9cc23020a650c9 /test
parente48a9d9c2143695cdd7a35ab06d6a6d5820efd9b (diff)
downloadchrome-ec-d16a246ea9c7d5982d4eb932c09310146ab3463e.tar.gz
cleanup: mkbp keyboard module
Rather than compile it by default for host-based tests, only compile it for the few tests that actually use it. Since those (and all boards) now only use if if they also have a keyscan task, we can get rid of the #ifdefs in keyboard_mkbp.c as well. And remove a TODO we'll never do... BUG=chrome-os-partner:18343 BRANCH=none TEST=build all boards; pass unit tests. These pass: util/make_all.sh make BOARD=pit tests Change-Id: I44d1806cfb375027a7ed0b33a5e9bdbbed8ccddc Signed-off-by: Randall Spangler <rspangler@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/174513
Diffstat (limited to 'test')
-rw-r--r--test/test_config.h9
1 files changed, 8 insertions, 1 deletions
diff --git a/test/test_config.h b/test/test_config.h
index 1273a4c4aa..055a0b60df 100644
--- a/test/test_config.h
+++ b/test/test_config.h
@@ -23,10 +23,17 @@
#endif
#ifdef TEST_kb_8042
-#undef CONFIG_KEYBOARD_PROTOCOL_MKBP
#define CONFIG_KEYBOARD_PROTOCOL_8042
#endif
+#ifdef TEST_kb_mkbp
+#define CONFIG_KEYBOARD_PROTOCOL_MKBP
+#endif
+
+#ifdef TEST_kb_scan
+#define CONFIG_KEYBOARD_PROTOCOL_MKBP
+#endif
+
#ifdef TEST_led_spring
#define CONFIG_BATTERY_MOCK
#define CONFIG_BATTERY_SMART