From d98755e753ef93c1d1894f1e7b7eeb4e7acb37df Mon Sep 17 00:00:00 2001 From: Paul Kocialkowski Date: Mon, 19 Dec 2016 18:03:23 +0100 Subject: [PATCH] UPSTREAM: libpayload: Update ARM CrOS devices configuration This updates the configuration for ARM CrOS devices (nyans and veyrons) by using the CHROMEOS Kconfig option, thus reducing the number of options to select. It also brings proper serial console support. BUG=none BRANCH=none TEST=none Change-Id: I455b66801c3518319e078aa63d63b515ee80cd22 Signed-off-by: Patrick Georgi Original-Commit-Id: 7a9ec36fd4749880f7cecb4088c78b93d94746cc Original-Change-Id: Iffc84c44a1d339c5bb575fbaffc40bc2d56bb6cf Original-Signed-off-by: Paul Kocialkowski Original-Reviewed-on: https://review.coreboot.org/17928 Original-Tested-by: build bot (Jenkins) Original-Reviewed-by: Paul Menzel Original-Reviewed-by: Julius Werner Reviewed-on: https://chromium-review.googlesource.com/428258 Commit-Ready: Aaron Durbin --- payloads/libpayload/configs/config.nyan | 10 +++------- payloads/libpayload/configs/config.veyron | 10 +++------- 2 files changed, 6 insertions(+), 14 deletions(-) diff --git a/payloads/libpayload/configs/config.nyan b/payloads/libpayload/configs/config.nyan index 6e593e5f0d..caad2b6181 100644 --- a/payloads/libpayload/configs/config.nyan +++ b/payloads/libpayload/configs/config.nyan @@ -1,10 +1,6 @@ -CONFIG_LP_GPL=y +CONFIG_LP_CHROMEOS=y CONFIG_LP_ARCH_ARM=y -# CONFIG_LP_CURSES is not set -CONFIG_LP_SKIP_CONSOLE_INIT=y -CONFIG_LP_COREBOOT_VIDEO_CONSOLE=y -# CONFIG_LP_STORAGE is not set +CONFIG_LP_8250_SERIAL_CONSOLE=y CONFIG_LP_TIMER_TEGRA_1US=y -# CONFIG_LP_USB_OHCI is not set -# CONFIG_LP_USB_XHCI is not set +CONFIG_LP_USB_EHCI=y CONFIG_LP_USB_EHCI_HOSTPC_ROOT_HUB_TT=y diff --git a/payloads/libpayload/configs/config.veyron b/payloads/libpayload/configs/config.veyron index 793907fc9f..e80535c63e 100644 --- a/payloads/libpayload/configs/config.veyron +++ b/payloads/libpayload/configs/config.veyron @@ -1,11 +1,7 @@ -CONFIG_LP_GPL=y +CONFIG_LP_CHROMEOS=y CONFIG_LP_ARCH_ARM=y -# CONFIG_LP_CURSES is not set -CONFIG_LP_SKIP_CONSOLE_INIT=y -CONFIG_LP_COREBOOT_VIDEO_CONSOLE=y -# CONFIG_LP_STORAGE is not set -CONFIG_LP_TIMER_RK=y -CONFIG_LP_USB=y +CONFIG_LP_8250_SERIAL_CONSOLE=y +CONFIG_LP_TIMER_RK3288=y CONFIG_LP_USB_EHCI=y CONFIG_LP_USB_DWC2=y # CONFIG_LP_USB_HID is not set