summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorHans de Goede <hdegoede@redhat.com>2014-09-18 21:03:34 +0200
committerHans de Goede <hdegoede@redhat.com>2014-11-25 13:38:46 +0100
commit86b4909340a272a1a040db61565f639d845b170f (patch)
tree3b80712cb6a7743f371fcd9cf9f63b05e998a661 /include
parent2d7a084ba0d77b96c3e053492173f3dda364d350 (diff)
sunxi: Add usb keyboard Kconfig option
For use together with the hdmi console. Signed-off-by: Hans de Goede <hdegoede@redhat.com> Acked-by: Ian Campbell <ian.campbell@citrix.com>
Diffstat (limited to 'include')
-rw-r--r--include/configs/sunxi-common.h13
1 files changed, 13 insertions, 0 deletions
diff --git a/include/configs/sunxi-common.h b/include/configs/sunxi-common.h
index d5d907bca5..3f890b2fb0 100644
--- a/include/configs/sunxi-common.h
+++ b/include/configs/sunxi-common.h
@@ -247,6 +247,13 @@
#define CONFIG_USB_STORAGE
#endif
+#ifdef CONFIG_USB_KEYBOARD
+#define CONFIG_CONSOLE_MUX
+#define CONFIG_PREBOOT
+#define CONFIG_SYS_STDIO_DEREGISTER
+#define CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE
+#endif
+
#if !defined CONFIG_ENV_IS_IN_MMC && \
!defined CONFIG_ENV_IS_IN_NAND && \
!defined CONFIG_ENV_IS_IN_FAT && \
@@ -297,8 +304,14 @@
#include <config_distro_bootcmd.h>
+#ifdef CONFIG_USB_KEYBOARD
+#define CONSOLE_STDIN_SETTINGS \
+ "preboot=usb start\0" \
+ "stdin=serial,usbkbd\0"
+#else
#define CONSOLE_STDIN_SETTINGS \
"stdin=serial\0"
+#endif
#ifdef CONFIG_VIDEO
#define CONSOLE_STDOUT_SETTINGS \