diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index 01ed76042f755f03b54e565e7f6bfff68b7b0b15..b600bebf15b6e8860abedf29ef71d4fb06989587 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -307,10 +307,10 @@ config VGA_BIOS_ADDR
 	  0x90000 from the beginning of a 1MB flash device.
 
 menu "System tables"
+	depends on !EFI
 
 config GENERATE_PIRQ_TABLE
 	bool "Generate a PIRQ table"
-	depends on !EFI
 	default n
 	help
 	  Generate a PIRQ routing table for this board. The PIRQ routing table
@@ -321,7 +321,6 @@ config GENERATE_PIRQ_TABLE
 
 config GENERATE_SFI_TABLE
 	bool "Generate a SFI (Simple Firmware Interface) table"
-	depends on !EFI
 	help
 	  The Simple Firmware Interface (SFI) provides a lightweight method
 	  for platform firmware to pass information to the operating system
@@ -336,7 +335,6 @@ config GENERATE_SFI_TABLE
 
 config GENERATE_MP_TABLE
 	bool "Generate an MP (Multi-Processor) table"
-	depends on !EFI
 	default n
 	help
 	  Generate an MP (Multi-Processor) table for this board. The MP table