diff --git a/src/Kconfig b/src/Kconfig
index 216ce0bb3b..fadcbc4c6e 100644
--- a/src/Kconfig
+++ b/src/Kconfig
@@ -379,22 +379,6 @@ config MAX_PIRQ_LINKS
 #These Options are here to avoid "undefined" warnings.
 #The actual selection and help texts are in the following menu.
 
-config GENERATE_ACPI_TABLES
-	bool
-	default HAVE_ACPI_TABLES
-
-config GENERATE_MP_TABLE
-	bool
-	default HAVE_MP_TABLE || DRIVERS_GENERIC_IOAPIC
-
-config GENERATE_PIRQ_TABLE
-	bool
-	default HAVE_PIRQ_TABLE
-
-config GENERATE_SMBIOS_TABLES
-	bool
-	default y
-
 menu "System tables"
 
 config WRITE_HIGH_TABLES
@@ -406,18 +390,18 @@ config MULTIBOOT
 	default y
 
 config GENERATE_ACPI_TABLES
-	depends on HAVE_ACPI_TABLES
-	bool "Generate ACPI tables"
-	default y
+	prompt "Generate ACPI tables" if HAVE_ACPI_TABLES
+	bool
+	default HAVE_ACPI_TABLES
 	help
 	  Generate ACPI tables for this board.
 
 	  If unsure, say Y.
 
 config GENERATE_MP_TABLE
-	depends on HAVE_MP_TABLE || DRIVERS_GENERIC_IOAPIC
-	bool "Generate an MP table"
-	default y
+	prompt "Generate an MP table" if HAVE_MP_TABLE || DRIVERS_GENERIC_IOAPIC
+	bool
+	default HAVE_MP_TABLE || DRIVERS_GENERIC_IOAPIC
 	help
 	  Generate an MP table (conforming to the Intel MultiProcessor
 	  specification 1.4) for this board.
@@ -425,9 +409,9 @@ config GENERATE_MP_TABLE
 	  If unsure, say Y.
 
 config GENERATE_PIRQ_TABLE
-	depends on HAVE_PIRQ_TABLE
-	bool "Generate a PIRQ table"
-	default y
+	prompt "Generate a PIRQ table" if HAVE_PIRQ_TABLE
+	bool
+	default HAVE_PIRQ_TABLE
 	help
 	  Generate a PIRQ table for this board.
 
diff --git a/src/mainboard/advansus/a785e-i/Kconfig b/src/mainboard/advansus/a785e-i/Kconfig
index 1db6705a39..3753df8eff 100644
--- a/src/mainboard/advansus/a785e-i/Kconfig
+++ b/src/mainboard/advansus/a785e-i/Kconfig
@@ -22,7 +22,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy
 	select AMDMCT
 	select HAVE_MP_TABLE
 	select HAVE_ACPI_TABLES
-	select GENERATE_ACPI_TABLES
 	select BOARD_ROMSIZE_KB_1024
 	select RAMINIT_SYSINFO
 	select ENABLE_APIC_EXT_ID
diff --git a/src/mainboard/amd/bimini_fam10/Kconfig b/src/mainboard/amd/bimini_fam10/Kconfig
index cacfbc7488..09e731cfc9 100644
--- a/src/mainboard/amd/bimini_fam10/Kconfig
+++ b/src/mainboard/amd/bimini_fam10/Kconfig
@@ -15,12 +15,12 @@ config BOARD_SPECIFIC_OPTIONS # dummy
 	select SUPERIO_ITE_IT8718F
 	select HAVE_OPTION_TABLE
 	select HAVE_PIRQ_TABLE
-	select GENERATE_MP_TABLE
+	select HAVE_MP_TABLE
+	select HAVE_ACPI_TABLES
 	select SB_HT_CHAIN_UNITID_OFFSET_ONLY
 	select LIFT_BSP_APIC_ID
 	select SERIAL_CPU_INIT
 	select AMDMCT
-	select GENERATE_ACPI_TABLES
 	select BOARD_ROMSIZE_KB_2048
 	select RAMINIT_SYSINFO
 	select ENABLE_APIC_EXT_ID
diff --git a/src/mainboard/asus/m5a88-v/Kconfig b/src/mainboard/asus/m5a88-v/Kconfig
index 068d623acd..3ac4f772d3 100644
--- a/src/mainboard/asus/m5a88-v/Kconfig
+++ b/src/mainboard/asus/m5a88-v/Kconfig
@@ -20,7 +20,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy
 	select AMDMCT
 	select HAVE_MP_TABLE
 	select HAVE_ACPI_TABLES
-	select GENERATE_ACPI_TABLES
 	select BOARD_ROMSIZE_KB_2048
 	select RAMINIT_SYSINFO
 	select ENABLE_APIC_EXT_ID
diff --git a/src/mainboard/intel/d945gclf/Kconfig b/src/mainboard/intel/d945gclf/Kconfig
index 55a86804b5..925f7dd81e 100644
--- a/src/mainboard/intel/d945gclf/Kconfig
+++ b/src/mainboard/intel/d945gclf/Kconfig
@@ -27,9 +27,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy
 	select CHECK_SLFRCS_ON_RESUME
 	select SOUTHBRIDGE_INTEL_I82801GX
 	select SUPERIO_SMSC_LPC47M15X
-	select GENERATE_ACPI_TABLES
-	select GENERATE_PIRQ_TABLE
-	select GENERATE_MP_TABLE
 	select HAVE_OPTION_TABLE
 	select HAVE_PIRQ_TABLE
 	select HAVE_MP_TABLE
diff --git a/src/mainboard/msi/ms9652_fam10/Kconfig b/src/mainboard/msi/ms9652_fam10/Kconfig
index d3083a89b9..19f74e76fb 100644
--- a/src/mainboard/msi/ms9652_fam10/Kconfig
+++ b/src/mainboard/msi/ms9652_fam10/Kconfig
@@ -39,10 +39,6 @@ config DCACHE_RAM_GLOBAL_VAR_SIZE
 	hex
 	default 0x04000
 
-config GENERATE_PIRQ_TABLE
-	bool
-	default y
-
 # Define to 0 because the IRQ slot count is
 # determined dynamically for this board.
 config IRQ_SLOT_COUNT
diff --git a/src/mainboard/supermicro/h8scm_fam10/Kconfig b/src/mainboard/supermicro/h8scm_fam10/Kconfig
index 5003fa648a..5e28aeade0 100644
--- a/src/mainboard/supermicro/h8scm_fam10/Kconfig
+++ b/src/mainboard/supermicro/h8scm_fam10/Kconfig
@@ -1,4 +1,4 @@
-if BOARD_SUPERMICRO_H8SCM_FAM10
+if BOARD_SUPERMICRO_H9SCM_FAM10
 
 config BOARD_SPECIFIC_OPTIONS # dummy
 	def_bool y
@@ -13,13 +13,13 @@ config BOARD_SPECIFIC_OPTIONS # dummy
 	select SUPERIO_WINBOND_W83627HF
 	select SUPERIO_NUVOTON_WPCM450
 	select HAVE_OPTION_TABLE
-	select GENERATE_PIRQ_TABLE
-	select GENERATE_MP_TABLE
+	select HAVE_PIRQ_TABLE
+	select HAVE_MP_TABLE
+	select HAVE_ACPI_TABLES
 	select SB_HT_CHAIN_UNITID_OFFSET_ONLY
 	select LIFT_BSP_APIC_ID
 	select SERIAL_CPU_INIT
 	select AMDMCT
-	select GENERATE_ACPI_TABLES
 	select BOARD_ROMSIZE_KB_2048
 	select RAMINIT_SYSINFO
 	select ENABLE_APIC_EXT_ID