summaryrefslogtreecommitdiffstats
path: root/meta-openbmc-machines
diff options
context:
space:
mode:
authorBrad Bishop <bradleyb@us.ibm.com>2015-10-19 11:28:08 -0400
committerBrad Bishop <bradleyb@us.ibm.com>2015-10-19 11:28:08 -0400
commit493ad350e841c67935b6889c8baf23794112d58c (patch)
tree84b3d807faab2c46d9e88c8535d6c7315c717dfa /meta-openbmc-machines
parent935b1442c04eb97a3a9d67758e687645340d1dad (diff)
downloadtalos-openbmc-493ad350e841c67935b6889c8baf23794112d58c.tar.gz
talos-openbmc-493ad350e841c67935b6889c8baf23794112d58c.zip
Move palmetto configuration to openpower layer
Added openpower.inc for any openpower system. Added ibm.cin for IBM openpower systems.
Diffstat (limited to 'meta-openbmc-machines')
-rw-r--r--meta-openbmc-machines/meta-openpower/conf/machine/include/openpower.inc19
-rw-r--r--meta-openbmc-machines/meta-openpower/meta-ibm/conf/machine/include/ibm.inc1
-rw-r--r--meta-openbmc-machines/meta-openpower/meta-ibm/meta-palmetto/conf/machine/palmetto.conf21
3 files changed, 21 insertions, 20 deletions
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 000000000..89ad0ece8
--- /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 000000000..c79ddd777
--- /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 0efdda004..f6256a771 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"
OpenPOWER on IntegriCloud