Move tacoma and rainier to eMMC configuration

For tacoma, adjusting the size of the eMMC image by making the
hostfw partition smaller.

(From meta-ibm rev: f12da2705f487a933cbf291c129d3832b91d1816)

Change-Id: Ic13d141d41ab513f2af7bff790efc7529739b11d
Signed-off-by: Adriana Kobylak <anoo@us.ibm.com>
Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
diff --git a/meta-ibm/conf/machine/rainier.conf b/meta-ibm/conf/machine/rainier.conf
index 1f8c21e..028f411 100644
--- a/meta-ibm/conf/machine/rainier.conf
+++ b/meta-ibm/conf/machine/rainier.conf
@@ -7,6 +7,8 @@
 require conf/machine/include/ast2600.inc
 require conf/machine/include/obmc-bsp-common.inc
 require conf/machine/include/openpower.inc
+require conf/distro/include/openpower-virtual-pnor.inc
+require conf/distro/include/phosphor-mmc.inc
 
 SERIAL_CONSOLES = "115200;ttyS4"
 
@@ -23,5 +25,4 @@
 PREFERRED_PROVIDER_virtual/phosphor-fan-presence-config_df-mrw = \
     "phosphor-fan-presence-config"
 
-FLASH_SIZE = "131072"
 SKIP_BROKEN_MRW = "1"