meta-phosphor: split image type configs to includes

We have reached branch-capacity in the bb.utils.contains checks
at 3 image types.  In order to be able to more easily add additional
image types, split the differences out into additional inc-snippets
for each image type.

Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
Change-Id: Ibcdb5c885c67cb6d8728dfd315eb07f99b1a2173
diff --git a/meta-ibm/conf/machine/p10bmc.conf b/meta-ibm/conf/machine/p10bmc.conf
index 98723ca..a0ad416 100644
--- a/meta-ibm/conf/machine/p10bmc.conf
+++ b/meta-ibm/conf/machine/p10bmc.conf
@@ -11,13 +11,13 @@
 
 OBMC_POWER_SUPPLY_INSTANCES = "0 1 2 3"
 
+require conf/distro/include/phosphor-mmc.inc
 require conf/machine/include/ast2600.inc
 require conf/machine/include/obmc-bsp-common.inc
 require conf/machine/include/openpower.inc
 include conf/machine/include/ibm-power10-cpu.inc
 require conf/distro/include/openpower-virtual-pnor.inc
 require conf/distro/include/openpower-hostfw-over-pldm.inc
-require conf/distro/include/phosphor-mmc.inc
 require conf/distro/include/ibm-mpreboot.inc
 require conf/distro/include/ibm-yaml.inc
 DISTRO_FEATURES += "ibm-service-account-policy"