From 9c4ce606632644c9d22d7abdef2e88e929219750 Mon Sep 17 00:00:00 2001 From: Julius Werner Date: Tue, 15 Jul 2014 18:09:56 -0700 Subject: [PATCH] libpayload: Renormalize config.veyron config.veyron was written by hand and had some minor mismatches (entries in a different order than Config.in, negative entries for some options that no longer exist, etc.). Most importantly, it was missing the negative entry for CONFIG_LP_REMOTEGDB, which is required to make our ebuilds build a correct image.dev.bin with GDB support. Ran it through make oldconfig once so that everything is in the right place again. BUG=None TEST=Remote GDB on Veyron works (woohoo!) Change-Id: Ic5ebe25fe8ef1b63031569a178c5419ca7e31754 Signed-off-by: Julius Werner Reviewed-on: https://chromium-review.googlesource.com/208255 Reviewed-by: David Hendricks --- payloads/libpayload/configs/config.veyron | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/payloads/libpayload/configs/config.veyron b/payloads/libpayload/configs/config.veyron index e47bfd8a6d..64abfd33b9 100644 --- a/payloads/libpayload/configs/config.veyron +++ b/payloads/libpayload/configs/config.veyron @@ -11,15 +11,15 @@ CONFIG_LP_GPL=y # CONFIG_LP_EXPERIMENTAL is not set # CONFIG_LP_OBSOLETE is not set # CONFIG_LP_DEVELOPER is not set +# CONFIG_LP_REMOTEGDB is not set CONFIG_LP_CHROMEOS=y # # Architecture Options # CONFIG_LP_ARCH_ARM=y -# CONFIG_LP_ARCH_ARM64 is not set -# CONFIG_LP_ARCH_POWERPC is not set # CONFIG_LP_ARCH_X86 is not set +# CONFIG_LP_ARCH_ARM64 is not set # CONFIG_LP_MEMMAP_RAM_ONLY is not set # @@ -37,9 +37,9 @@ CONFIG_LP_SKIP_CONSOLE_INIT=y CONFIG_LP_CBMEM_CONSOLE=y CONFIG_LP_SERIAL_CONSOLE=y # CONFIG_LP_8250_SERIAL_CONSOLE is not set -CONFIG_LP_RK_SERIAL_CONSOLE=y -#CONFIG_LP_S5P_SERIAL_CONSOLE is not set +# CONFIG_LP_S5P_SERIAL_CONSOLE is not set # CONFIG_LP_TEGRA_SERIAL_CONSOLE is not set +CONFIG_LP_RK_SERIAL_CONSOLE=y # CONFIG_LP_IPQ806X_SERIAL_CONSOLE is not set # CONFIG_LP_SERIAL_SET_SPEED is not set # CONFIG_LP_SERIAL_ACS_FALLBACK is not set @@ -52,12 +52,12 @@ CONFIG_LP_COREBOOT_VIDEO_CONSOLE=y # # CONFIG_LP_RTC_PORT_EXTENDED_VIA is not set # CONFIG_LP_STORAGE is not set -CONFIG_LP_TIMER_RK=y -CONFIG_LP_TIMER_RK_ADDRESS=0xff810020 +# CONFIG_LP_TIMER_NONE is not set # CONFIG_LP_TIMER_MCT is not set # CONFIG_LP_TIMER_TEGRA_1US is not set # CONFIG_LP_TIMER_IPQ806X is not set -# CONFIG_LP_TIMER_MCT_HZ is not set +CONFIG_LP_TIMER_RK=y +CONFIG_LP_TIMER_RK_ADDRESS=0xff810020 CONFIG_LP_USB=y # CONFIG_LP_USB_OHCI is not set CONFIG_LP_USB_EHCI=y