diff options
3 files changed, 8 insertions, 2 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" diff --git a/meta-phosphor/classes/mrw-rev.bbclass b/meta-phosphor/classes/mrw-rev.bbclass index f17afca0e..9e307d233 100644 --- a/meta-phosphor/classes/mrw-rev.bbclass +++ b/meta-phosphor/classes/mrw-rev.bbclass @@ -1,5 +1,5 @@ MRW_API_SRC_URI ?= "git://github.com/open-power/serverwiz.git;subpath=scripts" -MRW_API_SRCREV ?= "f98655bb1ad441d1a0036d2208ca5b6fda989a66" +MRW_API_SRCREV ?= "31155941629988f0adcf765e7e7dd3af34fb1214" MRW_TOOLS_SRC_URI ?= "git://github.com/openbmc/phosphor-mrw-tools" MRW_TOOLS_SRCREV ?= "2efdcba74bc5d4be594253534069c1ea3d84aea0" |