Kyösti Mälkki merged this change.
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>
---
M src/cpu/x86/Kconfig
M src/drivers/pc80/pc/Kconfig
2 files changed, 13 insertions(+), 11 deletions(-)
diff --git a/src/cpu/x86/Kconfig b/src/cpu/x86/Kconfig
index 608afd7..99a7075 100644
--- a/src/cpu/x86/Kconfig
+++ b/src/cpu/x86/Kconfig
@@ -17,11 +17,6 @@
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 @@
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 c44cf91..bba45f6 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 @@
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
To view, visit change 34107. To unsubscribe, or for help writing mail filters, visit settings.