From 612f2ea89dce63c471ccc8ace0d047933f82aa0b Mon Sep 17 00:00:00 2001 From: Gabe Black Date: Tue, 15 Apr 2014 01:35:26 -0700 Subject: [PATCH] libpayload: Normalize the configs. Some kconfig options have changed but the configs haven't been updated. When make oldconfig is run from the ebuild through emake, that doesn't seem to causea problem for whatever reason. When run manually, however, kconfig stops to ask for each config it doesn't have a value for. This change updates the configs to correct that issue. BUG=None TEST=Ran make oldconfig manually for all boards. Built and booted on big. BRANCH=None Change-Id: I138f8ad9239a3834d28dc492e0a90a94442b2af1 Signed-off-by: Gabe Black Reviewed-on: https://chromium-review.googlesource.com/194908 Reviewed-by: Julius Werner Tested-by: Julius Werner Commit-Queue: Gabe Black --- payloads/libpayload/configs/config.bayleybay | 4 ++++ payloads/libpayload/configs/config.beltino | 4 ++++ payloads/libpayload/configs/config.bolt | 4 ++++ payloads/libpayload/configs/config.daisy | 9 ++++++++- payloads/libpayload/configs/config.falco | 4 ++++ payloads/libpayload/configs/config.fox_baskingridge | 4 ++++ payloads/libpayload/configs/config.fox_wtm2 | 4 ++++ payloads/libpayload/configs/config.gizmo | 4 ++++ payloads/libpayload/configs/config.link | 4 ++++ payloads/libpayload/configs/config.lumpy | 4 ++++ payloads/libpayload/configs/config.nyan | 8 +++++++- payloads/libpayload/configs/config.nyan_big | 8 +++++++- payloads/libpayload/configs/config.nyan_blaze | 8 +++++++- payloads/libpayload/configs/config.panther | 4 ++++ payloads/libpayload/configs/config.peach_pit | 9 ++++++++- payloads/libpayload/configs/config.peppy | 4 ++++ payloads/libpayload/configs/config.rambi | 4 ++++ payloads/libpayload/configs/config.samus | 4 ++++ payloads/libpayload/configs/config.slippy | 4 ++++ 19 files changed, 93 insertions(+), 5 deletions(-) diff --git a/payloads/libpayload/configs/config.bayleybay b/payloads/libpayload/configs/config.bayleybay index 2a1e504984..9b17153dfd 100644 --- a/payloads/libpayload/configs/config.bayleybay +++ b/payloads/libpayload/configs/config.bayleybay @@ -36,6 +36,9 @@ CONFIG_LP_CBMEM_CONSOLE=y CONFIG_LP_SERIAL_CONSOLE=y CONFIG_LP_8250_SERIAL_CONSOLE=y CONFIG_LP_SERIAL_IOBASE=0x3f8 +# CONFIG_LP_S5P_SERIAL_CONSOLE is not set +# CONFIG_LP_TEGRA_SERIAL_CONSOLE is not set +# CONFIG_LP_PL011_SERIAL_CONSOLE is not set # CONFIG_LP_SERIAL_SET_SPEED is not set # CONFIG_LP_SERIAL_ACS_FALLBACK is not set CONFIG_LP_VIDEO_CONSOLE=y @@ -51,6 +54,7 @@ CONFIG_LP_PC_KEYBOARD_LAYOUT_US=y # CONFIG_LP_PCI=y CONFIG_LP_NVRAM=y +CONFIG_LP_TIMER_RDTSC=y # CONFIG_LP_RTC_PORT_EXTENDED_VIA is not set # CONFIG_LP_SPEAKER is not set # CONFIG_LP_STORAGE is not set diff --git a/payloads/libpayload/configs/config.beltino b/payloads/libpayload/configs/config.beltino index e3af09974d..e342b25b67 100644 --- a/payloads/libpayload/configs/config.beltino +++ b/payloads/libpayload/configs/config.beltino @@ -37,6 +37,9 @@ CONFIG_LP_CBMEM_CONSOLE=y CONFIG_LP_SERIAL_CONSOLE=y CONFIG_LP_8250_SERIAL_CONSOLE=y CONFIG_LP_SERIAL_IOBASE=0x3f8 +# CONFIG_LP_S5P_SERIAL_CONSOLE is not set +# CONFIG_LP_TEGRA_SERIAL_CONSOLE is not set +# CONFIG_LP_PL011_SERIAL_CONSOLE is not set # CONFIG_LP_SERIAL_SET_SPEED is not set # CONFIG_LP_SERIAL_ACS_FALLBACK is not set CONFIG_LP_VIDEO_CONSOLE=y @@ -52,6 +55,7 @@ CONFIG_LP_PC_KEYBOARD_LAYOUT_US=y # CONFIG_LP_PCI=y CONFIG_LP_NVRAM=y +CONFIG_LP_TIMER_RDTSC=y # CONFIG_LP_RTC_PORT_EXTENDED_VIA is not set # CONFIG_LP_SPEAKER is not set # CONFIG_LP_STORAGE is not set diff --git a/payloads/libpayload/configs/config.bolt b/payloads/libpayload/configs/config.bolt index ef57458b95..1022748531 100644 --- a/payloads/libpayload/configs/config.bolt +++ b/payloads/libpayload/configs/config.bolt @@ -37,6 +37,9 @@ CONFIG_LP_CBMEM_CONSOLE=y CONFIG_LP_SERIAL_CONSOLE=y CONFIG_LP_8250_SERIAL_CONSOLE=y CONFIG_LP_SERIAL_IOBASE=0x3f8 +# CONFIG_LP_S5P_SERIAL_CONSOLE is not set +# CONFIG_LP_TEGRA_SERIAL_CONSOLE is not set +# CONFIG_LP_PL011_SERIAL_CONSOLE is not set # CONFIG_LP_SERIAL_SET_SPEED is not set # CONFIG_LP_SERIAL_ACS_FALLBACK is not set CONFIG_LP_VIDEO_CONSOLE=y @@ -52,6 +55,7 @@ CONFIG_LP_PC_KEYBOARD_LAYOUT_US=y # CONFIG_LP_PCI=y CONFIG_LP_NVRAM=y +CONFIG_LP_TIMER_RDTSC=y # CONFIG_LP_RTC_PORT_EXTENDED_VIA is not set # CONFIG_LP_SPEAKER is not set # CONFIG_LP_STORAGE is not set diff --git a/payloads/libpayload/configs/config.daisy b/payloads/libpayload/configs/config.daisy index 2badaa5423..c3c9fec0f8 100644 --- a/payloads/libpayload/configs/config.daisy +++ b/payloads/libpayload/configs/config.daisy @@ -16,7 +16,6 @@ CONFIG_LP_CHROMEOS=y # Architecture Options # CONFIG_LP_ARCH_ARM=y -# CONFIG_LP_ARCH_POWERPC is not set # CONFIG_LP_ARCH_X86 is not set # CONFIG_LP_MEMMAP_RAM_ONLY is not set @@ -34,7 +33,11 @@ CONFIG_LP_LZMA=y 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_S5P_SERIAL_CONSOLE=y +# CONFIG_LP_TEGRA_SERIAL_CONSOLE is not set +# CONFIG_LP_SERIAL_SET_SPEED is not set +# CONFIG_LP_SERIAL_ACS_FALLBACK is not set CONFIG_LP_VIDEO_CONSOLE=y CONFIG_LP_COREBOOT_VIDEO_CONSOLE=y # CONFIG_LP_PC_KEYBOARD is not set @@ -44,7 +47,11 @@ CONFIG_LP_COREBOOT_VIDEO_CONSOLE=y # # CONFIG_LP_RTC_PORT_EXTENDED_VIA is not set # CONFIG_LP_STORAGE is not set +# CONFIG_LP_TIMER_NONE is not set CONFIG_LP_TIMER_MCT=y +# CONFIG_LP_TIMER_TEGRA_1US is not set +CONFIG_LP_TIMER_MCT_HZ=24000000 +CONFIG_LP_TIMER_MCT_ADDRESS=0x101c0000 CONFIG_LP_USB=y CONFIG_LP_USB_OHCI=y CONFIG_LP_USB_EHCI=y diff --git a/payloads/libpayload/configs/config.falco b/payloads/libpayload/configs/config.falco index ef57458b95..1022748531 100644 --- a/payloads/libpayload/configs/config.falco +++ b/payloads/libpayload/configs/config.falco @@ -37,6 +37,9 @@ CONFIG_LP_CBMEM_CONSOLE=y CONFIG_LP_SERIAL_CONSOLE=y CONFIG_LP_8250_SERIAL_CONSOLE=y CONFIG_LP_SERIAL_IOBASE=0x3f8 +# CONFIG_LP_S5P_SERIAL_CONSOLE is not set +# CONFIG_LP_TEGRA_SERIAL_CONSOLE is not set +# CONFIG_LP_PL011_SERIAL_CONSOLE is not set # CONFIG_LP_SERIAL_SET_SPEED is not set # CONFIG_LP_SERIAL_ACS_FALLBACK is not set CONFIG_LP_VIDEO_CONSOLE=y @@ -52,6 +55,7 @@ CONFIG_LP_PC_KEYBOARD_LAYOUT_US=y # CONFIG_LP_PCI=y CONFIG_LP_NVRAM=y +CONFIG_LP_TIMER_RDTSC=y # CONFIG_LP_RTC_PORT_EXTENDED_VIA is not set # CONFIG_LP_SPEAKER is not set # CONFIG_LP_STORAGE is not set diff --git a/payloads/libpayload/configs/config.fox_baskingridge b/payloads/libpayload/configs/config.fox_baskingridge index 6f4f1aba97..0ba17336d9 100644 --- a/payloads/libpayload/configs/config.fox_baskingridge +++ b/payloads/libpayload/configs/config.fox_baskingridge @@ -37,6 +37,9 @@ CONFIG_LP_CBMEM_CONSOLE=y CONFIG_LP_SERIAL_CONSOLE=y CONFIG_LP_8250_SERIAL_CONSOLE=y CONFIG_LP_SERIAL_IOBASE=0x3f8 +# CONFIG_LP_S5P_SERIAL_CONSOLE is not set +# CONFIG_LP_TEGRA_SERIAL_CONSOLE is not set +# CONFIG_LP_PL011_SERIAL_CONSOLE is not set # CONFIG_LP_SERIAL_SET_SPEED is not set # CONFIG_LP_SERIAL_ACS_FALLBACK is not set CONFIG_LP_VIDEO_CONSOLE=y @@ -52,6 +55,7 @@ CONFIG_LP_PC_KEYBOARD_LAYOUT_US=y # CONFIG_LP_PCI=y CONFIG_LP_NVRAM=y +CONFIG_LP_TIMER_RDTSC=y # CONFIG_LP_RTC_PORT_EXTENDED_VIA is not set # CONFIG_LP_SPEAKER is not set # CONFIG_LP_STORAGE is not set diff --git a/payloads/libpayload/configs/config.fox_wtm2 b/payloads/libpayload/configs/config.fox_wtm2 index ef57458b95..1022748531 100644 --- a/payloads/libpayload/configs/config.fox_wtm2 +++ b/payloads/libpayload/configs/config.fox_wtm2 @@ -37,6 +37,9 @@ CONFIG_LP_CBMEM_CONSOLE=y CONFIG_LP_SERIAL_CONSOLE=y CONFIG_LP_8250_SERIAL_CONSOLE=y CONFIG_LP_SERIAL_IOBASE=0x3f8 +# CONFIG_LP_S5P_SERIAL_CONSOLE is not set +# CONFIG_LP_TEGRA_SERIAL_CONSOLE is not set +# CONFIG_LP_PL011_SERIAL_CONSOLE is not set # CONFIG_LP_SERIAL_SET_SPEED is not set # CONFIG_LP_SERIAL_ACS_FALLBACK is not set CONFIG_LP_VIDEO_CONSOLE=y @@ -52,6 +55,7 @@ CONFIG_LP_PC_KEYBOARD_LAYOUT_US=y # CONFIG_LP_PCI=y CONFIG_LP_NVRAM=y +CONFIG_LP_TIMER_RDTSC=y # CONFIG_LP_RTC_PORT_EXTENDED_VIA is not set # CONFIG_LP_SPEAKER is not set # CONFIG_LP_STORAGE is not set diff --git a/payloads/libpayload/configs/config.gizmo b/payloads/libpayload/configs/config.gizmo index 3f6f39d8ba..282974000b 100644 --- a/payloads/libpayload/configs/config.gizmo +++ b/payloads/libpayload/configs/config.gizmo @@ -36,6 +36,9 @@ CONFIG_LP_CBMEM_CONSOLE=y CONFIG_LP_SERIAL_CONSOLE=y CONFIG_LP_8250_SERIAL_CONSOLE=y CONFIG_LP_SERIAL_IOBASE=0x3f8 +# CONFIG_LP_S5P_SERIAL_CONSOLE is not set +# CONFIG_LP_TEGRA_SERIAL_CONSOLE is not set +# CONFIG_LP_PL011_SERIAL_CONSOLE is not set # CONFIG_LP_SERIAL_SET_SPEED is not set # CONFIG_LP_SERIAL_ACS_FALLBACK is not set CONFIG_LP_VIDEO_CONSOLE=y @@ -51,6 +54,7 @@ CONFIG_LP_PC_KEYBOARD_LAYOUT_US=y # CONFIG_LP_PCI=y CONFIG_LP_NVRAM=y +CONFIG_LP_TIMER_RDTSC=y # CONFIG_LP_RTC_PORT_EXTENDED_VIA is not set # CONFIG_LP_SPEAKER is not set # CONFIG_LP_STORAGE is not set diff --git a/payloads/libpayload/configs/config.link b/payloads/libpayload/configs/config.link index 6f4f1aba97..0ba17336d9 100644 --- a/payloads/libpayload/configs/config.link +++ b/payloads/libpayload/configs/config.link @@ -37,6 +37,9 @@ CONFIG_LP_CBMEM_CONSOLE=y CONFIG_LP_SERIAL_CONSOLE=y CONFIG_LP_8250_SERIAL_CONSOLE=y CONFIG_LP_SERIAL_IOBASE=0x3f8 +# CONFIG_LP_S5P_SERIAL_CONSOLE is not set +# CONFIG_LP_TEGRA_SERIAL_CONSOLE is not set +# CONFIG_LP_PL011_SERIAL_CONSOLE is not set # CONFIG_LP_SERIAL_SET_SPEED is not set # CONFIG_LP_SERIAL_ACS_FALLBACK is not set CONFIG_LP_VIDEO_CONSOLE=y @@ -52,6 +55,7 @@ CONFIG_LP_PC_KEYBOARD_LAYOUT_US=y # CONFIG_LP_PCI=y CONFIG_LP_NVRAM=y +CONFIG_LP_TIMER_RDTSC=y # CONFIG_LP_RTC_PORT_EXTENDED_VIA is not set # CONFIG_LP_SPEAKER is not set # CONFIG_LP_STORAGE is not set diff --git a/payloads/libpayload/configs/config.lumpy b/payloads/libpayload/configs/config.lumpy index 6f4f1aba97..0ba17336d9 100644 --- a/payloads/libpayload/configs/config.lumpy +++ b/payloads/libpayload/configs/config.lumpy @@ -37,6 +37,9 @@ CONFIG_LP_CBMEM_CONSOLE=y CONFIG_LP_SERIAL_CONSOLE=y CONFIG_LP_8250_SERIAL_CONSOLE=y CONFIG_LP_SERIAL_IOBASE=0x3f8 +# CONFIG_LP_S5P_SERIAL_CONSOLE is not set +# CONFIG_LP_TEGRA_SERIAL_CONSOLE is not set +# CONFIG_LP_PL011_SERIAL_CONSOLE is not set # CONFIG_LP_SERIAL_SET_SPEED is not set # CONFIG_LP_SERIAL_ACS_FALLBACK is not set CONFIG_LP_VIDEO_CONSOLE=y @@ -52,6 +55,7 @@ CONFIG_LP_PC_KEYBOARD_LAYOUT_US=y # CONFIG_LP_PCI=y CONFIG_LP_NVRAM=y +CONFIG_LP_TIMER_RDTSC=y # CONFIG_LP_RTC_PORT_EXTENDED_VIA is not set # CONFIG_LP_SPEAKER is not set # CONFIG_LP_STORAGE is not set diff --git a/payloads/libpayload/configs/config.nyan b/payloads/libpayload/configs/config.nyan index 9217a9065f..95fe565a87 100644 --- a/payloads/libpayload/configs/config.nyan +++ b/payloads/libpayload/configs/config.nyan @@ -16,7 +16,6 @@ CONFIG_LP_CHROMEOS=y # Architecture Options # CONFIG_LP_ARCH_ARM=y -# CONFIG_LP_ARCH_POWERPC is not set # CONFIG_LP_ARCH_X86 is not set # CONFIG_LP_MEMMAP_RAM_ONLY is not set @@ -34,7 +33,11 @@ CONFIG_LP_LZMA=y 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_S5P_SERIAL_CONSOLE is not set CONFIG_LP_TEGRA_SERIAL_CONSOLE=y +# CONFIG_LP_SERIAL_SET_SPEED is not set +# CONFIG_LP_SERIAL_ACS_FALLBACK is not set CONFIG_LP_VIDEO_CONSOLE=y CONFIG_LP_COREBOOT_VIDEO_CONSOLE=y # CONFIG_LP_PC_KEYBOARD is not set @@ -44,7 +47,10 @@ CONFIG_LP_COREBOOT_VIDEO_CONSOLE=y # # CONFIG_LP_RTC_PORT_EXTENDED_VIA is not set # CONFIG_LP_STORAGE is not set +# CONFIG_LP_TIMER_NONE is not set +# CONFIG_LP_TIMER_MCT is not set CONFIG_LP_TIMER_TEGRA_1US=y +CONFIG_LP_TIMER_TEGRA_1US_ADDRESS=0x60005010 CONFIG_LP_USB=y # CONFIG_LP_USB_OHCI is not set CONFIG_LP_USB_EHCI=y diff --git a/payloads/libpayload/configs/config.nyan_big b/payloads/libpayload/configs/config.nyan_big index 9217a9065f..95fe565a87 100644 --- a/payloads/libpayload/configs/config.nyan_big +++ b/payloads/libpayload/configs/config.nyan_big @@ -16,7 +16,6 @@ CONFIG_LP_CHROMEOS=y # Architecture Options # CONFIG_LP_ARCH_ARM=y -# CONFIG_LP_ARCH_POWERPC is not set # CONFIG_LP_ARCH_X86 is not set # CONFIG_LP_MEMMAP_RAM_ONLY is not set @@ -34,7 +33,11 @@ CONFIG_LP_LZMA=y 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_S5P_SERIAL_CONSOLE is not set CONFIG_LP_TEGRA_SERIAL_CONSOLE=y +# CONFIG_LP_SERIAL_SET_SPEED is not set +# CONFIG_LP_SERIAL_ACS_FALLBACK is not set CONFIG_LP_VIDEO_CONSOLE=y CONFIG_LP_COREBOOT_VIDEO_CONSOLE=y # CONFIG_LP_PC_KEYBOARD is not set @@ -44,7 +47,10 @@ CONFIG_LP_COREBOOT_VIDEO_CONSOLE=y # # CONFIG_LP_RTC_PORT_EXTENDED_VIA is not set # CONFIG_LP_STORAGE is not set +# CONFIG_LP_TIMER_NONE is not set +# CONFIG_LP_TIMER_MCT is not set CONFIG_LP_TIMER_TEGRA_1US=y +CONFIG_LP_TIMER_TEGRA_1US_ADDRESS=0x60005010 CONFIG_LP_USB=y # CONFIG_LP_USB_OHCI is not set CONFIG_LP_USB_EHCI=y diff --git a/payloads/libpayload/configs/config.nyan_blaze b/payloads/libpayload/configs/config.nyan_blaze index 9217a9065f..95fe565a87 100644 --- a/payloads/libpayload/configs/config.nyan_blaze +++ b/payloads/libpayload/configs/config.nyan_blaze @@ -16,7 +16,6 @@ CONFIG_LP_CHROMEOS=y # Architecture Options # CONFIG_LP_ARCH_ARM=y -# CONFIG_LP_ARCH_POWERPC is not set # CONFIG_LP_ARCH_X86 is not set # CONFIG_LP_MEMMAP_RAM_ONLY is not set @@ -34,7 +33,11 @@ CONFIG_LP_LZMA=y 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_S5P_SERIAL_CONSOLE is not set CONFIG_LP_TEGRA_SERIAL_CONSOLE=y +# CONFIG_LP_SERIAL_SET_SPEED is not set +# CONFIG_LP_SERIAL_ACS_FALLBACK is not set CONFIG_LP_VIDEO_CONSOLE=y CONFIG_LP_COREBOOT_VIDEO_CONSOLE=y # CONFIG_LP_PC_KEYBOARD is not set @@ -44,7 +47,10 @@ CONFIG_LP_COREBOOT_VIDEO_CONSOLE=y # # CONFIG_LP_RTC_PORT_EXTENDED_VIA is not set # CONFIG_LP_STORAGE is not set +# CONFIG_LP_TIMER_NONE is not set +# CONFIG_LP_TIMER_MCT is not set CONFIG_LP_TIMER_TEGRA_1US=y +CONFIG_LP_TIMER_TEGRA_1US_ADDRESS=0x60005010 CONFIG_LP_USB=y # CONFIG_LP_USB_OHCI is not set CONFIG_LP_USB_EHCI=y diff --git a/payloads/libpayload/configs/config.panther b/payloads/libpayload/configs/config.panther index e3af09974d..e342b25b67 100644 --- a/payloads/libpayload/configs/config.panther +++ b/payloads/libpayload/configs/config.panther @@ -37,6 +37,9 @@ CONFIG_LP_CBMEM_CONSOLE=y CONFIG_LP_SERIAL_CONSOLE=y CONFIG_LP_8250_SERIAL_CONSOLE=y CONFIG_LP_SERIAL_IOBASE=0x3f8 +# CONFIG_LP_S5P_SERIAL_CONSOLE is not set +# CONFIG_LP_TEGRA_SERIAL_CONSOLE is not set +# CONFIG_LP_PL011_SERIAL_CONSOLE is not set # CONFIG_LP_SERIAL_SET_SPEED is not set # CONFIG_LP_SERIAL_ACS_FALLBACK is not set CONFIG_LP_VIDEO_CONSOLE=y @@ -52,6 +55,7 @@ CONFIG_LP_PC_KEYBOARD_LAYOUT_US=y # CONFIG_LP_PCI=y CONFIG_LP_NVRAM=y +CONFIG_LP_TIMER_RDTSC=y # CONFIG_LP_RTC_PORT_EXTENDED_VIA is not set # CONFIG_LP_SPEAKER is not set # CONFIG_LP_STORAGE is not set diff --git a/payloads/libpayload/configs/config.peach_pit b/payloads/libpayload/configs/config.peach_pit index a9de87e922..07aef385b5 100644 --- a/payloads/libpayload/configs/config.peach_pit +++ b/payloads/libpayload/configs/config.peach_pit @@ -16,7 +16,6 @@ CONFIG_LP_CHROMEOS=y # Architecture Options # CONFIG_LP_ARCH_ARM=y -# CONFIG_LP_ARCH_POWERPC is not set # CONFIG_LP_ARCH_X86 is not set # CONFIG_LP_MEMMAP_RAM_ONLY is not set @@ -34,7 +33,11 @@ CONFIG_LP_LZMA=y 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_S5P_SERIAL_CONSOLE=y +# CONFIG_LP_TEGRA_SERIAL_CONSOLE is not set +# CONFIG_LP_SERIAL_SET_SPEED is not set +# CONFIG_LP_SERIAL_ACS_FALLBACK is not set CONFIG_LP_VIDEO_CONSOLE=y CONFIG_LP_COREBOOT_VIDEO_CONSOLE=y # CONFIG_LP_PC_KEYBOARD is not set @@ -44,7 +47,11 @@ CONFIG_LP_COREBOOT_VIDEO_CONSOLE=y # # CONFIG_LP_RTC_PORT_EXTENDED_VIA is not set # CONFIG_LP_STORAGE is not set +# CONFIG_LP_TIMER_NONE is not set CONFIG_LP_TIMER_MCT=y +# CONFIG_LP_TIMER_TEGRA_1US is not set +CONFIG_LP_TIMER_MCT_HZ=24000000 +CONFIG_LP_TIMER_MCT_ADDRESS=0x101c0000 CONFIG_LP_USB=y # CONFIG_LP_USB_OHCI is not set # CONFIG_LP_USB_EHCI is not set diff --git a/payloads/libpayload/configs/config.peppy b/payloads/libpayload/configs/config.peppy index ef57458b95..1022748531 100644 --- a/payloads/libpayload/configs/config.peppy +++ b/payloads/libpayload/configs/config.peppy @@ -37,6 +37,9 @@ CONFIG_LP_CBMEM_CONSOLE=y CONFIG_LP_SERIAL_CONSOLE=y CONFIG_LP_8250_SERIAL_CONSOLE=y CONFIG_LP_SERIAL_IOBASE=0x3f8 +# CONFIG_LP_S5P_SERIAL_CONSOLE is not set +# CONFIG_LP_TEGRA_SERIAL_CONSOLE is not set +# CONFIG_LP_PL011_SERIAL_CONSOLE is not set # CONFIG_LP_SERIAL_SET_SPEED is not set # CONFIG_LP_SERIAL_ACS_FALLBACK is not set CONFIG_LP_VIDEO_CONSOLE=y @@ -52,6 +55,7 @@ CONFIG_LP_PC_KEYBOARD_LAYOUT_US=y # CONFIG_LP_PCI=y CONFIG_LP_NVRAM=y +CONFIG_LP_TIMER_RDTSC=y # CONFIG_LP_RTC_PORT_EXTENDED_VIA is not set # CONFIG_LP_SPEAKER is not set # CONFIG_LP_STORAGE is not set diff --git a/payloads/libpayload/configs/config.rambi b/payloads/libpayload/configs/config.rambi index 485311c482..d1435a6fc7 100644 --- a/payloads/libpayload/configs/config.rambi +++ b/payloads/libpayload/configs/config.rambi @@ -36,6 +36,9 @@ CONFIG_LP_CBMEM_CONSOLE=y CONFIG_LP_SERIAL_CONSOLE=y CONFIG_LP_8250_SERIAL_CONSOLE=y CONFIG_LP_SERIAL_IOBASE=0x3f8 +# CONFIG_LP_S5P_SERIAL_CONSOLE is not set +# CONFIG_LP_TEGRA_SERIAL_CONSOLE is not set +# CONFIG_LP_PL011_SERIAL_CONSOLE is not set # CONFIG_LP_SERIAL_SET_SPEED is not set # CONFIG_LP_SERIAL_ACS_FALLBACK is not set CONFIG_LP_VIDEO_CONSOLE=y @@ -51,6 +54,7 @@ CONFIG_LP_PC_KEYBOARD_LAYOUT_US=y # CONFIG_LP_PCI=y CONFIG_LP_NVRAM=y +CONFIG_LP_TIMER_RDTSC=y # CONFIG_LP_RTC_PORT_EXTENDED_VIA is not set # CONFIG_LP_SPEAKER is not set # CONFIG_LP_STORAGE is not set diff --git a/payloads/libpayload/configs/config.samus b/payloads/libpayload/configs/config.samus index e3af09974d..e342b25b67 100644 --- a/payloads/libpayload/configs/config.samus +++ b/payloads/libpayload/configs/config.samus @@ -37,6 +37,9 @@ CONFIG_LP_CBMEM_CONSOLE=y CONFIG_LP_SERIAL_CONSOLE=y CONFIG_LP_8250_SERIAL_CONSOLE=y CONFIG_LP_SERIAL_IOBASE=0x3f8 +# CONFIG_LP_S5P_SERIAL_CONSOLE is not set +# CONFIG_LP_TEGRA_SERIAL_CONSOLE is not set +# CONFIG_LP_PL011_SERIAL_CONSOLE is not set # CONFIG_LP_SERIAL_SET_SPEED is not set # CONFIG_LP_SERIAL_ACS_FALLBACK is not set CONFIG_LP_VIDEO_CONSOLE=y @@ -52,6 +55,7 @@ CONFIG_LP_PC_KEYBOARD_LAYOUT_US=y # CONFIG_LP_PCI=y CONFIG_LP_NVRAM=y +CONFIG_LP_TIMER_RDTSC=y # CONFIG_LP_RTC_PORT_EXTENDED_VIA is not set # CONFIG_LP_SPEAKER is not set # CONFIG_LP_STORAGE is not set diff --git a/payloads/libpayload/configs/config.slippy b/payloads/libpayload/configs/config.slippy index ef57458b95..1022748531 100644 --- a/payloads/libpayload/configs/config.slippy +++ b/payloads/libpayload/configs/config.slippy @@ -37,6 +37,9 @@ CONFIG_LP_CBMEM_CONSOLE=y CONFIG_LP_SERIAL_CONSOLE=y CONFIG_LP_8250_SERIAL_CONSOLE=y CONFIG_LP_SERIAL_IOBASE=0x3f8 +# CONFIG_LP_S5P_SERIAL_CONSOLE is not set +# CONFIG_LP_TEGRA_SERIAL_CONSOLE is not set +# CONFIG_LP_PL011_SERIAL_CONSOLE is not set # CONFIG_LP_SERIAL_SET_SPEED is not set # CONFIG_LP_SERIAL_ACS_FALLBACK is not set CONFIG_LP_VIDEO_CONSOLE=y @@ -52,6 +55,7 @@ CONFIG_LP_PC_KEYBOARD_LAYOUT_US=y # CONFIG_LP_PCI=y CONFIG_LP_NVRAM=y +CONFIG_LP_TIMER_RDTSC=y # CONFIG_LP_RTC_PORT_EXTENDED_VIA is not set # CONFIG_LP_SPEAKER is not set # CONFIG_LP_STORAGE is not set