summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFabio Estevam <fabio.estevam@freescale.com>2015-04-29 22:28:11 -0300
committerStefano Babic <sbabic@denx.de>2015-05-15 19:20:47 +0200
commitc49cfdcd2210577f300d005a5c0745e9839bf21a (patch)
tree60441ec024e554821e4f6153092b1a688028574d
parente1d74379efff764a41a2e151bd1e4c8fca203755 (diff)
downloadu-boot-imx-c49cfdcd2210577f300d005a5c0745e9839bf21a.zip
u-boot-imx-c49cfdcd2210577f300d005a5c0745e9839bf21a.tar.gz
u-boot-imx-c49cfdcd2210577f300d005a5c0745e9839bf21a.tar.bz2
mx6cuboxi: Allow HDMI and USB keyboard to be stdout/stdin
There are users of Cuboxi and Hummingboard that use these boards without connecting them to a USB/serial adapter. Allow such usage by allowing the HDMI port to act as stdout and USB keyboard as stdin. The serial console still also works as stdin/stdout. Signed-off-by: Rabeeh Khoury <rabeeh@solid-run.com> Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com> Reviewed-by: Tom Rini <trini@konsulko.com> Tested-by: Vagrant Cascadian <vagrant@aikidev.net>
-rw-r--r--include/configs/mx6cuboxi.h7
1 files changed, 7 insertions, 0 deletions
diff --git a/include/configs/mx6cuboxi.h b/include/configs/mx6cuboxi.h
index 34d24dc..4e07f59 100644
--- a/include/configs/mx6cuboxi.h
+++ b/include/configs/mx6cuboxi.h
@@ -81,6 +81,7 @@
#define CONFIG_VIDEO_BMP_LOGO
#define CONFIG_IMX_HDMI
#define CONFIG_IMX_VIDEO_SKIP
+#define CONFIG_CONSOLE_MUX
/* USB */
#define CONFIG_CMD_USB
@@ -91,6 +92,9 @@
#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)
#define CONFIG_MXC_USB_FLAGS 0
#define CONFIG_USB_MAX_CONTROLLER_COUNT 2
+#define CONFIG_USB_KEYBOARD
+#define CONFIG_SYS_USB_EVENT_POLL
+#define CONFIG_PREBOOT "usb start"
#define CONFIG_SYS_NO_FLASH
@@ -113,6 +117,9 @@
#define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG
#define CONFIG_EXTRA_ENV_SETTINGS \
+ "stdin=serial,usbkbd\0" \
+ "stdout=serial,vga\0" \
+ "stderr=serial,vga\0" \
"script=boot.scr\0" \
"image=zImage\0" \
"fdtfile=undefined\0" \