diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index 9207549..ac2d598 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -546,9 +546,6 @@ config I8254_TIMER
 	  Intel 8254 timer contains three counters which have fixed uses.
 	  Include this to have U-Boot set up the timer correctly.
 
-config I8042_KEYB
-	default y
-
 config SEABIOS
 	bool "Support booting SeaBIOS"
 	help
diff --git a/drivers/input/Kconfig b/drivers/input/Kconfig
index d560328..b3873c1 100644
--- a/drivers/input/Kconfig
+++ b/drivers/input/Kconfig
@@ -17,6 +17,7 @@ config CROS_EC_KEYB
 config I8042_KEYB
 	bool "Enable Intel i8042 keyboard support"
 	depends on DM_KEYBOARD
+	default X86
 	help
 	  This adds a driver for the i8042 keyboard controller, allowing the
 	  keyboard to be used on devices which support this controller. The