usb: kconfig: usb keyboard kconfig

Add Kconfig options for USB keyboard and use them for cm-fx6.

Cc: Marek Vasut <marex@denx.de>
Cc: Stefano Babic <sbabic@denx.de>
Cc: Igor Grinberg <grinberg@compulab.co.il>
Signed-off-by: Nikita Kiryanov <nikita@compulab.co.il>
Acked-by: Igor Grinberg <grinberg@compulab.co.il>

diff --git a/configs/cm_fx6_defconfig b/configs/cm_fx6_defconfig
index 07a84bbc3e33d4fd4b34d219d682cd14ce5c3f5b..f0fd48cdc180831a8ab1bbcc446fc55b17edbc6e 100644 (file)
--- a/configs/cm_fx6_defconfig
+++ b/configs/cm_fx6_defconfig
@@ -20,3 +20,5 @@ CONFIG_CMD_USB=y
 CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_EHCI_MX6=y
 CONFIG_USB_STORAGE=y
 CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_EHCI_MX6=y
 CONFIG_USB_STORAGE=y

+CONFIG_USB_KEYBOARD=y
+CONFIG_SYS_USB_EVENT_POLL_VIA_CONTROL_EP=y

diff --git a/drivers/usb/Kconfig b/drivers/usb/Kconfig
index 3fa5b2e37e81c86171e35a8167116c2a469a9e6e..56fe0f80aa6213a2dbbbc2e8531161c997042823 100644 (file)
--- a/drivers/usb/Kconfig
+++ b/drivers/usb/Kconfig
@@ -59,4 +59,31 @@ config USB_STORAGE
          Say Y here if you want to connect USB mass storage devices to your
          board's USB port.
 
          Say Y here if you want to connect USB mass storage devices to your
          board's USB port.
 

+config USB_KEYBOARD
+       bool "USB Keyboard support"
+       ---help---
+         Say Y here if you want to use a USB keyboard for U-Boot command line
+         input.
+
+if USB_KEYBOARD
+
+choice
+       prompt "USB keyboard polling"
+       optional
+       ---help---
+         Enable a polling mechanism for USB keyboard.
+
+       config SYS_USB_EVENT_POLL
+               bool "Interrupt polling"
+
+       config SYS_USB_EVENT_POLL_VIA_INT_QUEUE
+               bool "Poll via interrupt queue"
+
+       config SYS_USB_EVENT_POLL_VIA_CONTROL_EP
+               bool "Poll via control EP"
+
+endchoice
+
+endif
+

 endif
 endif

diff --git a/include/configs/cm_fx6.h b/include/configs/cm_fx6.h
index 9f69322f08e47c58ca0ebeb5a47fbcf35ab21122..059004c7ea026898d4a24f87fb7c88379f73c70b 100644 (file)
--- a/include/configs/cm_fx6.h
+++ b/include/configs/cm_fx6.h
@@ -202,8 +202,6 @@
 #define CONFIG_MXC_USB_FLAGS           0
 #define CONFIG_USB_MAX_CONTROLLER_COUNT        2
 #define CONFIG_EHCI_HCD_INIT_AFTER_RESET       /* For OTG port */
 #define CONFIG_MXC_USB_FLAGS           0
 #define CONFIG_USB_MAX_CONTROLLER_COUNT        2
 #define CONFIG_EHCI_HCD_INIT_AFTER_RESET       /* For OTG port */

-#define CONFIG_USB_KEYBOARD
-#define CONFIG_SYS_USB_EVENT_POLL_VIA_CONTROL_EP

 #define CONFIG_SYS_STDIO_DEREGISTER
 
 /* I2C */
 #define CONFIG_SYS_STDIO_DEREGISTER
 
 /* I2C */