diff options
| author | Matt Spinler <spinler@us.ibm.com> | 2017-01-10 13:36:06 -0600 |
|---|---|---|
| committer | Patrick Williams <patrick@stwcx.xyz> | 2017-01-11 21:35:39 +0000 |
| commit | 1d27150396622d6add98811999559ed0341c5b2b (patch) | |
| tree | f3652c284fe466cf488a2f1aa5ab8835b4acde1b /meta-openbmc-machines | |
| parent | 185c8aea0bf7420605dd87d59c0f4c5eac0f346d (diff) | |
| download | talos-openbmc-1d27150396622d6add98811999559ed0341c5b2b.tar.gz talos-openbmc-1d27150396622d6add98811999559ed0341c5b2b.zip | |
Pick up new Witherspoon MRW XML
LEDs are now in the model.
There is a Targets.pm change that must go with this that
the mrw-rev.bbclass change will get.
Because Targets.pm is common between Palmetto and Witherspoon,
the Palmetto XML must be patched to make Targets.pm happy.
Change-Id: Ic3378cca8c6ebe96870d283aac2d42d97b68358a
Signed-off-by: Matt Spinler <spinler@us.ibm.com>
Diffstat (limited to 'meta-openbmc-machines')
2 files changed, 7 insertions, 1 deletions
diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-palmetto/recipes-phosphor/mrw/mrw-native/palmetto.xml.patch.xml b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-palmetto/recipes-phosphor/mrw/mrw-native/palmetto.xml.patch.xml index 744a31788..73293773a 100644 --- a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-palmetto/recipes-phosphor/mrw/mrw-native/palmetto.xml.patch.xml +++ b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-palmetto/recipes-phosphor/mrw/mrw-native/palmetto.xml.patch.xml @@ -464,4 +464,10 @@ <default>PCIE_CARD</default> </attribute> +<!-- new parser requires FABRIC_GROUP_ID, though it's unused by the BMC --> +<attribute type="replace" xpath="targetInstance[id='proc_socket-0']/attribute[id='FABRIC_NODE_ID']"> + <id>FABRIC_GROUP_ID</id> + <default>0</default> +</attribute> + </patches> diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/conf/machine/witherspoon.conf b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/conf/machine/witherspoon.conf index e3fcad85f..bedb6df2c 100644 --- a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/conf/machine/witherspoon.conf +++ b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/conf/machine/witherspoon.conf @@ -13,4 +13,4 @@ require conf/machine/include/ibm.inc require conf/machine/include/p9.inc PHOSPHOR_MRW_URI = "git://github.com/open-power/witherspoon-xml" -PHOSPHOR_MRW_REV = "657550f28ebd09854a93c299a5a5aff182375a66" +PHOSPHOR_MRW_REV = "563eedce60d3fae2d2152425bed7e71ab1bc349d" |
