summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad Bishop <bradleyb@us.ibm.com>2015-10-19 20:47:53 -0400
committerBrad Bishop <bradleyb@us.ibm.com>2015-10-19 20:47:53 -0400
commit75e2284419b374dfb42e47d1dc97268cd85a1675 (patch)
tree01be510606ea0ae92229e44f314ff8840e590ec7
parentbb86d0b5393a02f18239f99607bce9afe8fb1a80 (diff)
downloadtalos-openbmc-75e2284419b374dfb42e47d1dc97268cd85a1675.tar.gz
talos-openbmc-75e2284419b374dfb42e47d1dc97268cd85a1675.zip
Move host-ipmi-bt from palmetto to common include
This is the default host-ipmi-hw for all openpower systems.
-rw-r--r--meta-openbmc-machines/meta-openpower/conf/machine/include/openpower.inc2
-rw-r--r--meta-openbmc-machines/meta-openpower/meta-ibm/meta-palmetto/conf/machine/palmetto.conf2
2 files changed, 2 insertions, 2 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
index 89ad0ece8..10fa40c6a 100644
--- a/meta-openbmc-machines/meta-openpower/conf/machine/include/openpower.inc
+++ b/meta-openbmc-machines/meta-openpower/conf/machine/include/openpower.inc
@@ -17,3 +17,5 @@ VIRTUAL-RUNTIME_obmc-phosphor-chassis-ctl = " \
VIRTUAL-RUNTIME_obmc-phosphor-flash-ctl = " \
obmc-phosphor-example-pydbus \
"
+
+PREFERRED_PROVIDER_virtual/obmc-phosphor-host-ipmi-hw = "host-ipmi-bt"
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 f1e4250cb..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
@@ -10,5 +10,3 @@ UBOOT_ENTRYPOINT = "0x40008000"
UBOOT_LOADADDRESS = "0x40008000"
FLASH_SIZE = "32768"
-
-PREFERRED_PROVIDER_virtual/obmc-phosphor-host-ipmi-hw = "host-ipmi-bt"
OpenPOWER on IntegriCloud