| commit | 4bd2cbf723a746dfe80a0dded0473a71f7950eed | [log] [tgz] |
|---|---|---|
| author | nkskjames <nkskjames@gmail.com> | Sun Nov 01 09:29:30 2015 -0600 |
| committer | nkskjames <nkskjames@gmail.com> | Sun Nov 01 09:29:30 2015 -0600 |
| tree | d9520affa15da79c5bfebdc9897f50df6b4f5d55 | |
| parent | 0a138c3ee0adff4d29b669cc5089efc20073c0f9 [diff] | |
| parent | a2869f1dbdef6b6da585fd4dcf1f4e1f4a7b6be3 [diff] |
Merge pull request #59 from bradbishop/oem Use OEM parser on all OpenPOWER systems
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 d7828c0..820b0eb 100644 --- a/meta-openbmc-machines/meta-openpower/conf/machine/include/openpower.inc +++ b/meta-openbmc-machines/meta-openpower/conf/machine/include/openpower.inc
@@ -18,7 +18,9 @@ VIRTUAL-RUNTIME_obmc-phosphor-flash-ctl = " \ skeleton \ " - +VIRTUAL-RUNTIME_obmc-phosphor-ipmi-parsers = " \ + host-ipmid-oem \ + " PREFERRED_PROVIDER_virtual/obmc-phosphor-host-ipmi-hw = "btbridged" PREFERRED_PROVIDER_virtual/obmc-phosphor-chassis-mgmt = "skeleton" PREFERRED_PROVIDER_virtual/obmc-phosphor-event-mgmt = "obmc-phosphor-event"
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 7c137a4..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,9 +1,6 @@ KMACHINE = "aspeed" KERNEL_DEVICETREE = "${KMACHINE}-bmc-opp-${MACHINE}.dtb" -VIRTUAL-RUNTIME_obmc-phosphor-ipmi-parsers = " \ - host-ipmid-oem \ - " require conf/machine/include/ast2400.inc require conf/machine/include/obmc-bsp-common.inc require conf/machine/include/ibm.inc