From 37e68449060641b4304015b7c3ca73775ee00f0a Mon Sep 17 00:00:00 2001 From: Jim Lin Date: Fri, 3 Oct 2014 11:16:05 +0800 Subject: [PATCH] libpayload: config: nyan: Set CONFIG_LP_USB_EHCI_HOSTPC_ROOT_HUB_TT Set "CONFIG_LP_USB_EHCI_HOSTPC_ROOT_HUB_TT=y" for nyan-series platforms to enable USB keyboard when it's connected to root hub. BUG=chrome-os-partner:32355 TEST=Tested on nyan series platforms. Press ESC+REFRESH+POWER keys on internal keyboard to power up. Press Left Arrow or Right Arrow on USB keyboard to switch between "English" and "Default Locale" in coreboot UI. Or unplug and plug in device and try again. Root hub <- low-speed USB keyboard Root hub <- full-speed hub <- low-speed USB keyboard Root hub <- high-speed hub <- low-speed USB keyboard Change-Id: I0c47cdd7018133185b6ffe1a51c62932f1287b34 Signed-off-by: Jim Lin Reviewed-on: https://chromium-review.googlesource.com/221035 Reviewed-by: Julius Werner --- payloads/libpayload/configs/config.arm64-generic | 1 + payloads/libpayload/configs/config.bolt | 1 + payloads/libpayload/configs/config.daisy | 1 + payloads/libpayload/configs/config.falco | 1 + payloads/libpayload/configs/config.fox_baskingridge | 1 + payloads/libpayload/configs/config.gizmo | 1 + payloads/libpayload/configs/config.link | 1 + payloads/libpayload/configs/config.lumpy | 1 + payloads/libpayload/configs/config.nyan | 1 + payloads/libpayload/configs/config.nyan_big | 1 + payloads/libpayload/configs/config.nyan_blaze | 1 + payloads/libpayload/configs/config.peppy | 1 + payloads/libpayload/configs/config.rambi | 1 + payloads/libpayload/configs/config.rush | 1 + payloads/libpayload/configs/config.slippy | 1 + payloads/libpayload/configs/config.veyron_pinky | 1 + payloads/libpayload/configs/defconfig | 1 + 17 files changed, 17 insertions(+) diff --git a/payloads/libpayload/configs/config.arm64-generic b/payloads/libpayload/configs/config.arm64-generic index 1b3aed65d0..9b95668386 100644 --- a/payloads/libpayload/configs/config.arm64-generic +++ b/payloads/libpayload/configs/config.arm64-generic @@ -53,6 +53,7 @@ CONFIG_LP_TIMER_NONE=y CONFIG_LP_USB=y # CONFIG_LP_USB_OHCI is not set CONFIG_LP_USB_EHCI=y +# CONFIG_LP_USB_EHCI_HOSTPC_ROOT_HUB_TT is not set CONFIG_LP_USB_XHCI=y CONFIG_LP_USB_HID=y CONFIG_LP_USB_HUB=y diff --git a/payloads/libpayload/configs/config.bolt b/payloads/libpayload/configs/config.bolt index 34bc41c84a..4986960845 100644 --- a/payloads/libpayload/configs/config.bolt +++ b/payloads/libpayload/configs/config.bolt @@ -67,6 +67,7 @@ CONFIG_LP_USB=y CONFIG_LP_USB_UHCI=y CONFIG_LP_USB_OHCI=y CONFIG_LP_USB_EHCI=y +# CONFIG_LP_USB_EHCI_HOSTPC_ROOT_HUB_TT is not set # CONFIG_LP_USB_XHCI is not set # CONFIG_LP_USB_DWC2 is not set CONFIG_LP_USB_HID=y diff --git a/payloads/libpayload/configs/config.daisy b/payloads/libpayload/configs/config.daisy index 4600947017..a6dd3bab12 100644 --- a/payloads/libpayload/configs/config.daisy +++ b/payloads/libpayload/configs/config.daisy @@ -62,6 +62,7 @@ CONFIG_LP_TIMER_MCT_ADDRESS=0x101c0000 CONFIG_LP_USB=y CONFIG_LP_USB_OHCI=y CONFIG_LP_USB_EHCI=y +# CONFIG_LP_USB_EHCI_HOSTPC_ROOT_HUB_TT is not set CONFIG_LP_USB_XHCI=y CONFIG_LP_USB_HID=y CONFIG_LP_USB_HUB=y diff --git a/payloads/libpayload/configs/config.falco b/payloads/libpayload/configs/config.falco index fa8525af9a..d2791ec3ce 100644 --- a/payloads/libpayload/configs/config.falco +++ b/payloads/libpayload/configs/config.falco @@ -67,6 +67,7 @@ CONFIG_LP_USB=y CONFIG_LP_USB_UHCI=y CONFIG_LP_USB_OHCI=y CONFIG_LP_USB_EHCI=y +# CONFIG_LP_USB_EHCI_HOSTPC_ROOT_HUB_TT is not set # CONFIG_LP_USB_XHCI is not set # CONFIG_LP_USB_DWC2 is not set CONFIG_LP_USB_HID=y diff --git a/payloads/libpayload/configs/config.fox_baskingridge b/payloads/libpayload/configs/config.fox_baskingridge index 6775fc4c6a..afec2d2f12 100644 --- a/payloads/libpayload/configs/config.fox_baskingridge +++ b/payloads/libpayload/configs/config.fox_baskingridge @@ -67,6 +67,7 @@ CONFIG_LP_USB=y CONFIG_LP_USB_UHCI=y CONFIG_LP_USB_OHCI=y CONFIG_LP_USB_EHCI=y +# CONFIG_LP_USB_EHCI_HOSTPC_ROOT_HUB_TT is not set CONFIG_LP_USB_XHCI=y CONFIG_LP_USB_HID=y CONFIG_LP_USB_HUB=y diff --git a/payloads/libpayload/configs/config.gizmo b/payloads/libpayload/configs/config.gizmo index 6354a46538..0b3396d434 100644 --- a/payloads/libpayload/configs/config.gizmo +++ b/payloads/libpayload/configs/config.gizmo @@ -67,6 +67,7 @@ CONFIG_LP_USB=y CONFIG_LP_USB_UHCI=y CONFIG_LP_USB_OHCI=y CONFIG_LP_USB_EHCI=y +# CONFIG_LP_USB_EHCI_HOSTPC_ROOT_HUB_TT is not set CONFIG_LP_USB_XHCI=y CONFIG_LP_USB_HID=y CONFIG_LP_USB_HUB=y diff --git a/payloads/libpayload/configs/config.link b/payloads/libpayload/configs/config.link index ce64306800..13ab3c18ce 100644 --- a/payloads/libpayload/configs/config.link +++ b/payloads/libpayload/configs/config.link @@ -67,6 +67,7 @@ CONFIG_LP_USB=y CONFIG_LP_USB_UHCI=y CONFIG_LP_USB_OHCI=y CONFIG_LP_USB_EHCI=y +# CONFIG_LP_USB_EHCI_HOSTPC_ROOT_HUB_TT is not set CONFIG_LP_USB_XHCI=y CONFIG_LP_USB_HID=y CONFIG_LP_USB_HUB=y diff --git a/payloads/libpayload/configs/config.lumpy b/payloads/libpayload/configs/config.lumpy index 2151cbe148..cb9263f887 100644 --- a/payloads/libpayload/configs/config.lumpy +++ b/payloads/libpayload/configs/config.lumpy @@ -67,6 +67,7 @@ CONFIG_LP_USB=y CONFIG_LP_USB_UHCI=y CONFIG_LP_USB_OHCI=y CONFIG_LP_USB_EHCI=y +# CONFIG_LP_USB_EHCI_HOSTPC_ROOT_HUB_TT is not set CONFIG_LP_USB_XHCI=y CONFIG_LP_USB_HID=y CONFIG_LP_USB_HUB=y diff --git a/payloads/libpayload/configs/config.nyan b/payloads/libpayload/configs/config.nyan index 01252a724a..3fff9e9550 100644 --- a/payloads/libpayload/configs/config.nyan +++ b/payloads/libpayload/configs/config.nyan @@ -61,6 +61,7 @@ CONFIG_LP_TIMER_TEGRA_1US_ADDRESS=0x60005010 CONFIG_LP_USB=y # CONFIG_LP_USB_OHCI is not set CONFIG_LP_USB_EHCI=y +CONFIG_LP_USB_EHCI_HOSTPC_ROOT_HUB_TT=y CONFIG_LP_USB_XHCI=y CONFIG_LP_USB_HID=y CONFIG_LP_USB_HUB=y diff --git a/payloads/libpayload/configs/config.nyan_big b/payloads/libpayload/configs/config.nyan_big index 01252a724a..3fff9e9550 100644 --- a/payloads/libpayload/configs/config.nyan_big +++ b/payloads/libpayload/configs/config.nyan_big @@ -61,6 +61,7 @@ CONFIG_LP_TIMER_TEGRA_1US_ADDRESS=0x60005010 CONFIG_LP_USB=y # CONFIG_LP_USB_OHCI is not set CONFIG_LP_USB_EHCI=y +CONFIG_LP_USB_EHCI_HOSTPC_ROOT_HUB_TT=y CONFIG_LP_USB_XHCI=y CONFIG_LP_USB_HID=y CONFIG_LP_USB_HUB=y diff --git a/payloads/libpayload/configs/config.nyan_blaze b/payloads/libpayload/configs/config.nyan_blaze index 2537e1afe0..c4cd8bb89a 100644 --- a/payloads/libpayload/configs/config.nyan_blaze +++ b/payloads/libpayload/configs/config.nyan_blaze @@ -61,6 +61,7 @@ CONFIG_LP_TIMER_TEGRA_1US_ADDRESS=0x60005010 CONFIG_LP_USB=y # CONFIG_LP_USB_OHCI is not set CONFIG_LP_USB_EHCI=y +CONFIG_LP_USB_EHCI_HOSTPC_ROOT_HUB_TT=y CONFIG_LP_USB_XHCI=y CONFIG_LP_USB_HID=y CONFIG_LP_USB_HUB=y diff --git a/payloads/libpayload/configs/config.peppy b/payloads/libpayload/configs/config.peppy index 1e2ce28830..b139e100a3 100644 --- a/payloads/libpayload/configs/config.peppy +++ b/payloads/libpayload/configs/config.peppy @@ -67,6 +67,7 @@ CONFIG_LP_USB=y CONFIG_LP_USB_UHCI=y CONFIG_LP_USB_OHCI=y CONFIG_LP_USB_EHCI=y +# CONFIG_LP_USB_EHCI_HOSTPC_ROOT_HUB_TT is not set # CONFIG_LP_USB_XHCI is not set # CONFIG_LP_USB_DWC2 is not set CONFIG_LP_USB_HID=y diff --git a/payloads/libpayload/configs/config.rambi b/payloads/libpayload/configs/config.rambi index 8e955237b6..671d5f7223 100644 --- a/payloads/libpayload/configs/config.rambi +++ b/payloads/libpayload/configs/config.rambi @@ -68,6 +68,7 @@ CONFIG_LP_USB=y # CONFIG_LP_USB_OHCI is not set # CONFIG_LP_USB_DWC2 is not set CONFIG_LP_USB_EHCI=y +# CONFIG_LP_USB_EHCI_HOSTPC_ROOT_HUB_TT is not set CONFIG_LP_USB_XHCI=y CONFIG_LP_USB_HID=y CONFIG_LP_USB_HUB=y diff --git a/payloads/libpayload/configs/config.rush b/payloads/libpayload/configs/config.rush index 777764722e..66e4f9725c 100644 --- a/payloads/libpayload/configs/config.rush +++ b/payloads/libpayload/configs/config.rush @@ -60,6 +60,7 @@ CONFIG_LP_TIMER_TEGRA_1US_ADDRESS=0x60005010 CONFIG_LP_USB=y # CONFIG_LP_USB_OHCI is not set CONFIG_LP_USB_EHCI=y +# CONFIG_LP_USB_EHCI_HOSTPC_ROOT_HUB_TT is not set CONFIG_LP_USB_XHCI=y CONFIG_LP_USB_HID=y CONFIG_LP_USB_HUB=y diff --git a/payloads/libpayload/configs/config.slippy b/payloads/libpayload/configs/config.slippy index b5bb25d247..1bbba460a5 100644 --- a/payloads/libpayload/configs/config.slippy +++ b/payloads/libpayload/configs/config.slippy @@ -67,6 +67,7 @@ CONFIG_LP_USB=y CONFIG_LP_USB_UHCI=y CONFIG_LP_USB_OHCI=y CONFIG_LP_USB_EHCI=y +# CONFIG_LP_USB_EHCI_HOSTPC_ROOT_HUB_TT is not set # CONFIG_LP_USB_XHCI is not set # CONFIG_LP_USB_DWC2 is not set CONFIG_LP_USB_HID=y diff --git a/payloads/libpayload/configs/config.veyron_pinky b/payloads/libpayload/configs/config.veyron_pinky index 77b4df82de..f32db7c620 100644 --- a/payloads/libpayload/configs/config.veyron_pinky +++ b/payloads/libpayload/configs/config.veyron_pinky @@ -61,6 +61,7 @@ CONFIG_LP_TIMER_RK_ADDRESS=0xff810020 CONFIG_LP_USB=y # CONFIG_LP_USB_OHCI is not set CONFIG_LP_USB_EHCI=y +# CONFIG_LP_USB_EHCI_HOSTPC_ROOT_HUB_TT is not set # CONFIG_LP_USB_XHCI is not set CONFIG_LP_USB_DWC2=y # CONFIG_LP_USB_HID is not set diff --git a/payloads/libpayload/configs/defconfig b/payloads/libpayload/configs/defconfig index e916f7c90a..948b63bc28 100644 --- a/payloads/libpayload/configs/defconfig +++ b/payloads/libpayload/configs/defconfig @@ -68,6 +68,7 @@ CONFIG_LP_USB=y CONFIG_LP_USB_UHCI=y CONFIG_LP_USB_OHCI=y CONFIG_LP_USB_EHCI=y +# CONFIG_LP_USB_EHCI_HOSTPC_ROOT_HUB_TT is not set CONFIG_LP_USB_XHCI=y CONFIG_LP_USB_HID=y CONFIG_LP_USB_HUB=y