diff options
| author | Kyösti Mälkki <kyosti.malkki@gmail.com> | 2019-07-06 07:46:16 +0300 |
|---|---|---|
| committer | Kyösti Mälkki <kyosti.malkki@gmail.com> | 2019-07-08 09:45:56 +0000 |
| commit | f8c3442df0db4aa6c842f6875677d38f378f31d3 (patch) | |
| tree | 160fe349f385a68c6ff7d6e0c444fad43a041ae9 | |
| parent | af15d040e11aea95bb7ff14531739f5075d72bc9 (diff) | |
| download | coreboot-f8c3442df0db4aa6c842f6875677d38f378f31d3.tar.xz | |
drivers/pc80: Move UDELAY_IO and UDELAY_TIMER2
No longer fallback to UDELAY_IO as default.
Since these are not cpu properties or features,
move the Kconfig location.
Change-Id: I9809cdc285c7bf741aa391ddb5755390bbfc2909
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/34107
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Angel Pons <th3fanbus@gmail.com>
Reviewed-by: Nico Huber <nico.h@gmx.de>
| -rw-r--r-- | src/cpu/x86/Kconfig | 10 | ||||
| -rw-r--r-- | src/drivers/pc80/pc/Kconfig | 14 |
2 files changed, 13 insertions, 11 deletions
diff --git a/src/cpu/x86/Kconfig b/src/cpu/x86/Kconfig index 608afd7a28..99a70750af 100644 --- a/src/cpu/x86/Kconfig +++ b/src/cpu/x86/Kconfig @@ -17,11 +17,6 @@ config PARALLEL_MP_AP_WORK Allow APs to do other work after initialization instead of going to sleep. -config UDELAY_IO - bool - default y if !UDELAY_LAPIC && !UDELAY_TSC && !UDELAY_TIMER2 && !GENERIC_UDELAY - default n - config UDELAY_LAPIC bool default n @@ -54,11 +49,6 @@ config TSC_MONOTONIC_TIMER help Expose monotonic time using the TSC. -# This option is used in code but never selected. -config UDELAY_TIMER2 - bool - default n - config TSC_SYNC_LFENCE bool default n diff --git a/src/drivers/pc80/pc/Kconfig b/src/drivers/pc80/pc/Kconfig index c44cf9144d..bba45f6a64 100644 --- a/src/drivers/pc80/pc/Kconfig +++ b/src/drivers/pc80/pc/Kconfig @@ -1,10 +1,11 @@ +if PC80_SYSTEM + # Might be removed (alongside with the PS/2 init code) once payloads # reliably support PS/2 init themselves. config DRIVERS_PS2_KEYBOARD bool "PS/2 keyboard init" default n - depends on PC80_SYSTEM help Enable this option to initialize PS/2 keyboards found connected to the PS/2 port. @@ -16,3 +17,14 @@ config DRIVERS_PS2_KEYBOARD If you know you will only use a payload which does not require this option, then you can say N here to speed up boot time. Otherwise say Y. + +config UDELAY_IO + bool + default n + +# This option is used in code but never selected. +config UDELAY_TIMER2 + bool + default n + +endif |