From 460a7172852033a1b897a61e954d1e3f1c32285f Mon Sep 17 00:00:00 2001
From: Simon Glass <sjg@chromium.org>
Date: Sun, 8 Nov 2015 23:48:07 -0700
Subject: sandbox: Enable USB keyboard

Enable the USB keyboard on sandbox, now that we have a suitable emulation
driver.

Signed-off-by: Simon Glass <sjg@chromium.org>

diff --git a/configs/sandbox_defconfig b/configs/sandbox_defconfig
index 4053848..0178674 100644
--- a/configs/sandbox_defconfig
+++ b/configs/sandbox_defconfig
@@ -63,6 +63,8 @@ CONFIG_USB=y
 CONFIG_DM_USB=y
 CONFIG_USB_EMUL=y
 CONFIG_USB_STORAGE=y
+CONFIG_USB_KEYBOARD=y
+CONFIG_SYS_USB_EVENT_POLL=y
 CONFIG_SYS_VSNPRINTF=y
 CONFIG_CMD_DHRYSTONE=y
 CONFIG_TPM=y
diff --git a/include/configs/sandbox.h b/include/configs/sandbox.h
index fb1bfb7..1c75c38 100644
--- a/include/configs/sandbox.h
+++ b/include/configs/sandbox.h
@@ -177,7 +177,7 @@
 
 #define CONFIG_KEYBOARD
 
-#define SANDBOX_SERIAL_SETTINGS		"stdin=serial,cros-ec-keyb\0" \
+#define SANDBOX_SERIAL_SETTINGS		"stdin=serial,cros-ec-keyb,usbkbd\0" \
 					"stdout=serial,lcd\0" \
 					"stderr=serial,lcd\0"
 #else
-- 
cgit v0.10.2