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 <bmeng.cn@gmail.com>
Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com>
Reviewed-by: Simon Glass <sjg@chromium.org>

diff --git a/arch/Kconfig b/arch/Kconfig
index 37016477cf29c34fc03ed449b270f75becc55484..7ccdbf72b5b7dd9520dcd211e97db48fd062aa12 100644 (file)
--- 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 936808d30ab767c54faae8970f065039dad9faf1..847811df398e237b46c5c7165a0ae79aaab56781 100644 (file)
--- 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 5dc5d7831d8fef035ded0e3c1f7bc603bc014ab5..a3b1897a2e3e7f715b062cfb8f1726293c62f790 100644 (file)
--- 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 fb54d77ba67d250c7b96d1893653b3aecf8014c5..bdc068b86be8fd6c9a68cb2be88b1b56597caa75 100644 (file)
--- 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 2450bfe147b10962b38e648069f2ea6ce2bcb648..27bf5dd9875004cb2aafbcbd870adce55c280d70 100644 (file)
--- 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 c1d694f28ed9806156b56698452e8f64e1942078..e67b06b873d1c3f7c056c729976615d02e6e05cc 100644 (file)
--- 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 4802525caef4cdc711b20a1be14d88cbb6455dc3..2841a54fb0e953b8fea5e9e24925a3c365322641 100644 (file)
--- 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 753ee3ffc9dd16e2bb17926e00660126a29c64f4..131324580971af080e122e101cdc9399b871fe40 100644 (file)
--- 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 3950bfc7ff2f2145d6681266e155d73baa691a35..15b7de2e8e3259bc2b27661026bf4caea4f658e0 100644 (file)
--- 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 49a84c5e2e9096d0f24fe3bde410fd265812bfcf..3dce56672a5e9f8f46bbf145fc55c2678661f25e 100644 (file)
--- 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 032097edd425d1ef35d2eb54dc7a80b273286905..c097edc2a60dae44c5910b7ad31e76117148e0ff 100644 (file)
--- 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 57b4075fd640bb1c3a504e501b302edc4d4b0976..87a6343bee1551f5b012e8163f889fb4f50f3b79 100644 (file)
--- 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 f33b35c8d268ce3892ad89d044d620060cfb9ee0..52d3adff8b8a98e72eadc55d8fd99d09603e3f49 100644 (file)
--- 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 f93f937fdf599b49273502bd79cc4059359b47ac..36be406e2d5b281df9af1e3fc85a080efcc300e8 100644 (file)
--- 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 5fa8a54fc2aeb3f3bbeb147e8e96839bc7cfea68..2a77474840b8323506d7d9c0ec191edfe8ade976 100644 (file)
--- 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 94fe5e308c1a4b4c281882d2f4eda4e803b24534..4e4dca2f17d88fd326acd2633e4b7c2757b03ba0 100644 (file)
--- 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 30d4d245192eed1fbb79e0bd6132d23551a77e63..4c1689ab184bbc3c3d2ec3206818f53b15e338c2 100644 (file)
--- 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 53cbb6a4be53fca91d039bf0f939c412c3049870..7c418e513d4cb020bf629b2cad7fb41d5e49b67d 100644 (file)
--- 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 6e021b9c0de1111becb5335cf360b496ae319419..8cd88201e673aa554d67211564e149222f0438b6 100644 (file)
--- 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 026f08f866a84738d681f9c661509d3eec72eb51..86d16cdb589a6d6e36897842b4daac47aa9a5c3b 100644 (file)
--- 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 c7cd91db329dd7e8c7a374dfba3f1f8f94611ebd..54d21745d88fb70af6fd571a1c626a39fc527bf8 100644 (file)
--- 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 cf5cb720187c60def30fbb90d2098dda9b1cd345..ad02e0cc077bc761cb3fdd6cca3d06dd1b963e5a 100644 (file)
--- 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 17e7dfe24526898abd90d07edbc8f7922a01bb30..c666303331165dcf2e100adcf3fea41a0db660c1 100644 (file)
--- 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.