[PATCH openbmc 10/20] Move palmetto configuration to openpower layer

[OpenBMC Patches]

From: Brad Bishop <bradleyb at us.ibm.com>

Added openpower.inc for any openpower system.
Added ibm.cin for IBM openpower systems.
---
 .../conf/machine/include/openpower.inc              | 19 +++++++++++++++++++
 .../meta-ibm/conf/machine/include/ibm.inc           |  1 +
 .../meta-palmetto/conf/machine/palmetto.conf        | 21 +--------------------
 3 files changed, 21 insertions(+), 20 deletions(-)
 create mode 100644 meta-openbmc-machines/meta-openpower/conf/machine/include/openpower.inc
 create mode 100644 meta-openbmc-machines/meta-openpower/meta-ibm/conf/machine/include/ibm.inc

diff --git a/meta-openbmc-machines/meta-openpower/conf/machine/include/openpower.inc b/meta-openbmc-machines/meta-openpower/conf/machine/include/openpower.inc
new file mode 100644
index 0000000..89ad0ec
--- /dev/null
+++ b/meta-openbmc-machines/meta-openpower/conf/machine/include/openpower.inc
@@ -0,0 +1,19 @@
+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 \
+       "
diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/conf/machine/include/ibm.inc b/meta-openbmc-machines/meta-openpower/meta-ibm/conf/machine/include/ibm.inc
new file mode 100644
index 0000000..c79ddd7
--- /dev/null
+++ b/meta-openbmc-machines/meta-openpower/meta-ibm/conf/machine/include/ibm.inc
@@ -0,0 +1 @@
+require conf/machine/include/openpower.inc
diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-palmetto/conf/machine/palmetto.conf b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-palmetto/conf/machine/palmetto.conf
index 0efdda0..f6256a7 100644
--- a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-palmetto/conf/machine/palmetto.conf
+++ b/meta-openbmc-machines/meta-openpower/meta-ibm/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"
-- 
2.6.0