diff options
Diffstat (limited to 'meta-openbmc-machines/meta-openpower')
6 files changed, 13 insertions, 8 deletions
diff --git a/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/vpd/openpower-fru-vpd-layout/layout.yaml b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/vpd/openpower-fru-vpd-layout/layout.yaml index 46a4f4aeb..5e24fc43a 100644 --- a/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/vpd/openpower-fru-vpd-layout/layout.yaml +++ b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/vpd/openpower-fru-vpd-layout/layout.yaml @@ -5,6 +5,9 @@ BMC: Manufacturer: OPFR,VN xyz.openbmc_project.Inventory.Item: PrettyName: VINI,DR + xyz.openbmc_project.Common.UUID: + UUID: OPFR,UD + ETHERNET: xyz.openbmc_project.Inventory.Item.NetworkInterface: diff --git a/meta-openbmc-machines/meta-openpower/meta-rackspace/meta-barreleye/recipes-phosphor/chassis/obmc-mgr-inventory%.bbappend b/meta-openbmc-machines/meta-openpower/meta-rackspace/meta-barreleye/recipes-phosphor/chassis/obmc-mgr-inventory%.bbappend index aeb3dd31b..3d324a1ea 100644 --- a/meta-openbmc-machines/meta-openpower/meta-rackspace/meta-barreleye/recipes-phosphor/chassis/obmc-mgr-inventory%.bbappend +++ b/meta-openbmc-machines/meta-openpower/meta-rackspace/meta-barreleye/recipes-phosphor/chassis/obmc-mgr-inventory%.bbappend @@ -1,6 +1,6 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" -NAMES = "io_board motherboard" +NAMES = "io_board/bmc/ethernet motherboard" ITEMSFMT = "system/chassis/{0}" ITEMS_ESCAPEDFMT = "system-chassis-{0}" diff --git a/meta-openbmc-machines/meta-openpower/meta-rackspace/meta-barreleye/recipes-phosphor/chassis/obmc-mgr-inventory%/obmc/sync_inventory_item/system/chassis/io_board b/meta-openbmc-machines/meta-openpower/meta-rackspace/meta-barreleye/recipes-phosphor/chassis/obmc-mgr-inventory%/obmc/sync_inventory_item/system/chassis/io_board deleted file mode 100644 index 5a1d94ac0..000000000 --- a/meta-openbmc-machines/meta-openpower/meta-rackspace/meta-barreleye/recipes-phosphor/chassis/obmc-mgr-inventory%/obmc/sync_inventory_item/system/chassis/io_board +++ /dev/null @@ -1,4 +0,0 @@ -FRU_TYPE=DAUGHTER_CARD -FRU_NAME=io_board -PROPERTY="Custom Field 2" -SYNC_TYPE=mac diff --git a/meta-openbmc-machines/meta-openpower/meta-rackspace/meta-barreleye/recipes-phosphor/chassis/obmc-mgr-inventory%/obmc/sync_inventory_item/system/chassis/io_board/bmc/ethernet b/meta-openbmc-machines/meta-openpower/meta-rackspace/meta-barreleye/recipes-phosphor/chassis/obmc-mgr-inventory%/obmc/sync_inventory_item/system/chassis/io_board/bmc/ethernet new file mode 100644 index 000000000..722e0e641 --- /dev/null +++ b/meta-openbmc-machines/meta-openpower/meta-rackspace/meta-barreleye/recipes-phosphor/chassis/obmc-mgr-inventory%/obmc/sync_inventory_item/system/chassis/io_board/bmc/ethernet @@ -0,0 +1,2 @@ +PROPERTY="MACAddress" +SYNC_TYPE=mac diff --git a/meta-openbmc-machines/meta-openpower/meta-rackspace/meta-barreleye/recipes-phosphor/chassis/obmc-mgr-inventory%/obmc/sync_inventory_item/system/chassis/motherboard b/meta-openbmc-machines/meta-openpower/meta-rackspace/meta-barreleye/recipes-phosphor/chassis/obmc-mgr-inventory%/obmc/sync_inventory_item/system/chassis/motherboard index bc632f414..95abbc885 100644 --- a/meta-openbmc-machines/meta-openpower/meta-rackspace/meta-barreleye/recipes-phosphor/chassis/obmc-mgr-inventory%/obmc/sync_inventory_item/system/chassis/motherboard +++ b/meta-openbmc-machines/meta-openpower/meta-rackspace/meta-barreleye/recipes-phosphor/chassis/obmc-mgr-inventory%/obmc/sync_inventory_item/system/chassis/motherboard @@ -1,4 +1,2 @@ -FRU_TYPE=MAIN_PLANAR -FRU_NAME=motherboard -PROPERTY="Custom Field 1" +PROPERTY="UUID" SYNC_TYPE=uuid diff --git a/meta-openbmc-machines/meta-openpower/meta-rackspace/meta-barreleye/recipes-phosphor/ipmi/barreleye-ipmi-inventory-map/config.yaml b/meta-openbmc-machines/meta-openpower/meta-rackspace/meta-barreleye/recipes-phosphor/ipmi/barreleye-ipmi-inventory-map/config.yaml index d33757751..ff61518d6 100644 --- a/meta-openbmc-machines/meta-openpower/meta-rackspace/meta-barreleye/recipes-phosphor/ipmi/barreleye-ipmi-inventory-map/config.yaml +++ b/meta-openbmc-machines/meta-openpower/meta-rackspace/meta-barreleye/recipes-phosphor/ipmi/barreleye-ipmi-inventory-map/config.yaml @@ -1055,10 +1055,16 @@ BuildDate: IPMIFruSection: Board IPMIFruProperty: Mfg Date + /system/chassis/io_board/bmc/ethernet: xyz.openbmc_project.Inventory.Item.NetworkInterface: MACAddress: IPMIFruSection: Board IPMIFruProperty: Custom Field 2 + xyz.openbmc_project.Inventory.Item: + PrettyName: + IPMIFruSection: Board + IPMIFruProperty: Name + 101: /system/chassis/sas_expander: |
