On Sun, 2014-11-16 at 17:06 +0100, Hans de Goede wrote: > For use together with the hdmi console. > > Signed-off-by: Hans de Goede <[email protected]>
Acked-by: Ian Campbell <[email protected]> > --- > board/sunxi/Kconfig | 7 +++++++ > configs/A13-OLinuXinoM_defconfig | 1 + > configs/A13-OLinuXino_defconfig | 1 + > configs/Ippo_q8h_v5_defconfig | 1 + > include/configs/sunxi-common.h | 13 +++++++++++++ > 5 files changed, 23 insertions(+) > > diff --git a/board/sunxi/Kconfig b/board/sunxi/Kconfig > index 422033a..246cd9a 100644 > --- a/board/sunxi/Kconfig > +++ b/board/sunxi/Kconfig > @@ -223,4 +223,11 @@ config VIDEO > Say Y here to add support for using a cfb console on the HDMI output > found on most sunxi devices. > > +config USB_KEYBOARD > + boolean "Enable USB keyboard support" > + default y > + ---help--- > + Say Y here to add support for using a USB keyboard (typically used > + in combination with a graphical console on HDMI). > + > endif > diff --git a/configs/A13-OLinuXinoM_defconfig > b/configs/A13-OLinuXinoM_defconfig > index b1262f7..be8652b 100644 > --- a/configs/A13-OLinuXinoM_defconfig > +++ b/configs/A13-OLinuXinoM_defconfig > @@ -3,6 +3,7 @@ CONFIG_SYS_EXTRA_OPTIONS="CONS_INDEX=2,USB_EHCI" > CONFIG_FDTFILE="sun5i-a13-olinuxino-micro.dtb" > CONFIG_USB1_VBUS_PIN="PG11" > CONFIG_VIDEO=n > +CONFIG_USB_KEYBOARD=n > +S:CONFIG_ARM=y > +S:CONFIG_ARCH_SUNXI=y > +S:CONFIG_MACH_SUN5I=y > diff --git a/configs/A13-OLinuXino_defconfig b/configs/A13-OLinuXino_defconfig > index 652eac1..654e12a 100644 > --- a/configs/A13-OLinuXino_defconfig > +++ b/configs/A13-OLinuXino_defconfig > @@ -3,6 +3,7 @@ CONFIG_SYS_EXTRA_OPTIONS="CONS_INDEX=2,AXP209_POWER,USB_EHCI" > CONFIG_FDTFILE="sun5i-a13-olinuxino.dtb" > CONFIG_USB1_VBUS_PIN="PG11" > CONFIG_VIDEO=n > +CONFIG_USB_KEYBOARD=n > +S:CONFIG_ARM=y > +S:CONFIG_ARCH_SUNXI=y > +S:CONFIG_MACH_SUN5I=y > diff --git a/configs/Ippo_q8h_v5_defconfig b/configs/Ippo_q8h_v5_defconfig > index 53df213..50c2f93 100644 > --- a/configs/Ippo_q8h_v5_defconfig > +++ b/configs/Ippo_q8h_v5_defconfig > @@ -5,3 +5,4 @@ CONFIG_MACH_SUN8I=y > CONFIG_TARGET_IPPO_Q8H_V5=y > CONFIG_DEFAULT_DEVICE_TREE="sun8i-a23-ippo-q8h-v5.dtb" > CONFIG_VIDEO=n > +CONFIG_USB_KEYBOARD=n > diff --git a/include/configs/sunxi-common.h b/include/configs/sunxi-common.h > index d5d907b..fcaa249 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=run usb_init\0" \ > + "stdin=serial,usbkbd\0" > +#else > #define CONSOLE_STDIN_SETTINGS \ > "stdin=serial\0" > +#endif > > #ifdef CONFIG_VIDEO > #define CONSOLE_STDOUT_SETTINGS \ _______________________________________________ U-Boot mailing list [email protected] http://lists.denx.de/mailman/listinfo/u-boot
