From 0ce9c57620a375bf58ae8d9a20698fb295bd1584 Mon Sep 17 00:00:00 2001 From: Bin Meng Date: Sun, 30 Jul 2017 06:23:07 -0700 Subject: [PATCH] x86: kconfig: Select TIMER and X86_TSC_TIMER Without a timer, U-Boot just doesn't boot. This is not something we can turn off. Signed-off-by: Bin Meng Reviewed-by: Andy Shevchenko Reviewed-by: Simon Glass --- arch/Kconfig | 2 ++ configs/bayleybay_defconfig | 1 - configs/chromebook_link64_defconfig | 1 - configs/chromebook_link_defconfig | 1 - configs/chromebook_samus_defconfig | 1 - configs/chromebox_panther_defconfig | 1 - configs/conga-qeval20-qa3-e3845-internal-uart_defconfig | 1 - configs/conga-qeval20-qa3-e3845_defconfig | 1 - configs/coreboot-x86_defconfig | 1 - configs/cougarcanyon2_defconfig | 1 - configs/crownbay_defconfig | 1 - configs/dfi-bt700-q7x-151_defconfig | 1 - configs/edison_defconfig | 1 - configs/efi-x86_defconfig | 1 - configs/galileo_defconfig | 1 - configs/minnowmax_defconfig | 1 - configs/qemu-x86_64_defconfig | 1 - configs/qemu-x86_defconfig | 1 - configs/qemu-x86_efi_payload32_defconfig | 1 - configs/qemu-x86_efi_payload64_defconfig | 1 - configs/som-db5800-som-6867_defconfig | 1 - configs/theadorable-x86-dfi-bt700_defconfig | 1 - drivers/timer/Kconfig | 1 - 23 files changed, 2 insertions(+), 22 deletions(-) diff --git a/arch/Kconfig b/arch/Kconfig index 37016477cf..7ccdbf72b5 100644 --- a/arch/Kconfig +++ b/arch/Kconfig @@ -94,6 +94,8 @@ config X86 select DM_GPIO select DM_SPI select DM_SPI_FLASH + select TIMER + select X86_TSC_TIMER select USB select USB_EHCI_HCD imply CMD_FPGA_LOADMK diff --git a/configs/bayleybay_defconfig b/configs/bayleybay_defconfig index 936808d30a..847811df39 100644 --- a/configs/bayleybay_defconfig +++ b/configs/bayleybay_defconfig @@ -62,7 +62,6 @@ CONFIG_DM_PCI=y CONFIG_DM_RTC=y CONFIG_SYS_NS16550=y CONFIG_ICH_SPI=y -CONFIG_TIMER=y CONFIG_DM_USB=y CONFIG_USB_STORAGE=y CONFIG_USB_KEYBOARD=y diff --git a/configs/chromebook_link64_defconfig b/configs/chromebook_link64_defconfig index 5dc5d7831d..a3b1897a2e 100644 --- a/configs/chromebook_link64_defconfig +++ b/configs/chromebook_link64_defconfig @@ -77,7 +77,6 @@ CONFIG_DEBUG_UART_CLOCK=1843200 CONFIG_DEBUG_UART_BOARD_INIT=y CONFIG_SYS_NS16550=y CONFIG_ICH_SPI=y -CONFIG_TIMER=y CONFIG_TPM_TIS_LPC=y CONFIG_DM_USB=y CONFIG_USB_STORAGE=y diff --git a/configs/chromebook_link_defconfig b/configs/chromebook_link_defconfig index fb54d77ba6..bdc068b86b 100644 --- a/configs/chromebook_link_defconfig +++ b/configs/chromebook_link_defconfig @@ -60,7 +60,6 @@ CONFIG_DEBUG_UART_CLOCK=1843200 CONFIG_DEBUG_UART_BOARD_INIT=y CONFIG_SYS_NS16550=y CONFIG_ICH_SPI=y -CONFIG_TIMER=y CONFIG_TPM_TIS_LPC=y CONFIG_DM_USB=y CONFIG_USB_STORAGE=y diff --git a/configs/chromebook_samus_defconfig b/configs/chromebook_samus_defconfig index 2450bfe147..27bf5dd987 100644 --- a/configs/chromebook_samus_defconfig +++ b/configs/chromebook_samus_defconfig @@ -57,7 +57,6 @@ CONFIG_DEBUG_UART_CLOCK=1843200 CONFIG_DEBUG_UART_BOARD_INIT=y CONFIG_SYS_NS16550=y CONFIG_ICH_SPI=y -CONFIG_TIMER=y CONFIG_TPM_TIS_LPC=y CONFIG_DM_USB=y CONFIG_USB_STORAGE=y diff --git a/configs/chromebox_panther_defconfig b/configs/chromebox_panther_defconfig index c1d694f28e..e67b06b873 100644 --- a/configs/chromebox_panther_defconfig +++ b/configs/chromebox_panther_defconfig @@ -52,7 +52,6 @@ CONFIG_DM_PCI=y CONFIG_DM_RTC=y CONFIG_SYS_NS16550=y CONFIG_ICH_SPI=y -CONFIG_TIMER=y CONFIG_TPM_TIS_LPC=y CONFIG_DM_USB=y CONFIG_USB_STORAGE=y diff --git a/configs/conga-qeval20-qa3-e3845-internal-uart_defconfig b/configs/conga-qeval20-qa3-e3845-internal-uart_defconfig index 4802525cae..2841a54fb0 100644 --- a/configs/conga-qeval20-qa3-e3845-internal-uart_defconfig +++ b/configs/conga-qeval20-qa3-e3845-internal-uart_defconfig @@ -67,7 +67,6 @@ CONFIG_DEBUG_UART_BASE=0x3f8 CONFIG_DEBUG_UART_CLOCK=1843200 CONFIG_SYS_NS16550=y CONFIG_ICH_SPI=y -CONFIG_TIMER=y CONFIG_DM_USB=y CONFIG_USB_STORAGE=y CONFIG_USB_KEYBOARD=y diff --git a/configs/conga-qeval20-qa3-e3845_defconfig b/configs/conga-qeval20-qa3-e3845_defconfig index 753ee3ffc9..1313245809 100644 --- a/configs/conga-qeval20-qa3-e3845_defconfig +++ b/configs/conga-qeval20-qa3-e3845_defconfig @@ -66,7 +66,6 @@ CONFIG_DEBUG_UART_BASE=0x3f8 CONFIG_DEBUG_UART_CLOCK=1843200 CONFIG_SYS_NS16550=y CONFIG_ICH_SPI=y -CONFIG_TIMER=y CONFIG_DM_USB=y CONFIG_USB_STORAGE=y CONFIG_USB_KEYBOARD=y diff --git a/configs/coreboot-x86_defconfig b/configs/coreboot-x86_defconfig index 3950bfc7ff..15b7de2e8e 100644 --- a/configs/coreboot-x86_defconfig +++ b/configs/coreboot-x86_defconfig @@ -43,7 +43,6 @@ CONFIG_E1000=y CONFIG_DM_PCI=y CONFIG_DM_RTC=y CONFIG_SYS_NS16550=y -CONFIG_TIMER=y CONFIG_TPM_TIS_LPC=y CONFIG_DM_USB=y CONFIG_USB_STORAGE=y diff --git a/configs/cougarcanyon2_defconfig b/configs/cougarcanyon2_defconfig index 49a84c5e2e..3dce56672a 100644 --- a/configs/cougarcanyon2_defconfig +++ b/configs/cougarcanyon2_defconfig @@ -37,7 +37,6 @@ CONFIG_DM_PCI=y CONFIG_DM_RTC=y CONFIG_SYS_NS16550=y CONFIG_ICH_SPI=y -CONFIG_TIMER=y CONFIG_DM_USB=y CONFIG_USB_STORAGE=y CONFIG_USB_KEYBOARD=y diff --git a/configs/crownbay_defconfig b/configs/crownbay_defconfig index 032097edd4..c097edc2a6 100644 --- a/configs/crownbay_defconfig +++ b/configs/crownbay_defconfig @@ -54,7 +54,6 @@ CONFIG_DM_PCI=y CONFIG_DM_RTC=y CONFIG_SYS_NS16550=y CONFIG_ICH_SPI=y -CONFIG_TIMER=y CONFIG_DM_USB=y CONFIG_USB_STORAGE=y CONFIG_USB_KEYBOARD=y diff --git a/configs/dfi-bt700-q7x-151_defconfig b/configs/dfi-bt700-q7x-151_defconfig index 57b4075fd6..87a6343bee 100644 --- a/configs/dfi-bt700-q7x-151_defconfig +++ b/configs/dfi-bt700-q7x-151_defconfig @@ -64,7 +64,6 @@ CONFIG_DEBUG_UART_BASE=0x3f8 CONFIG_DEBUG_UART_CLOCK=1843200 CONFIG_SYS_NS16550=y CONFIG_ICH_SPI=y -CONFIG_TIMER=y CONFIG_DM_USB=y CONFIG_USB_STORAGE=y CONFIG_USB_KEYBOARD=y diff --git a/configs/edison_defconfig b/configs/edison_defconfig index f33b35c8d2..52d3adff8b 100644 --- a/configs/edison_defconfig +++ b/configs/edison_defconfig @@ -39,7 +39,6 @@ CONFIG_DM_PCI=y CONFIG_DM_PCI_COMPAT=y CONFIG_DM_RTC=y CONFIG_INTEL_MID_SERIAL=y -CONFIG_TIMER=y CONFIG_USB_DWC3=y CONFIG_USB_DWC3_GADGET=y CONFIG_USB_GADGET=y diff --git a/configs/efi-x86_defconfig b/configs/efi-x86_defconfig index f93f937fdf..36be406e2d 100644 --- a/configs/efi-x86_defconfig +++ b/configs/efi-x86_defconfig @@ -37,7 +37,6 @@ CONFIG_DEBUG_EFI_CONSOLE=y CONFIG_DEBUG_UART_BASE=0 CONFIG_DEBUG_UART_CLOCK=0 CONFIG_ICH_SPI=y -CONFIG_TIMER=y CONFIG_USB_STORAGE=y CONFIG_USB_KEYBOARD=y CONFIG_EFI=y diff --git a/configs/galileo_defconfig b/configs/galileo_defconfig index 5fa8a54fc2..2a77474840 100644 --- a/configs/galileo_defconfig +++ b/configs/galileo_defconfig @@ -56,7 +56,6 @@ CONFIG_DM_PCI=y CONFIG_DM_RTC=y CONFIG_SYS_NS16550=y CONFIG_ICH_SPI=y -CONFIG_TIMER=y CONFIG_DM_USB=y CONFIG_USB_STORAGE=y CONFIG_USB_KEYBOARD=y diff --git a/configs/minnowmax_defconfig b/configs/minnowmax_defconfig index 94fe5e308c..4e4dca2f17 100644 --- a/configs/minnowmax_defconfig +++ b/configs/minnowmax_defconfig @@ -66,7 +66,6 @@ CONFIG_DEBUG_UART_BASE=0x3f8 CONFIG_DEBUG_UART_CLOCK=1843200 CONFIG_SYS_NS16550=y CONFIG_ICH_SPI=y -CONFIG_TIMER=y CONFIG_DM_USB=y CONFIG_USB_XHCI_HCD=y CONFIG_USB_STORAGE=y diff --git a/configs/qemu-x86_64_defconfig b/configs/qemu-x86_64_defconfig index 30d4d24519..4c1689ab18 100644 --- a/configs/qemu-x86_64_defconfig +++ b/configs/qemu-x86_64_defconfig @@ -70,7 +70,6 @@ CONFIG_DM_RTC=y CONFIG_DEBUG_UART_BASE=0x3f8 CONFIG_DEBUG_UART_CLOCK=1843200 CONFIG_SYS_NS16550=y -CONFIG_TIMER=y CONFIG_DM_USB=y CONFIG_USB_STORAGE=y CONFIG_USB_KEYBOARD=y diff --git a/configs/qemu-x86_defconfig b/configs/qemu-x86_defconfig index 53cbb6a4be..7c418e513d 100644 --- a/configs/qemu-x86_defconfig +++ b/configs/qemu-x86_defconfig @@ -48,7 +48,6 @@ CONFIG_E1000=y CONFIG_DM_PCI=y CONFIG_DM_RTC=y CONFIG_SYS_NS16550=y -CONFIG_TIMER=y CONFIG_DM_USB=y CONFIG_USB_STORAGE=y CONFIG_USB_KEYBOARD=y diff --git a/configs/qemu-x86_efi_payload32_defconfig b/configs/qemu-x86_efi_payload32_defconfig index 6e021b9c0d..8cd88201e6 100644 --- a/configs/qemu-x86_efi_payload32_defconfig +++ b/configs/qemu-x86_efi_payload32_defconfig @@ -45,7 +45,6 @@ CONFIG_E1000=y CONFIG_DM_PCI=y CONFIG_DM_RTC=y CONFIG_SYS_NS16550=y -CONFIG_TIMER=y CONFIG_DM_USB=y CONFIG_USB_STORAGE=y CONFIG_USB_KEYBOARD=y diff --git a/configs/qemu-x86_efi_payload64_defconfig b/configs/qemu-x86_efi_payload64_defconfig index 026f08f866..86d16cdb58 100644 --- a/configs/qemu-x86_efi_payload64_defconfig +++ b/configs/qemu-x86_efi_payload64_defconfig @@ -46,7 +46,6 @@ CONFIG_E1000=y CONFIG_DM_PCI=y CONFIG_DM_RTC=y CONFIG_SYS_NS16550=y -CONFIG_TIMER=y CONFIG_DM_USB=y CONFIG_USB_STORAGE=y CONFIG_USB_KEYBOARD=y diff --git a/configs/som-db5800-som-6867_defconfig b/configs/som-db5800-som-6867_defconfig index c7cd91db32..54d21745d8 100644 --- a/configs/som-db5800-som-6867_defconfig +++ b/configs/som-db5800-som-6867_defconfig @@ -58,7 +58,6 @@ CONFIG_DEBUG_UART_BASE=0x3f8 CONFIG_DEBUG_UART_CLOCK=1843200 CONFIG_SYS_NS16550=y CONFIG_ICH_SPI=y -CONFIG_TIMER=y CONFIG_DM_USB=y CONFIG_USB_STORAGE=y CONFIG_USB_KEYBOARD=y diff --git a/configs/theadorable-x86-dfi-bt700_defconfig b/configs/theadorable-x86-dfi-bt700_defconfig index cf5cb72018..ad02e0cc07 100644 --- a/configs/theadorable-x86-dfi-bt700_defconfig +++ b/configs/theadorable-x86-dfi-bt700_defconfig @@ -63,7 +63,6 @@ CONFIG_DM_PCI=y CONFIG_DM_RTC=y CONFIG_SYS_NS16550=y CONFIG_ICH_SPI=y -CONFIG_TIMER=y CONFIG_DM_USB=y CONFIG_USB_STORAGE=y CONFIG_USB_KEYBOARD=y diff --git a/drivers/timer/Kconfig b/drivers/timer/Kconfig index 17e7dfe245..c666303331 100644 --- a/drivers/timer/Kconfig +++ b/drivers/timer/Kconfig @@ -36,7 +36,6 @@ config SANDBOX_TIMER config X86_TSC_TIMER bool "x86 Time-Stamp Counter (TSC) timer support" depends on TIMER && X86 - default y if X86 help Select this to enable Time-Stamp Counter (TSC) timer for x86. -- 2.39.5