diff --git a/src/northbridge/intel/Makefile.inc b/src/northbridge/intel/Makefile.inc
deleted file mode 100644
index 90fa696..0000000
--- a/src/northbridge/intel/Makefile.inc
+++ /dev/null
@@ -1,21 +0,0 @@
-subdirs-$(CONFIG_NORTHBRIDGE_INTEL_E7501) += e7501
-subdirs-$(CONFIG_NORTHBRIDGE_INTEL_E7505) += e7505
-subdirs-$(CONFIG_NORTHBRIDGE_INTEL_I3100) += i3100
-subdirs-$(CONFIG_NORTHBRIDGE_INTEL_I440BX) += i440bx
-subdirs-$(CONFIG_NORTHBRIDGE_INTEL_I440LX) += i440lx
-subdirs-$(CONFIG_NORTHBRIDGE_INTEL_I82810) += i82810
-subdirs-$(CONFIG_NORTHBRIDGE_INTEL_I82830) += i82830
-subdirs-$(CONFIG_NORTHBRIDGE_INTEL_I855) += i855
-subdirs-$(CONFIG_NORTHBRIDGE_INTEL_I945) += i945
-subdirs-$(CONFIG_NORTHBRIDGE_INTEL_GM45) += gm45
-subdirs-$(CONFIG_NORTHBRIDGE_INTEL_SCH) += sch
-subdirs-$(CONFIG_NORTHBRIDGE_INTEL_I5000) += i5000
-subdirs-$(CONFIG_NORTHBRIDGE_INTEL_NEHALEM) += nehalem
-subdirs-$(CONFIG_NORTHBRIDGE_INTEL_SANDYBRIDGE) += sandybridge
-subdirs-$(CONFIG_NORTHBRIDGE_INTEL_SANDYBRIDGE_NATIVE) += sandybridge
-subdirs-$(CONFIG_NORTHBRIDGE_INTEL_IVYBRIDGE) += sandybridge
-subdirs-$(CONFIG_NORTHBRIDGE_INTEL_IVYBRIDGE_NATIVE) += sandybridge
-subdirs-$(CONFIG_NORTHBRIDGE_INTEL_HASWELL) += haswell
-subdirs-$(CONFIG_NORTHBRIDGE_INTEL_FSP_SANDYBRIDGE) += fsp_sandybridge
-subdirs-$(CONFIG_NORTHBRIDGE_INTEL_FSP_IVYBRIDGE) += fsp_sandybridge
-subdirs-$(CONFIG_NORTHBRIDGE_INTEL_FSP_RANGELEY) += fsp_rangeley
diff --git a/src/northbridge/intel/e7501/Makefile.inc b/src/northbridge/intel/e7501/Makefile.inc
index 23eada5..756dc89 100644
--- a/src/northbridge/intel/e7501/Makefile.inc
+++ b/src/northbridge/intel/e7501/Makefile.inc
@@ -1 +1,5 @@
+ifeq ($(CONFIG_NORTHBRIDGE_INTEL_E7501),y)
+
 ramstage-y += northbridge.c
+
+endif
diff --git a/src/northbridge/intel/e7505/Makefile.inc b/src/northbridge/intel/e7505/Makefile.inc
index 8c50e40..89a5b8c 100644
--- a/src/northbridge/intel/e7505/Makefile.inc
+++ b/src/northbridge/intel/e7505/Makefile.inc
@@ -1,3 +1,7 @@
+ifeq ($(CONFIG_NORTHBRIDGE_INTEL_E7505),y)
+
 ramstage-y += northbridge.c
 romstage-y += raminit.c
 romstage-y += debug.c
+
+endif
diff --git a/src/northbridge/intel/fsp_rangeley/Makefile.inc b/src/northbridge/intel/fsp_rangeley/Makefile.inc
index 6cb6cb2..e9f7a85 100644
--- a/src/northbridge/intel/fsp_rangeley/Makefile.inc
+++ b/src/northbridge/intel/fsp_rangeley/Makefile.inc
@@ -18,6 +18,8 @@
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 #
 
+ifeq ($(CONFIG_NORTHBRIDGE_INTEL_FSP_RANGELEY),y)
+
 subdirs-y += fsp
 ramstage-y += northbridge.c
 ramstage-y += raminit.c
@@ -36,3 +38,4 @@
 CPPFLAGS_common += -I$(src)/northbridge/intel/fsp_rangeley/
 CPPFLAGS_common += -I$(src)/northbridge/intel/fsp_rangeley/fsp
 
+endif
diff --git a/src/northbridge/intel/fsp_sandybridge/Makefile.inc b/src/northbridge/intel/fsp_sandybridge/Makefile.inc
index ca6f345..c4e699a 100644
--- a/src/northbridge/intel/fsp_sandybridge/Makefile.inc
+++ b/src/northbridge/intel/fsp_sandybridge/Makefile.inc
@@ -18,6 +18,8 @@
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 #
 
+ifeq ($(CONFIG_NORTHBRIDGE_INTEL_FSP_SANDYBRIDGE)$(CONFIG_NORTHBRIDGE_INTEL_FSP_IVYBRIDGE),y)
+
 subdirs-y += fsp
 ramstage-y += northbridge.c
 ramstage-y += ram_calc.c
@@ -36,3 +38,4 @@
 
 CPPFLAGS_common += -I$(src)/northbridge/intel/fsp_sandybridge/fsp
 
+endif
diff --git a/src/northbridge/intel/gm45/Makefile.inc b/src/northbridge/intel/gm45/Makefile.inc
index 1352525..5fb9a44 100644
--- a/src/northbridge/intel/gm45/Makefile.inc
+++ b/src/northbridge/intel/gm45/Makefile.inc
@@ -17,6 +17,8 @@
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 #
 
+ifeq ($(CONFIG_NORTHBRIDGE_INTEL_GM45),y)
+
 romstage-y += early_init.c
 romstage-y += early_reset.c
 romstage-y += delay.c
@@ -38,3 +40,5 @@
 ramstage-y += gma.c
 
 smm-$(CONFIG_HAVE_SMI_HANDLER) += delay.c
+
+endif
diff --git a/src/northbridge/intel/haswell/Makefile.inc b/src/northbridge/intel/haswell/Makefile.inc
index ab7e6ef..0173dbf 100644
--- a/src/northbridge/intel/haswell/Makefile.inc
+++ b/src/northbridge/intel/haswell/Makefile.inc
@@ -17,6 +17,8 @@
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 #
 
+ifeq ($(CONFIG_NORTHBRIDGE_INTEL_HASWELL),y)
+
 ramstage-y += ram_calc.c
 ramstage-y += northbridge.c
 ramstage-y += gma.c
@@ -52,3 +54,4 @@
 mrc.cache-type := mrc_cache
 endif
 
+endif
diff --git a/src/northbridge/intel/i3100/Makefile.inc b/src/northbridge/intel/i3100/Makefile.inc
index 3ad40f5..16291bf 100644
--- a/src/northbridge/intel/i3100/Makefile.inc
+++ b/src/northbridge/intel/i3100/Makefile.inc
@@ -1,3 +1,7 @@
+ifeq ($(CONFIG_NORTHBRIDGE_INTEL_I3100),y)
+
 ramstage-y += northbridge.c
 ramstage-y += pciexp_porta.c
 ramstage-y += pciexp_porta_ep80579.c
+
+endif
diff --git a/src/northbridge/intel/i440bx/Makefile.inc b/src/northbridge/intel/i440bx/Makefile.inc
index 137d24f..2b32f2b 100644
--- a/src/northbridge/intel/i440bx/Makefile.inc
+++ b/src/northbridge/intel/i440bx/Makefile.inc
@@ -18,7 +18,11 @@
 ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 ##
 
+ifeq ($(CONFIG_NORTHBRIDGE_INTEL_I440BX),y)
+
 ramstage-y += northbridge.c
 
 romstage-y += raminit.c
 romstage-y += debug.c
+
+endif
diff --git a/src/northbridge/intel/i440lx/Makefile.inc b/src/northbridge/intel/i440lx/Makefile.inc
index a67331f..dc1a1df 100644
--- a/src/northbridge/intel/i440lx/Makefile.inc
+++ b/src/northbridge/intel/i440lx/Makefile.inc
@@ -18,4 +18,8 @@
 ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 ##
 
+ifeq ($(CONFIG_NORTHBRIDGE_INTEL_I440LX),y)
+
 ramstage-y += northbridge.c
+
+endif
diff --git a/src/northbridge/intel/i5000/Makefile.inc b/src/northbridge/intel/i5000/Makefile.inc
index 767cd7e..3c98e66 100644
--- a/src/northbridge/intel/i5000/Makefile.inc
+++ b/src/northbridge/intel/i5000/Makefile.inc
@@ -17,6 +17,10 @@
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 #
 
+ifeq ($(CONFIG_NORTHBRIDGE_INTEL_I5000),y)
+
 ramstage-y += northbridge.c
 romstage-y += raminit.c
 cpu_incs += src/northbridge/intel/i5000/halt_second_bsp.S
+
+endif
diff --git a/src/northbridge/intel/i82810/Makefile.inc b/src/northbridge/intel/i82810/Makefile.inc
index 137d24f..1fb5e2d 100644
--- a/src/northbridge/intel/i82810/Makefile.inc
+++ b/src/northbridge/intel/i82810/Makefile.inc
@@ -18,7 +18,11 @@
 ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 ##
 
+ifeq ($(CONFIG_NORTHBRIDGE_INTEL_I82810),y)
+
 ramstage-y += northbridge.c
 
 romstage-y += raminit.c
 romstage-y += debug.c
+
+endif
diff --git a/src/northbridge/intel/i82830/Makefile.inc b/src/northbridge/intel/i82830/Makefile.inc
index 2394570..ebbae81 100644
--- a/src/northbridge/intel/i82830/Makefile.inc
+++ b/src/northbridge/intel/i82830/Makefile.inc
@@ -1,4 +1,8 @@
+ifeq ($(CONFIG_NORTHBRIDGE_INTEL_I82830),y)
+
 ramstage-y += northbridge.c
 ramstage-y += vga.c
 
 smm-$(CONFIG_HAVE_SMI_HANDLER) += smihandler.c
+
+endif
diff --git a/src/northbridge/intel/i855/Makefile.inc b/src/northbridge/intel/i855/Makefile.inc
index 23eada5..4dfc358 100644
--- a/src/northbridge/intel/i855/Makefile.inc
+++ b/src/northbridge/intel/i855/Makefile.inc
@@ -1 +1,5 @@
+ifeq ($(CONFIG_NORTHBRIDGE_INTEL_I855),y)
+
 ramstage-y += northbridge.c
+
+endif
diff --git a/src/northbridge/intel/i945/Makefile.inc b/src/northbridge/intel/i945/Makefile.inc
index d3a795c..19bba6d 100644
--- a/src/northbridge/intel/i945/Makefile.inc
+++ b/src/northbridge/intel/i945/Makefile.inc
@@ -17,6 +17,8 @@
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 #
 
+ifeq ($(CONFIG_NORTHBRIDGE_INTEL_I945),y)
+
 ramstage-y += ram_calc.c
 ramstage-y += northbridge.c
 ramstage-y += gma.c
@@ -29,3 +31,5 @@
 romstage-y += debug.c
 
 smm-y += udelay.c
+
+endif
diff --git a/src/northbridge/intel/nehalem/Makefile.inc b/src/northbridge/intel/nehalem/Makefile.inc
index ff65628..0b58f8dc 100644
--- a/src/northbridge/intel/nehalem/Makefile.inc
+++ b/src/northbridge/intel/nehalem/Makefile.inc
@@ -17,6 +17,8 @@
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 #
 
+ifeq ($(CONFIG_NORTHBRIDGE_INTEL_NEHALEM),y)
+
 ramstage-y += ram_calc.c
 ramstage-y += northbridge.c
 ramstage-y += gma.c
@@ -42,3 +44,4 @@
 mrc.cache-position := 0xfffe0000
 mrc.cache-type := mrc_cache
 
+endif
diff --git a/src/northbridge/intel/sandybridge/Makefile.inc b/src/northbridge/intel/sandybridge/Makefile.inc
index 3930a6e..9f554f7 100644
--- a/src/northbridge/intel/sandybridge/Makefile.inc
+++ b/src/northbridge/intel/sandybridge/Makefile.inc
@@ -17,6 +17,8 @@
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 #
 
+ifeq ($(CONFIG_NORTHBRIDGE_INTEL_SANDYBRIDGE_NATIVE)$(CONFIG_NORTHBRIDGE_INTEL_SANDYBRIDGE)$(CONFIG_NORTHBRIDGE_INTEL_IVYBRIDGE_NATIVE)$(CONFIG_NORTHBRIDGE_INTEL_IVYBRIDGE),y)
+
 ramstage-y += ram_calc.c
 ramstage-y += northbridge.c
 ramstage-y += gma.c
@@ -65,3 +67,4 @@
 mrc.cache-type := mrc_cache
 endif
 
+endif
diff --git a/src/northbridge/intel/sch/Makefile.inc b/src/northbridge/intel/sch/Makefile.inc
index 16152b7..7757179 100644
--- a/src/northbridge/intel/sch/Makefile.inc
+++ b/src/northbridge/intel/sch/Makefile.inc
@@ -17,7 +17,11 @@
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 #
 
+ifeq ($(CONFIG_NORTHBRIDGE_INTEL_SCH),y)
+
 ramstage-y += northbridge.c
 ramstage-y += gma.c
 ramstage-y += port_access.c
 ramstage-y += acpi.c
+
+endif