Merge pull request #21 from bradbishop/master

Add IPMI to build
diff --git a/conf/machine/include/ibm.inc b/conf/machine/include/ibm.inc
new file mode 100644
index 0000000..c79ddd7
--- /dev/null
+++ b/conf/machine/include/ibm.inc
@@ -0,0 +1 @@
+require conf/machine/include/openpower.inc
diff --git a/meta-palmetto/conf/machine/palmetto.conf b/meta-palmetto/conf/machine/palmetto.conf
index 0ef430e..f1e4250 100644
--- a/meta-palmetto/conf/machine/palmetto.conf
+++ b/meta-palmetto/conf/machine/palmetto.conf
@@ -1,28 +1,9 @@
-OBMC_MACHINE_FEATURES += "\
-        obmc-phosphor-fan-mgmt \
-        obmc-phosphor-chassis-mgmt \
-        obmc-phosphor-sensor-mgmt \
-        obmc-phosphor-flash-mgmt \
-        "
-
-VIRTUAL-RUNTIME_obmc-phosphor-fan-ctl = " \
-       obmc-phosphor-example-sdbus \
-       "
-VIRTUAL-RUNTIME_obmc-phosphor-sensor-ctl = " \
-       obmc-phosphor-example-sdbus \
-       "
-VIRTUAL-RUNTIME_obmc-phosphor-chassis-ctl = " \
-       obmc-phosphor-example-pydbus \
-       "
-VIRTUAL-RUNTIME_obmc-phosphor-flash-ctl = " \
-       obmc-phosphor-example-pydbus \
-       "
-
 KMACHINE = "aspeed"
 KERNEL_DEVICETREE = "${KMACHINE}-bmc-opp-${MACHINE}.dtb"
 
 require conf/machine/include/ast2400.inc
 require conf/machine/include/obmc-bsp-common.inc
+require conf/machine/include/ibm.inc
 
 UBOOT_MACHINE_palmetto = "palmetto_config"
 UBOOT_ENTRYPOINT = "0x40008000"
diff --git a/meta-palmetto/recipes.txt b/meta-palmetto/recipes.txt
index db84c6f..149509f 100644
--- a/meta-palmetto/recipes.txt
+++ b/meta-palmetto/recipes.txt
@@ -1 +1,2 @@
+recipes-bsp          - Anything with links to specific hardware or hardware configuration information
 recipes-kernel       - The kernel and generic applications/libraries with strong kernel dependencies