Commit 0ce9c57620a375bf58ae8d9a20698fb295bd1584

Authored by Bin Meng
1 parent c3df28f6e2

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>

Showing 23 changed files with 2 additions and 22 deletions Side-by-side Diff

... ... @@ -94,6 +94,8 @@
94 94 select DM_GPIO
95 95 select DM_SPI
96 96 select DM_SPI_FLASH
  97 + select TIMER
  98 + select X86_TSC_TIMER
97 99 select USB
98 100 select USB_EHCI_HCD
99 101 imply CMD_FPGA_LOADMK
configs/bayleybay_defconfig
... ... @@ -62,7 +62,6 @@
62 62 CONFIG_DM_RTC=y
63 63 CONFIG_SYS_NS16550=y
64 64 CONFIG_ICH_SPI=y
65   -CONFIG_TIMER=y
66 65 CONFIG_DM_USB=y
67 66 CONFIG_USB_STORAGE=y
68 67 CONFIG_USB_KEYBOARD=y
configs/chromebook_link64_defconfig
... ... @@ -77,7 +77,6 @@
77 77 CONFIG_DEBUG_UART_BOARD_INIT=y
78 78 CONFIG_SYS_NS16550=y
79 79 CONFIG_ICH_SPI=y
80   -CONFIG_TIMER=y
81 80 CONFIG_TPM_TIS_LPC=y
82 81 CONFIG_DM_USB=y
83 82 CONFIG_USB_STORAGE=y
configs/chromebook_link_defconfig
... ... @@ -60,7 +60,6 @@
60 60 CONFIG_DEBUG_UART_BOARD_INIT=y
61 61 CONFIG_SYS_NS16550=y
62 62 CONFIG_ICH_SPI=y
63   -CONFIG_TIMER=y
64 63 CONFIG_TPM_TIS_LPC=y
65 64 CONFIG_DM_USB=y
66 65 CONFIG_USB_STORAGE=y
configs/chromebook_samus_defconfig
... ... @@ -57,7 +57,6 @@
57 57 CONFIG_DEBUG_UART_BOARD_INIT=y
58 58 CONFIG_SYS_NS16550=y
59 59 CONFIG_ICH_SPI=y
60   -CONFIG_TIMER=y
61 60 CONFIG_TPM_TIS_LPC=y
62 61 CONFIG_DM_USB=y
63 62 CONFIG_USB_STORAGE=y
configs/chromebox_panther_defconfig
... ... @@ -52,7 +52,6 @@
52 52 CONFIG_DM_RTC=y
53 53 CONFIG_SYS_NS16550=y
54 54 CONFIG_ICH_SPI=y
55   -CONFIG_TIMER=y
56 55 CONFIG_TPM_TIS_LPC=y
57 56 CONFIG_DM_USB=y
58 57 CONFIG_USB_STORAGE=y
configs/conga-qeval20-qa3-e3845-internal-uart_defconfig
... ... @@ -67,7 +67,6 @@
67 67 CONFIG_DEBUG_UART_CLOCK=1843200
68 68 CONFIG_SYS_NS16550=y
69 69 CONFIG_ICH_SPI=y
70   -CONFIG_TIMER=y
71 70 CONFIG_DM_USB=y
72 71 CONFIG_USB_STORAGE=y
73 72 CONFIG_USB_KEYBOARD=y
configs/conga-qeval20-qa3-e3845_defconfig
... ... @@ -66,7 +66,6 @@
66 66 CONFIG_DEBUG_UART_CLOCK=1843200
67 67 CONFIG_SYS_NS16550=y
68 68 CONFIG_ICH_SPI=y
69   -CONFIG_TIMER=y
70 69 CONFIG_DM_USB=y
71 70 CONFIG_USB_STORAGE=y
72 71 CONFIG_USB_KEYBOARD=y
configs/coreboot-x86_defconfig
... ... @@ -43,7 +43,6 @@
43 43 CONFIG_DM_PCI=y
44 44 CONFIG_DM_RTC=y
45 45 CONFIG_SYS_NS16550=y
46   -CONFIG_TIMER=y
47 46 CONFIG_TPM_TIS_LPC=y
48 47 CONFIG_DM_USB=y
49 48 CONFIG_USB_STORAGE=y
configs/cougarcanyon2_defconfig
... ... @@ -37,7 +37,6 @@
37 37 CONFIG_DM_RTC=y
38 38 CONFIG_SYS_NS16550=y
39 39 CONFIG_ICH_SPI=y
40   -CONFIG_TIMER=y
41 40 CONFIG_DM_USB=y
42 41 CONFIG_USB_STORAGE=y
43 42 CONFIG_USB_KEYBOARD=y
configs/crownbay_defconfig
... ... @@ -54,7 +54,6 @@
54 54 CONFIG_DM_RTC=y
55 55 CONFIG_SYS_NS16550=y
56 56 CONFIG_ICH_SPI=y
57   -CONFIG_TIMER=y
58 57 CONFIG_DM_USB=y
59 58 CONFIG_USB_STORAGE=y
60 59 CONFIG_USB_KEYBOARD=y
configs/dfi-bt700-q7x-151_defconfig
... ... @@ -64,7 +64,6 @@
64 64 CONFIG_DEBUG_UART_CLOCK=1843200
65 65 CONFIG_SYS_NS16550=y
66 66 CONFIG_ICH_SPI=y
67   -CONFIG_TIMER=y
68 67 CONFIG_DM_USB=y
69 68 CONFIG_USB_STORAGE=y
70 69 CONFIG_USB_KEYBOARD=y
configs/edison_defconfig
... ... @@ -39,7 +39,6 @@
39 39 CONFIG_DM_PCI_COMPAT=y
40 40 CONFIG_DM_RTC=y
41 41 CONFIG_INTEL_MID_SERIAL=y
42   -CONFIG_TIMER=y
43 42 CONFIG_USB_DWC3=y
44 43 CONFIG_USB_DWC3_GADGET=y
45 44 CONFIG_USB_GADGET=y
configs/efi-x86_defconfig
... ... @@ -37,7 +37,6 @@
37 37 CONFIG_DEBUG_UART_BASE=0
38 38 CONFIG_DEBUG_UART_CLOCK=0
39 39 CONFIG_ICH_SPI=y
40   -CONFIG_TIMER=y
41 40 CONFIG_USB_STORAGE=y
42 41 CONFIG_USB_KEYBOARD=y
43 42 CONFIG_EFI=y
configs/galileo_defconfig
... ... @@ -56,7 +56,6 @@
56 56 CONFIG_DM_RTC=y
57 57 CONFIG_SYS_NS16550=y
58 58 CONFIG_ICH_SPI=y
59   -CONFIG_TIMER=y
60 59 CONFIG_DM_USB=y
61 60 CONFIG_USB_STORAGE=y
62 61 CONFIG_USB_KEYBOARD=y
configs/minnowmax_defconfig
... ... @@ -66,7 +66,6 @@
66 66 CONFIG_DEBUG_UART_CLOCK=1843200
67 67 CONFIG_SYS_NS16550=y
68 68 CONFIG_ICH_SPI=y
69   -CONFIG_TIMER=y
70 69 CONFIG_DM_USB=y
71 70 CONFIG_USB_XHCI_HCD=y
72 71 CONFIG_USB_STORAGE=y
configs/qemu-x86_64_defconfig
... ... @@ -70,7 +70,6 @@
70 70 CONFIG_DEBUG_UART_BASE=0x3f8
71 71 CONFIG_DEBUG_UART_CLOCK=1843200
72 72 CONFIG_SYS_NS16550=y
73   -CONFIG_TIMER=y
74 73 CONFIG_DM_USB=y
75 74 CONFIG_USB_STORAGE=y
76 75 CONFIG_USB_KEYBOARD=y
configs/qemu-x86_defconfig
... ... @@ -48,7 +48,6 @@
48 48 CONFIG_DM_PCI=y
49 49 CONFIG_DM_RTC=y
50 50 CONFIG_SYS_NS16550=y
51   -CONFIG_TIMER=y
52 51 CONFIG_DM_USB=y
53 52 CONFIG_USB_STORAGE=y
54 53 CONFIG_USB_KEYBOARD=y
configs/qemu-x86_efi_payload32_defconfig
... ... @@ -45,7 +45,6 @@
45 45 CONFIG_DM_PCI=y
46 46 CONFIG_DM_RTC=y
47 47 CONFIG_SYS_NS16550=y
48   -CONFIG_TIMER=y
49 48 CONFIG_DM_USB=y
50 49 CONFIG_USB_STORAGE=y
51 50 CONFIG_USB_KEYBOARD=y
configs/qemu-x86_efi_payload64_defconfig
... ... @@ -46,7 +46,6 @@
46 46 CONFIG_DM_PCI=y
47 47 CONFIG_DM_RTC=y
48 48 CONFIG_SYS_NS16550=y
49   -CONFIG_TIMER=y
50 49 CONFIG_DM_USB=y
51 50 CONFIG_USB_STORAGE=y
52 51 CONFIG_USB_KEYBOARD=y
configs/som-db5800-som-6867_defconfig
... ... @@ -58,7 +58,6 @@
58 58 CONFIG_DEBUG_UART_CLOCK=1843200
59 59 CONFIG_SYS_NS16550=y
60 60 CONFIG_ICH_SPI=y
61   -CONFIG_TIMER=y
62 61 CONFIG_DM_USB=y
63 62 CONFIG_USB_STORAGE=y
64 63 CONFIG_USB_KEYBOARD=y
configs/theadorable-x86-dfi-bt700_defconfig
... ... @@ -63,7 +63,6 @@
63 63 CONFIG_DM_RTC=y
64 64 CONFIG_SYS_NS16550=y
65 65 CONFIG_ICH_SPI=y
66   -CONFIG_TIMER=y
67 66 CONFIG_DM_USB=y
68 67 CONFIG_USB_STORAGE=y
69 68 CONFIG_USB_KEYBOARD=y
drivers/timer/Kconfig
... ... @@ -36,7 +36,6 @@
36 36 config X86_TSC_TIMER
37 37 bool "x86 Time-Stamp Counter (TSC) timer support"
38 38 depends on TIMER && X86
39   - default y if X86
40 39 help
41 40 Select this to enable Time-Stamp Counter (TSC) timer for x86.
42 41