commit f57b7bd7fe6f555d680c01a797b25458f009e742
author Mohammed Habibulla <moch@chromium.org> Mon May 05 20:49:49 2014
committer chrome-internal-fetch <chrome-internal-fetch@google.com> Tue May 06 00:08:00 2014
tree 5df087efd19200ad98211b952623e4cd1508cfa5
parent 48dc9007124682e7d2b5dd3d34f21c1915825560

Tricky: Add servo overlay for tricky

BUG=none
TEST=sudo servod --board=tricky

Change-Id: I9ca410cc9d6c0c38bc723e5c539af73a408c6f40
Reviewed-on: https://chromium-review.googlesource.com/198226
Reviewed-by: Yusuf Mohsinally <mohsinally@chromium.org>
Commit-Queue: Mohammed Habibulla <moch@chromium.org>
Tested-by: Mohammed Habibulla <moch@chromium.org>

servo/data/servo_tricky_overlay.xml

diff --git a/servo/data/servo_tricky_overlay.xml b/servo/data/servo_tricky_overlay.xml
new file mode 100644
index 0000000..db09c6d
--- /dev/null
+++ b/servo/data/servo_tricky_overlay.xml
@@ -0,0 +1,5 @@
+<root>
+  <include>
+    <name>servoflex_v2_r0_p50.xml</name>
+  </include>
+</root>

servo/servo_server.py

diff --git a/servo/servo_server.py b/servo/servo_server.py
index 401ae12..7daeec1 100644
--- a/servo/servo_server.py
+++ b/servo/servo_server.py
@@ -127,7 +127,7 @@
       return keyboard_handlers.ParrotHandler(servo)
     elif board == 'stout':
       return keyboard_handlers.StoutHandler(servo)
-    elif board in ('monroe', 'panther', 'zako'):
+    elif board in ('monroe', 'panther', 'tricky', 'zako'):
       if self._usbkm232 is None:
         raise Exception("No device specified when "
                         "initializing usbkm232 keyboard handler")