diff --git a/platforms/astbmc/Makefile.inc b/platforms/astbmc/Makefile.inc
index 0708132..1cdf37f 100644
--- a/platforms/astbmc/Makefile.inc
+++ b/platforms/astbmc/Makefile.inc
@@ -1,13 +1,17 @@
 SUBDIRS += $(PLATDIR)/astbmc
 
 ASTBMC_OBJS = pnor.o common.o slots.o \
-	      palmetto.o habanero.o firestone.o \
-	      p8dtu.o p8dnu.o \
-	      garrison.o barreleye.o \
 	      witherspoon.o zaius.o romulus.o p9dsu.o \
-	      vesnin.o nicole.o mihawk.o mowgli.o \
+	      nicole.o mihawk.o mowgli.o \
 	      talos.o blackbird.o \
 	      swift.o rainier.o
 
+ifeq ($(CONFIG_P8),1)
+ASTBMC_OBJS += palmetto.o habanero.o firestone.o \
+	      p8dtu.o p8dnu.o \
+	      garrison.o barreleye.o \
+	      vesnin.o
+endif
+
 ASTBMC = $(PLATDIR)/astbmc/built-in.a
 $(ASTBMC): $(ASTBMC_OBJS:%=$(PLATDIR)/astbmc/%)
diff --git a/platforms/ibm-fsp/Makefile.inc b/platforms/ibm-fsp/Makefile.inc
index 8883f09..fd80a79 100644
--- a/platforms/ibm-fsp/Makefile.inc
+++ b/platforms/ibm-fsp/Makefile.inc
@@ -1,7 +1,12 @@
 SUBDIRS += $(PLATDIR)/ibm-fsp
 
 IBM_FSP_OBJS = common.o lxvpd.o hostservices.o fsp-vpd.o \
-	       firenze.o firenze-pci.o zz.o
+	       firenze-pci.o zz.o
+
+ifeq ($(CONFIG_P8),1)
+IBM_FSP_OBJS += firenze.o
+endif
+
 IBM_FSP = $(PLATDIR)/ibm-fsp/built-in.a
 
 ifeq ($(CONFIG_FSP),1)