6 files changed, 10 insertions, 32 deletions
diff --git a/src/northbridge/intel/e7505/Kconfig b/src/northbridge/intel/e7505/Kconfig
index aa03eacf02..adb011594a 100644
--- a/src/northbridge/intel/e7505/Kconfig
+++ b/src/northbridge/intel/e7505/Kconfig
@@ -2,11 +2,6 @@
 
 config NORTHBRIDGE_INTEL_E7505
 	bool
-
-if NORTHBRIDGE_INTEL_E7505
-
-config NORTHBRIDGE_SPECIFIC_OPTIONS
-	def_bool y
 	select NO_ECAM_MMCONF_SUPPORT
 	select HAVE_DEBUG_RAM_SETUP
 	select NO_CBFS_MCACHE
@@ -16,5 +11,3 @@ config NORTHBRIDGE_SPECIFIC_OPTIONS
 	select NO_DDR3
 	select NO_DDR2
 	select SMM_TSEG
-
-endif
diff --git a/src/northbridge/intel/gm45/Kconfig b/src/northbridge/intel/gm45/Kconfig
index 0b0ff51620..39e15adf6d 100644
--- a/src/northbridge/intel/gm45/Kconfig
+++ b/src/northbridge/intel/gm45/Kconfig
@@ -2,11 +2,6 @@
 
 config NORTHBRIDGE_INTEL_GM45
 	bool
-
-if NORTHBRIDGE_INTEL_GM45
-
-config NORTHBRIDGE_SPECIFIC_OPTIONS
-	def_bool y
 	select HAVE_DEBUG_RAM_SETUP
 	select VGA
 	select INTEL_EDID
@@ -19,6 +14,8 @@ config NORTHBRIDGE_SPECIFIC_OPTIONS
 	select USE_DDR3
 	select USE_DDR2
 
+if NORTHBRIDGE_INTEL_GM45
+
 config VBOOT
 	select VBOOT_STARTS_IN_BOOTBLOCK
 
diff --git a/src/northbridge/intel/i945/Kconfig b/src/northbridge/intel/i945/Kconfig
index d1e7dbe482..33fb184eb1 100644
--- a/src/northbridge/intel/i945/Kconfig
+++ b/src/northbridge/intel/i945/Kconfig
@@ -2,11 +2,6 @@
 
 config NORTHBRIDGE_INTEL_I945
 	bool
-
-if NORTHBRIDGE_INTEL_I945
-
-config NORTHBRIDGE_SPECIFIC_OPTIONS
-	def_bool y
 	select HAVE_DEBUG_RAM_SETUP
 	select VGA
 	select INTEL_GMA_ACPI
@@ -19,6 +14,8 @@ config NORTHBRIDGE_SPECIFIC_OPTIONS
 	select NO_DDR3
 	select USE_DDR2
 
+if NORTHBRIDGE_INTEL_I945
+
 config VBOOT
 	select VBOOT_STARTS_IN_BOOTBLOCK
 config NORTHBRIDGE_INTEL_SUBTYPE_I945GC
diff --git a/src/northbridge/intel/pineview/Kconfig b/src/northbridge/intel/pineview/Kconfig
index 7ece198676..5714b4f427 100644
--- a/src/northbridge/intel/pineview/Kconfig
+++ b/src/northbridge/intel/pineview/Kconfig
@@ -2,11 +2,6 @@
 
 config NORTHBRIDGE_INTEL_PINEVIEW
 	bool
-
-if NORTHBRIDGE_INTEL_PINEVIEW
-
-config NORTHBRIDGE_SPECIFIC_OPTIONS
-	def_bool y
 	select HAVE_DEBUG_RAM_SETUP
 	select VGA
 	select MAINBOARD_HAS_NATIVE_VGA_INIT
@@ -19,6 +14,8 @@ config NORTHBRIDGE_SPECIFIC_OPTIONS
 	select USE_DDR3
 	select USE_DDR2
 
+if NORTHBRIDGE_INTEL_PINEVIEW
+
 config VGA_BIOS_ID
 	string
 	default "8086,a001"
diff --git a/src/northbridge/intel/sandybridge/Kconfig b/src/northbridge/intel/sandybridge/Kconfig
index bbe8ac4d69..384d5bc8d9 100644
--- a/src/northbridge/intel/sandybridge/Kconfig
+++ b/src/northbridge/intel/sandybridge/Kconfig
@@ -6,17 +6,14 @@ config NORTHBRIDGE_INTEL_SANDYBRIDGE
 	select CPU_INTEL_MODEL_206AX
 	select HAVE_DEBUG_RAM_SETUP
 	select INTEL_GMA_ACPI
-
-if NORTHBRIDGE_INTEL_SANDYBRIDGE
-
-config NORTHBRIDGE_SPECIFIC_OPTIONS
-	def_bool y
 	select NO_DDR5
 	select NO_LPDDR4
 	select NO_DDR4
 	select NO_DDR2
 	select USE_DDR3
 
+if NORTHBRIDGE_INTEL_SANDYBRIDGE
+
 config CHIPSET_DEVICETREE
 	default "northbridge/intel/sandybridge/chipset.cb"
 
diff --git a/src/northbridge/intel/x4x/Kconfig b/src/northbridge/intel/x4x/Kconfig
index a548df2ac9..aef9eb4fa4 100644
--- a/src/northbridge/intel/x4x/Kconfig
+++ b/src/northbridge/intel/x4x/Kconfig
@@ -2,11 +2,6 @@
 
 config NORTHBRIDGE_INTEL_X4X
 	bool
-
-if NORTHBRIDGE_INTEL_X4X
-
-config NORTHBRIDGE_SPECIFIC_OPTIONS
-	def_bool y
 	select HAVE_DEBUG_RAM_SETUP
 	select VGA
 	select INTEL_GMA_ACPI
@@ -19,6 +14,8 @@ config NORTHBRIDGE_SPECIFIC_OPTIONS
 	select USE_DDR3
 	select USE_DDR2
 
+if NORTHBRIDGE_INTEL_X4X
+
 config CBFS_SIZE
 	default 0x100000 if !SOUTHBRIDGE_INTEL_I82801GX