meta-openbmc-machines: Remove Garrison from tree

Garrison was never fully working, and has no maintainer. Remove it
from the tree.

Change-Id: Ifbdb8c955a2b9d1777844046a13afca9401ced72
Signed-off-by: Joel Stanley <joel@jms.id.au>

9 files changed, 0 insertions, 3245 deletions

diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-garrison/recipes-phosphor/host/checkstop-monitor.bbappend b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-garrison/recipes-phosphor/host/checkstop-monitor.bbappend
deleted file mode 100644
index 72d991c7e..000000000
--- a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-garrison/recipes-phosphor/host/checkstop-monitor.bbappend
+++ /dev/null
@@ -1 +0,0 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-garrison/recipes-phosphor/host/checkstop-monitor/obmc/gpio/checkstop b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-garrison/recipes-phosphor/host/checkstop-monitor/obmc/gpio/checkstop
deleted file mode 100644
index e08066489..000000000
--- a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-garrison/recipes-phosphor/host/checkstop-monitor/obmc/gpio/checkstop
+++ /dev/null
@@ -1,4 +0,0 @@
-DEVPATH=/dev/input/by-path/platform-gpio-keys-event
-KEY=56
-POLARITY=1
-TARGET=obmc-host-crash@0.target
diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-garrison/recipes-phosphor/ipmi/garrison-ipmi-inventory-map-native.bb b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-garrison/recipes-phosphor/ipmi/garrison-ipmi-inventory-map-native.bb
deleted file mode 100644
index d119208f4..000000000
--- a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-garrison/recipes-phosphor/ipmi/garrison-ipmi-inventory-map-native.bb
+++ /dev/null
@@ -1,22 +0,0 @@
-SUMMARY = "Garrison IPMI to DBus Inventory mapping."
-PR = "r1"
-
-inherit native
-inherit obmc-phosphor-license
-inherit phosphor-ipmi-fru
-
-SRC_URI += "file://config.yaml"
-
-PROVIDES += "virtual/phosphor-ipmi-fru-inventory"
-
-S = "${WORKDIR}"
-
-do_install() {
-        # TODO: install this to inventory_datadir
-        # after ipmi-fru-parser untangles the host
-        # firmware config from the machine inventory.
-        DEST=${D}${config_datadir}
-
-        install -d ${DEST}
-        install config.yaml ${DEST}
-}
diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-garrison/recipes-phosphor/ipmi/garrison-ipmi-inventory-map/config.yaml b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-garrison/recipes-phosphor/ipmi/garrison-ipmi-inventory-map/config.yaml
deleted file mode 100644
index 244ded2fb..000000000
--- a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-garrison/recipes-phosphor/ipmi/garrison-ipmi-inventory-map/config.yaml
+++ /dev/null
@@ -1,1160 +0,0 @@
-1:
-  /system/chassis/motherboard/cpu0:
-    entityID: 3
-    entityInstance: 1
-    interfaces:
-      xyz.openbmc_project.Inventory.Decorator.Revision:
-        Version:
-          IPMIFruProperty: Custom Field 2
-          IPMIFruSection: Board
-          IPMIFruValueDelimiter: 58
-      xyz.openbmc_project.Inventory.Decorator.Asset:
-        BuildDate:
-          IPMIFruProperty: Mfg Date
-          IPMIFruSection: Board
-        PartNumber:
-          IPMIFruProperty: Part Number
-          IPMIFruSection: Board
-        Manufacturer:
-          IPMIFruProperty: Manufacturer
-          IPMIFruSection: Board
-        SerialNumber:
-          IPMIFruProperty: Serial Number
-          IPMIFruSection: Board
-      xyz.openbmc_project.Inventory.Item:
-        PrettyName:
-          IPMIFruProperty: Name
-          IPMIFruSection: Board
-2:
-  /system/chassis/motherboard/cpu1:
-    entityID: 3
-    entityInstance: 2
-    interfaces:
-      xyz.openbmc_project.Inventory.Decorator.Revision:
-        Version:
-          IPMIFruProperty: Custom Field 2
-          IPMIFruSection: Board
-          IPMIFruValueDelimiter: 58
-      xyz.openbmc_project.Inventory.Decorator.Asset:
-        BuildDate:
-          IPMIFruProperty: Mfg Date
-          IPMIFruSection: Board
-        PartNumber:
-          IPMIFruProperty: Part Number
-          IPMIFruSection: Board
-        Manufacturer:
-          IPMIFruProperty: Manufacturer
-          IPMIFruSection: Board
-        SerialNumber:
-          IPMIFruProperty: Serial Number
-          IPMIFruSection: Board
-      xyz.openbmc_project.Inventory.Item:
-        PrettyName:
-          IPMIFruProperty: Name
-          IPMIFruSection: Board
-          Value: False
-3:
-  /system/chassis/motherboard:
-    entityID: 7
-    entityInstance: 1
-    interfaces:
-      xyz.openbmc_project.Inventory.Decorator.Asset:
-        BuildDate:
-          IPMIFruProperty: Mfg Date
-          IPMIFruSection: Board
-        PartNumber:
-          IPMIFruProperty: Part Number
-          IPMIFruSection: Board
-        Manufacturer:
-          IPMIFruProperty: Manufacturer
-          IPMIFruSection: Board
-        SerialNumber:
-          IPMIFruProperty: Serial Number
-          IPMIFruSection: Board
-      xyz.openbmc_project.Inventory.Item:
-        PrettyName:
-          IPMIFruProperty: Name
-          IPMIFruSection: Board
-  /system:
-    entityID: 7
-    entityInstance: 1
-    interfaces:
-      xyz.openbmc_project.Inventory.Decorator.Asset:
-        SerialNumber:
-          IPMIFruProperty: Serial Number
-          IPMIFruSection: Chassis
-        Model:
-          IPMIFruProperty: Part Number
-          IPMIFruSection: Chassis
-4:
-  /system/chassis/motherboard/membuf0:
-    entityID: 8
-    entityInstance: 1
-    interfaces:
-      xyz.openbmc_project.Inventory.Decorator.Asset:
-        BuildDate:
-          IPMIFruProperty: Mfg Date
-          IPMIFruSection: Board
-        PartNumber:
-          IPMIFruProperty: Part Number
-          IPMIFruSection: Board
-        Manufacturer:
-          IPMIFruProperty: Manufacturer
-          IPMIFruSection: Board
-        SerialNumber:
-          IPMIFruProperty: Serial Number
-          IPMIFruSection: Board
-      xyz.openbmc_project.Inventory.Item:
-        PrettyName:
-          IPMIFruProperty: Name
-          IPMIFruSection: Board
-5:
-  /system/chassis/motherboard/membuf1:
-    entityID: 8
-    entityInstance: 2
-    interfaces:
-      xyz.openbmc_project.Inventory.Decorator.Asset:
-        BuildDate:
-          IPMIFruProperty: Mfg Date
-          IPMIFruSection: Board
-        PartNumber:
-          IPMIFruProperty: Part Number
-          IPMIFruSection: Board
-        Manufacturer:
-          IPMIFruProperty: Manufacturer
-          IPMIFruSection: Board
-        SerialNumber:
-          IPMIFruProperty: Serial Number
-          IPMIFruSection: Board
-      xyz.openbmc_project.Inventory.Item:
-        PrettyName:
-          IPMIFruProperty: Name
-          IPMIFruSection: Board
-6:
-  /system/chassis/motherboard/membuf2:
-    entityID: 8
-    entityInstance: 3
-    interfaces:
-      xyz.openbmc_project.Inventory.Decorator.Asset:
-        BuildDate:
-          IPMIFruProperty: Mfg Date
-          IPMIFruSection: Board
-        PartNumber:
-          IPMIFruProperty: Part Number
-          IPMIFruSection: Board
-        Manufacturer:
-          IPMIFruProperty: Manufacturer
-          IPMIFruSection: Board
-        SerialNumber:
-          IPMIFruProperty: Serial Number
-          IPMIFruSection: Board
-      xyz.openbmc_project.Inventory.Item:
-        PrettyName:
-          IPMIFruProperty: Name
-          IPMIFruSection: Board
-7:
-  /system/chassis/motherboard/membuf3:
-    entityID: 8
-    entityInstance: 4
-    interfaces:
-      xyz.openbmc_project.Inventory.Decorator.Asset:
-        BuildDate:
-          IPMIFruProperty: Mfg Date
-          IPMIFruSection: Board
-        PartNumber:
-          IPMIFruProperty: Part Number
-          IPMIFruSection: Board
-        Manufacturer:
-          IPMIFruProperty: Manufacturer
-          IPMIFruSection: Board
-        SerialNumber:
-          IPMIFruProperty: Serial Number
-          IPMIFruSection: Board
-      xyz.openbmc_project.Inventory.Item:
-        PrettyName:
-          IPMIFruProperty: Name
-          IPMIFruSection: Board
-8:
- /system/chassis/motherboard/membuf4:
-    entityID: 8
-    entityInstance: 5
-    interfaces:
-      xyz.openbmc_project.Inventory.Decorator.Asset:
-        BuildDate:
-          IPMIFruProperty: Mfg Date
-          IPMIFruSection: Board
-        PartNumber:
-          IPMIFruProperty: Part Number
-          IPMIFruSection: Board
-        Manufacturer:
-          IPMIFruProperty: Manufacturer
-          IPMIFruSection: Board
-        SerialNumber:
-          IPMIFruProperty: Serial Number
-          IPMIFruSection: Board
-      xyz.openbmc_project.Inventory.Item:
-        PrettyName:
-          IPMIFruProperty: Name
-          IPMIFruSection: Board
-9:
-  /system/chassis/motherboard/membuf5:
-    entityID: 8
-    entityInstance: 6
-    interfaces:
-      xyz.openbmc_project.Inventory.Decorator.Asset:
-        BuildDate:
-          IPMIFruProperty: Mfg Date
-          IPMIFruSection: Board
-        PartNumber:
-          IPMIFruProperty: Part Number
-          IPMIFruSection: Board
-        Manufacturer:
-          IPMIFruProperty: Manufacturer
-          IPMIFruSection: Board
-        SerialNumber:
-          IPMIFruProperty: Serial Number
-          IPMIFruSection: Board
-      xyz.openbmc_project.Inventory.Item:
-        PrettyName:
-          IPMIFruProperty: Name
-          IPMIFruSection: Board
-10:
-  /system/chassis/motherboard/membuf6:
-    entityID: 8
-    entityInstance: 7
-    interfaces:
-      xyz.openbmc_project.Inventory.Decorator.Asset:
-        BuildDate:
-          IPMIFruProperty: Mfg Date
-          IPMIFruSection: Board
-        PartNumber:
-          IPMIFruProperty: Part Number
-          IPMIFruSection: Board
-        Manufacturer:
-          IPMIFruProperty: Manufacturer
-          IPMIFruSection: Board
-        SerialNumber:
-          IPMIFruProperty: Serial Number
-          IPMIFruSection: Board
-      xyz.openbmc_project.Inventory.Item:
-        PrettyName:
-          IPMIFruProperty: Name
-          IPMIFruSection: Board
-11:
-  /system/chassis/motherboard/membuf7:
-    entityID: 8
-    entityInstance: 8
-    interfaces:
-      xyz.openbmc_project.Inventory.Decorator.Asset:
-        BuildDate:
-          IPMIFruProperty: Mfg Date
-          IPMIFruSection: Board
-        PartNumber:
-          IPMIFruProperty: Part Number
-          IPMIFruSection: Board
-        Manufacturer:
-          IPMIFruProperty: Manufacturer
-          IPMIFruSection: Board
-        SerialNumber:
-          IPMIFruProperty: Serial Number
-          IPMIFruSection: Board
-      xyz.openbmc_project.Inventory.Item:
-        PrettyName:
-          IPMIFruProperty: Name
-          IPMIFruSection: Board
-12:
-  /system/chassis/motherboard/dimm0:
-    entityID: 32
-    entityInstance: 1
-    interfaces:
-      xyz.openbmc_project.Inventory.Item:
-        PrettyName:
-          IPMIFruProperty: Name
-          IPMIFruSection: Product
-      xyz.openbmc_project.Inventory.Decorator.Asset:
-        SerialNumber:
-          IPMIFruProperty: Serial Number
-          IPMIFruSection: Product
-        Manufacturer:
-          IPMIFruProperty: Manufacturer
-          IPMIFruSection: Product
-        PartNumber:
-          IPMIFruProperty: Part Number
-          IPMIFruSection: Product
-        BuildDate:
-          IPMIFruProperty: Mfg Date
-          IPMIFruSection: Product
-        Model:
-          IPMIFruProperty: Model Number
-          IPMIFruSection: Product
-      xyz.openbmc_project.Inventory.Decorator.Revision:
-        Version:
-          IPMIFruProperty: Version
-13:
-  /system/chassis/motherboard/dimm1:
-    entityID: 32
-    entityInstance: 2
-    interfaces:
-      xyz.openbmc_project.Inventory.Item:
-        PrettyName:
-          IPMIFruProperty: Name
-          IPMIFruSection: Product
-      xyz.openbmc_project.Inventory.Decorator.Asset:
-        SerialNumber:
-          IPMIFruProperty: Serial Number
-          IPMIFruSection: Product
-        Manufacturer:
-          IPMIFruProperty: Manufacturer
-          IPMIFruSection: Product
-        PartNumber:
-          IPMIFruProperty: Part Number
-          IPMIFruSection: Product
-        BuildDate:
-          IPMIFruProperty: Mfg Date
-          IPMIFruSection: Product
-        Model:
-          IPMIFruProperty: Model Number
-          IPMIFruSection: Product
-      xyz.openbmc_project.Inventory.Decorator.Revision:
-        Version:
-          IPMIFruProperty: Version
-14:
-  /system/chassis/motherboard/dimm2:
-    entityID: 32
-    entityInstance: 3
-    interfaces:
-      xyz.openbmc_project.Inventory.Item:
-        PrettyName:
-          IPMIFruProperty: Name
-          IPMIFruSection: Product
-      xyz.openbmc_project.Inventory.Decorator.Asset:
-        SerialNumber:
-          IPMIFruProperty: Serial Number
-          IPMIFruSection: Product
-        Manufacturer:
-          IPMIFruProperty: Manufacturer
-          IPMIFruSection: Product
-        PartNumber:
-          IPMIFruProperty: Part Number
-          IPMIFruSection: Product
-        BuildDate:
-          IPMIFruProperty: Mfg Date
-          IPMIFruSection: Product
-        Model:
-          IPMIFruProperty: Model Number
-          IPMIFruSection: Product
-      xyz.openbmc_project.Inventory.Decorator.Revision:
-        Version:
-          IPMIFruProperty: Version
-15:
-  /system/chassis/motherboard/dimm3:
-    entityID: 32
-    entityInstance: 4
-    interfaces:
-      xyz.openbmc_project.Inventory.Item:
-        PrettyName:
-          IPMIFruProperty: Name
-          IPMIFruSection: Product
-      xyz.openbmc_project.Inventory.Decorator.Asset:
-        SerialNumber:
-          IPMIFruProperty: Serial Number
-          IPMIFruSection: Product
-        Manufacturer:
-          IPMIFruProperty: Manufacturer
-          IPMIFruSection: Product
-        PartNumber:
-          IPMIFruProperty: Part Number
-          IPMIFruSection: Product
-        BuildDate:
-          IPMIFruProperty: Mfg Date
-          IPMIFruSection: Product
-        Model:
-          IPMIFruProperty: Model Number
-          IPMIFruSection: Product
-      xyz.openbmc_project.Inventory.Decorator.Revision:
-        Version:
-          IPMIFruProperty: Version
-16:
-  /system/chassis/motherboard/dimm4:
-    entityID: 32
-    entityInstance: 5
-    interfaces:
-      xyz.openbmc_project.Inventory.Item:
-        PrettyName:
-          IPMIFruProperty: Name
-          IPMIFruSection: Product
-      xyz.openbmc_project.Inventory.Decorator.Asset:
-        SerialNumber:
-          IPMIFruProperty: Serial Number
-          IPMIFruSection: Product
-        Manufacturer:
-          IPMIFruProperty: Manufacturer
-          IPMIFruSection: Product
-        PartNumber:
-          IPMIFruProperty: Part Number
-          IPMIFruSection: Product
-        BuildDate:
-          IPMIFruProperty: Mfg Date
-          IPMIFruSection: Product
-        Model:
-          IPMIFruProperty: Model Number
-          IPMIFruSection: Product
-      xyz.openbmc_project.Inventory.Decorator.Revision:
-        Version:
-          IPMIFruProperty: Version
-17:
-  /system/chassis/motherboard/dimm5:
-    entityID: 32
-    entityInstance: 6
-    interfaces:
-      xyz.openbmc_project.Inventory.Item:
-        PrettyName:
-          IPMIFruProperty: Name
-          IPMIFruSection: Product
-      xyz.openbmc_project.Inventory.Decorator.Asset:
-        SerialNumber:
-          IPMIFruProperty: Serial Number
-          IPMIFruSection: Product
-        Manufacturer:
-          IPMIFruProperty: Manufacturer
-          IPMIFruSection: Product
-        PartNumber:
-          IPMIFruProperty: Part Number
-          IPMIFruSection: Product
-        BuildDate:
-          IPMIFruProperty: Mfg Date
-          IPMIFruSection: Product
-        Model:
-          IPMIFruProperty: Model Number
-          IPMIFruSection: Product
-      xyz.openbmc_project.Inventory.Decorator.Revision:
-        Version:
-          IPMIFruProperty: Version
-18:
-  /system/chassis/motherboard/dimm6:
-    entityID: 32
-    entityInstance: 7
-    interfaces:
-      xyz.openbmc_project.Inventory.Item:
-        PrettyName:
-          IPMIFruProperty: Name
-          IPMIFruSection: Product
-      xyz.openbmc_project.Inventory.Decorator.Asset:
-        SerialNumber:
-          IPMIFruProperty: Serial Number
-          IPMIFruSection: Product
-        Manufacturer:
-          IPMIFruProperty: Manufacturer
-          IPMIFruSection: Product
-        PartNumber:
-          IPMIFruProperty: Part Number
-          IPMIFruSection: Product
-        BuildDate:
-          IPMIFruProperty: Mfg Date
-          IPMIFruSection: Product
-        Model:
-          IPMIFruProperty: Model Number
-          IPMIFruSection: Product
-      xyz.openbmc_project.Inventory.Decorator.Revision:
-        Version:
-          IPMIFruProperty: Version
-19:
-  /system/chassis/motherboard/dimm7:
-    entityID: 32
-    entityInstance: 8
-    interfaces:
-      xyz.openbmc_project.Inventory.Item:
-        PrettyName:
-          IPMIFruProperty: Name
-          IPMIFruSection: Product
-      xyz.openbmc_project.Inventory.Decorator.Asset:
-        SerialNumber:
-          IPMIFruProperty: Serial Number
-          IPMIFruSection: Product
-        Manufacturer:
-          IPMIFruProperty: Manufacturer
-          IPMIFruSection: Product
-        PartNumber:
-          IPMIFruProperty: Part Number
-          IPMIFruSection: Product
-        BuildDate:
-          IPMIFruProperty: Mfg Date
-          IPMIFruSection: Product
-        Model:
-          IPMIFruProperty: Model Number
-          IPMIFruSection: Product
-      xyz.openbmc_project.Inventory.Decorator.Revision:
-        Version:
-          IPMIFruProperty: Version
-20:
-  /system/chassis/motherboard/dimm8:
-    entityID: 32
-    entityInstance: 9
-    interfaces:
-      xyz.openbmc_project.Inventory.Item:
-        PrettyName:
-          IPMIFruProperty: Name
-          IPMIFruSection: Product
-      xyz.openbmc_project.Inventory.Decorator.Asset:
-        SerialNumber:
-          IPMIFruProperty: Serial Number
-          IPMIFruSection: Product
-        Manufacturer:
-          IPMIFruProperty: Manufacturer
-          IPMIFruSection: Product
-        PartNumber:
-          IPMIFruProperty: Part Number
-          IPMIFruSection: Product
-        BuildDate:
-          IPMIFruProperty: Mfg Date
-          IPMIFruSection: Product
-        Model:
-          IPMIFruProperty: Model Number
-          IPMIFruSection: Product
-      xyz.openbmc_project.Inventory.Decorator.Revision:
-        Version:
-          IPMIFruProperty: Version
-21:
-  /system/chassis/motherboard/dimm9:
-    entityID: 32
-    entityInstance: 10
-    interfaces:
-      xyz.openbmc_project.Inventory.Item:
-        PrettyName:
-          IPMIFruProperty: Name
-          IPMIFruSection: Product
-      xyz.openbmc_project.Inventory.Decorator.Asset:
-        SerialNumber:
-          IPMIFruProperty: Serial Number
-          IPMIFruSection: Product
-        Manufacturer:
-          IPMIFruProperty: Manufacturer
-          IPMIFruSection: Product
-        PartNumber:
-          IPMIFruProperty: Part Number
-          IPMIFruSection: Product
-        BuildDate:
-          IPMIFruProperty: Mfg Date
-          IPMIFruSection: Product
-        Model:
-          IPMIFruProperty: Model Number
-          IPMIFruSection: Product
-      xyz.openbmc_project.Inventory.Decorator.Revision:
-        Version:
-          IPMIFruProperty: Version
-22:
-  /system/chassis/motherboard/dimm10:
-    entityID: 32
-    entityInstance: 11
-    interfaces:
-      xyz.openbmc_project.Inventory.Item:
-        PrettyName:
-          IPMIFruProperty: Name
-          IPMIFruSection: Product
-      xyz.openbmc_project.Inventory.Decorator.Asset:
-        SerialNumber:
-          IPMIFruProperty: Serial Number
-          IPMIFruSection: Product
-        Manufacturer:
-          IPMIFruProperty: Manufacturer
-          IPMIFruSection: Product
-        PartNumber:
-          IPMIFruProperty: Part Number
-          IPMIFruSection: Product
-        BuildDate:
-          IPMIFruProperty: Mfg Date
-          IPMIFruSection: Product
-        Model:
-          IPMIFruProperty: Model Number
-          IPMIFruSection: Product
-      xyz.openbmc_project.Inventory.Decorator.Revision:
-        Version:
-          IPMIFruProperty: Version
-23:
-  /system/chassis/motherboard/dimm11:
-    entityID: 32
-    entityInstance: 12
-    interfaces:
-      xyz.openbmc_project.Inventory.Item:
-        PrettyName:
-          IPMIFruProperty: Name
-          IPMIFruSection: Product
-      xyz.openbmc_project.Inventory.Decorator.Asset:
-        SerialNumber:
-          IPMIFruProperty: Serial Number
-          IPMIFruSection: Product
-        Manufacturer:
-          IPMIFruProperty: Manufacturer
-          IPMIFruSection: Product
-        PartNumber:
-          IPMIFruProperty: Part Number
-          IPMIFruSection: Product
-        BuildDate:
-          IPMIFruProperty: Mfg Date
-          IPMIFruSection: Product
-        Model:
-          IPMIFruProperty: Model Number
-          IPMIFruSection: Product
-      xyz.openbmc_project.Inventory.Decorator.Revision:
-        Version:
-          IPMIFruProperty: Version
-24:
-  /system/chassis/motherboard/dimm12:
-    entityID: 32
-    entityInstance: 13
-    interfaces:
-      xyz.openbmc_project.Inventory.Item:
-        PrettyName:
-          IPMIFruProperty: Name
-          IPMIFruSection: Product
-      xyz.openbmc_project.Inventory.Decorator.Asset:
-        SerialNumber:
-          IPMIFruProperty: Serial Number
-          IPMIFruSection: Product
-        Manufacturer:
-          IPMIFruProperty: Manufacturer
-          IPMIFruSection: Product
-        PartNumber:
-          IPMIFruProperty: Part Number
-          IPMIFruSection: Product
-        BuildDate:
-          IPMIFruProperty: Mfg Date
-          IPMIFruSection: Product
-        Model:
-          IPMIFruProperty: Model Number
-          IPMIFruSection: Product
-      xyz.openbmc_project.Inventory.Decorator.Revision:
-        Version:
-          IPMIFruProperty: Version
-25:
-  /system/chassis/motherboard/dimm13:
-    entityID: 32
-    entityInstance: 14
-    interfaces:
-      xyz.openbmc_project.Inventory.Item:
-        PrettyName:
-          IPMIFruProperty: Name
-          IPMIFruSection: Product
-      xyz.openbmc_project.Inventory.Decorator.Asset:
-        SerialNumber:
-          IPMIFruProperty: Serial Number
-          IPMIFruSection: Product
-        Manufacturer:
-          IPMIFruProperty: Manufacturer
-          IPMIFruSection: Product
-        PartNumber:
-          IPMIFruProperty: Part Number
-          IPMIFruSection: Product
-        BuildDate:
-          IPMIFruProperty: Mfg Date
-          IPMIFruSection: Product
-        Model:
-          IPMIFruProperty: Model Number
-          IPMIFruSection: Product
-      xyz.openbmc_project.Inventory.Decorator.Revision:
-        Version:
-          IPMIFruProperty: Version
-26:
-  /system/chassis/motherboard/dimm14:
-    entityID: 32
-    entityInstance: 15
-    interfaces:
-      xyz.openbmc_project.Inventory.Item:
-        PrettyName:
-          IPMIFruProperty: Name
-          IPMIFruSection: Product
-      xyz.openbmc_project.Inventory.Decorator.Asset:
-        SerialNumber:
-          IPMIFruProperty: Serial Number
-          IPMIFruSection: Product
-        Manufacturer:
-          IPMIFruProperty: Manufacturer
-          IPMIFruSection: Product
-        PartNumber:
-          IPMIFruProperty: Part Number
-          IPMIFruSection: Product
-        BuildDate:
-          IPMIFruProperty: Mfg Date
-          IPMIFruSection: Product
-        Model:
-          IPMIFruProperty: Model Number
-          IPMIFruSection: Product
-      xyz.openbmc_project.Inventory.Decorator.Revision:
-        Version:
-          IPMIFruProperty: Version
-27:
-  /system/chassis/motherboard/dimm15:
-    entityID: 32
-    entityInstance: 16
-    interfaces:
-      xyz.openbmc_project.Inventory.Item:
-        PrettyName:
-          IPMIFruProperty: Name
-          IPMIFruSection: Product
-      xyz.openbmc_project.Inventory.Decorator.Asset:
-        SerialNumber:
-          IPMIFruProperty: Serial Number
-          IPMIFruSection: Product
-        Manufacturer:
-          IPMIFruProperty: Manufacturer
-          IPMIFruSection: Product
-        PartNumber:
-          IPMIFruProperty: Part Number
-          IPMIFruSection: Product
-        BuildDate:
-          IPMIFruProperty: Mfg Date
-          IPMIFruSection: Product
-        Model:
-          IPMIFruProperty: Model Number
-          IPMIFruSection: Product
-      xyz.openbmc_project.Inventory.Decorator.Revision:
-        Version:
-          IPMIFruProperty: Version
-28:
-  /system/chassis/motherboard/dimm16:
-    entityID: 32
-    entityInstance: 17
-    interfaces:
-      xyz.openbmc_project.Inventory.Item:
-        PrettyName:
-          IPMIFruProperty: Name
-          IPMIFruSection: Product
-      xyz.openbmc_project.Inventory.Decorator.Asset:
-        SerialNumber:
-          IPMIFruProperty: Serial Number
-          IPMIFruSection: Product
-        Manufacturer:
-          IPMIFruProperty: Manufacturer
-          IPMIFruSection: Product
-        PartNumber:
-          IPMIFruProperty: Part Number
-          IPMIFruSection: Product
-        BuildDate:
-          IPMIFruProperty: Mfg Date
-          IPMIFruSection: Product
-        Model:
-          IPMIFruProperty: Model Number
-          IPMIFruSection: Product
-      xyz.openbmc_project.Inventory.Decorator.Revision:
-        Version:
-          IPMIFruProperty: Version
-29:
-  /system/chassis/motherboard/dimm17:
-    entityID: 32
-    entityInstance: 18
-    interfaces:
-      xyz.openbmc_project.Inventory.Item:
-        PrettyName:
-          IPMIFruProperty: Name
-          IPMIFruSection: Product
-      xyz.openbmc_project.Inventory.Decorator.Asset:
-        SerialNumber:
-          IPMIFruProperty: Serial Number
-          IPMIFruSection: Product
-        Manufacturer:
-          IPMIFruProperty: Manufacturer
-          IPMIFruSection: Product
-        PartNumber:
-          IPMIFruProperty: Part Number
-          IPMIFruSection: Product
-        BuildDate:
-          IPMIFruProperty: Mfg Date
-          IPMIFruSection: Product
-        Model:
-          IPMIFruProperty: Model Number
-          IPMIFruSection: Product
-      xyz.openbmc_project.Inventory.Decorator.Revision:
-        Version:
-          IPMIFruProperty: Version
-30:
-  /system/chassis/motherboard/dimm18:
-    entityID: 32
-    entityInstance: 19
-    interfaces:
-      xyz.openbmc_project.Inventory.Item:
-        PrettyName:
-          IPMIFruProperty: Name
-          IPMIFruSection: Product
-      xyz.openbmc_project.Inventory.Decorator.Asset:
-        SerialNumber:
-          IPMIFruProperty: Serial Number
-          IPMIFruSection: Product
-        Manufacturer:
-          IPMIFruProperty: Manufacturer
-          IPMIFruSection: Product
-        PartNumber:
-          IPMIFruProperty: Part Number
-          IPMIFruSection: Product
-        BuildDate:
-          IPMIFruProperty: Mfg Date
-          IPMIFruSection: Product
-        Model:
-          IPMIFruProperty: Model Number
-          IPMIFruSection: Product
-      xyz.openbmc_project.Inventory.Decorator.Revision:
-        Version:
-          IPMIFruProperty: Version
-31:
-  /system/chassis/motherboard/dimm19:
-    entityID: 32
-    entityInstance: 20
-    interfaces:
-      xyz.openbmc_project.Inventory.Item:
-        PrettyName:
-          IPMIFruProperty: Name
-          IPMIFruSection: Product
-      xyz.openbmc_project.Inventory.Decorator.Asset:
-        SerialNumber:
-          IPMIFruProperty: Serial Number
-          IPMIFruSection: Product
-        Manufacturer:
-          IPMIFruProperty: Manufacturer
-          IPMIFruSection: Product
-        PartNumber:
-          IPMIFruProperty: Part Number
-          IPMIFruSection: Product
-        BuildDate:
-          IPMIFruProperty: Mfg Date
-          IPMIFruSection: Product
-        Model:
-          IPMIFruProperty: Model Number
-          IPMIFruSection: Product
-      xyz.openbmc_project.Inventory.Decorator.Revision:
-        Version:
-          IPMIFruProperty: Version
-32:
-  /system/chassis/motherboard/dimm20:
-    entityID: 32
-    entityInstance: 21
-    interfaces:
-      xyz.openbmc_project.Inventory.Item:
-        PrettyName:
-          IPMIFruProperty: Name
-          IPMIFruSection: Product
-      xyz.openbmc_project.Inventory.Decorator.Asset:
-        SerialNumber:
-          IPMIFruProperty: Serial Number
-          IPMIFruSection: Product
-        Manufacturer:
-          IPMIFruProperty: Manufacturer
-          IPMIFruSection: Product
-        PartNumber:
-          IPMIFruProperty: Part Number
-          IPMIFruSection: Product
-        BuildDate:
-          IPMIFruProperty: Mfg Date
-          IPMIFruSection: Product
-        Model:
-          IPMIFruProperty: Model Number
-          IPMIFruSection: Product
-      xyz.openbmc_project.Inventory.Decorator.Revision:
-        Version:
-          IPMIFruProperty: Version
-33:
-  /system/chassis/motherboard/dimm21:
-    entityID: 32
-    entityInstance: 22
-    interfaces:
-      xyz.openbmc_project.Inventory.Item:
-        PrettyName:
-          IPMIFruProperty: Name
-          IPMIFruSection: Product
-      xyz.openbmc_project.Inventory.Decorator.Asset:
-        SerialNumber:
-          IPMIFruProperty: Serial Number
-          IPMIFruSection: Product
-        Manufacturer:
-          IPMIFruProperty: Manufacturer
-          IPMIFruSection: Product
-        PartNumber:
-          IPMIFruProperty: Part Number
-          IPMIFruSection: Product
-        BuildDate:
-          IPMIFruProperty: Mfg Date
-          IPMIFruSection: Product
-        Model:
-          IPMIFruProperty: Model Number
-          IPMIFruSection: Product
-      xyz.openbmc_project.Inventory.Decorator.Revision:
-        Version:
-          IPMIFruProperty: Version
-34:
-  /system/chassis/motherboard/dimm22:
-    entityID: 32
-    entityInstance: 23
-    interfaces:
-      xyz.openbmc_project.Inventory.Item:
-        PrettyName:
-          IPMIFruProperty: Name
-          IPMIFruSection: Product
-      xyz.openbmc_project.Inventory.Decorator.Asset:
-        SerialNumber:
-          IPMIFruProperty: Serial Number
-          IPMIFruSection: Product
-        Manufacturer:
-          IPMIFruProperty: Manufacturer
-          IPMIFruSection: Product
-        PartNumber:
-          IPMIFruProperty: Part Number
-          IPMIFruSection: Product
-        BuildDate:
-          IPMIFruProperty: Mfg Date
-          IPMIFruSection: Product
-        Model:
-          IPMIFruProperty: Model Number
-          IPMIFruSection: Product
-      xyz.openbmc_project.Inventory.Decorator.Revision:
-        Version:
-          IPMIFruProperty: Version
-35:
-  /system/chassis/motherboard/dimm23:
-    entityID: 32
-    entityInstance: 24
-    interfaces:
-      xyz.openbmc_project.Inventory.Item:
-        PrettyName:
-          IPMIFruProperty: Name
-          IPMIFruSection: Product
-      xyz.openbmc_project.Inventory.Decorator.Asset:
-        SerialNumber:
-          IPMIFruProperty: Serial Number
-          IPMIFruSection: Product
-        Manufacturer:
-          IPMIFruProperty: Manufacturer
-          IPMIFruSection: Product
-        PartNumber:
-          IPMIFruProperty: Part Number
-          IPMIFruSection: Product
-        BuildDate:
-          IPMIFruProperty: Mfg Date
-          IPMIFruSection: Product
-        Model:
-          IPMIFruProperty: Model Number
-          IPMIFruSection: Product
-      xyz.openbmc_project.Inventory.Decorator.Revision:
-        Version:
-          IPMIFruProperty: Version
-36:
-  /system/chassis/motherboard/dimm24:
-    entityID: 32
-    entityInstance: 25
-    interfaces:
-      xyz.openbmc_project.Inventory.Item:
-        PrettyName:
-          IPMIFruProperty: Name
-          IPMIFruSection: Product
-      xyz.openbmc_project.Inventory.Decorator.Asset:
-        SerialNumber:
-          IPMIFruProperty: Serial Number
-          IPMIFruSection: Product
-        Manufacturer:
-          IPMIFruProperty: Manufacturer
-          IPMIFruSection: Product
-        PartNumber:
-          IPMIFruProperty: Part Number
-          IPMIFruSection: Product
-        BuildDate:
-          IPMIFruProperty: Mfg Date
-          IPMIFruSection: Product
-        Model:
-          IPMIFruProperty: Model Number
-          IPMIFruSection: Product
-      xyz.openbmc_project.Inventory.Decorator.Revision:
-        Version:
-          IPMIFruProperty: Version
-37:
-  /system/chassis/motherboard/dimm25:
-    entityID: 32
-    entityInstance: 26
-    interfaces:
-      xyz.openbmc_project.Inventory.Item:
-        PrettyName:
-          IPMIFruProperty: Name
-          IPMIFruSection: Product
-      xyz.openbmc_project.Inventory.Decorator.Asset:
-        SerialNumber:
-          IPMIFruProperty: Serial Number
-          IPMIFruSection: Product
-        Manufacturer:
-          IPMIFruProperty: Manufacturer
-          IPMIFruSection: Product
-        PartNumber:
-          IPMIFruProperty: Part Number
-          IPMIFruSection: Product
-        BuildDate:
-          IPMIFruProperty: Mfg Date
-          IPMIFruSection: Product
-        Model:
-          IPMIFruProperty: Model Number
-          IPMIFruSection: Product
-      xyz.openbmc_project.Inventory.Decorator.Revision:
-        Version:
-          IPMIFruProperty: Version
-38:
-  /system/chassis/motherboard/dimm26:
-    entityID: 32
-    entityInstance: 27
-    interfaces:
-      xyz.openbmc_project.Inventory.Item:
-        PrettyName:
-          IPMIFruProperty: Name
-          IPMIFruSection: Product
-      xyz.openbmc_project.Inventory.Decorator.Asset:
-        SerialNumber:
-          IPMIFruProperty: Serial Number
-          IPMIFruSection: Product
-        Manufacturer:
-          IPMIFruProperty: Manufacturer
-          IPMIFruSection: Product
-        PartNumber:
-          IPMIFruProperty: Part Number
-          IPMIFruSection: Product
-        BuildDate:
-          IPMIFruProperty: Mfg Date
-          IPMIFruSection: Product
-        Model:
-          IPMIFruProperty: Model Number
-          IPMIFruSection: Product
-      xyz.openbmc_project.Inventory.Decorator.Revision:
-        Version:
-          IPMIFruProperty: Version
-39:
-  /system/chassis/motherboard/dimm27:
-    entityID: 32
-    entityInstance: 28
-    interfaces:
-      xyz.openbmc_project.Inventory.Item:
-        PrettyName:
-          IPMIFruProperty: Name
-          IPMIFruSection: Product
-      xyz.openbmc_project.Inventory.Decorator.Asset:
-        SerialNumber:
-          IPMIFruProperty: Serial Number
-          IPMIFruSection: Product
-        Manufacturer:
-          IPMIFruProperty: Manufacturer
-          IPMIFruSection: Product
-        PartNumber:
-          IPMIFruProperty: Part Number
-          IPMIFruSection: Product
-        BuildDate:
-          IPMIFruProperty: Mfg Date
-          IPMIFruSection: Product
-        Model:
-          IPMIFruProperty: Model Number
-          IPMIFruSection: Product
-      xyz.openbmc_project.Inventory.Decorator.Revision:
-        Version:
-          IPMIFruProperty: Version
-40:
-  /system/chassis/motherboard/dimm28:
-    entityID: 32
-    entityInstance: 29
-    interfaces:
-      xyz.openbmc_project.Inventory.Item:
-        PrettyName:
-          IPMIFruProperty: Name
-          IPMIFruSection: Product
-      xyz.openbmc_project.Inventory.Decorator.Asset:
-        SerialNumber:
-          IPMIFruProperty: Serial Number
-          IPMIFruSection: Product
-        Manufacturer:
-          IPMIFruProperty: Manufacturer
-          IPMIFruSection: Product
-        PartNumber:
-          IPMIFruProperty: Part Number
-          IPMIFruSection: Product
-        BuildDate:
-          IPMIFruProperty: Mfg Date
-          IPMIFruSection: Product
-        Model:
-          IPMIFruProperty: Model Number
-          IPMIFruSection: Product
-      xyz.openbmc_project.Inventory.Decorator.Revision:
-        Version:
-          IPMIFruProperty: Version
-41:
-  /system/chassis/motherboard/dimm29:
-    entityID: 32
-    entityInstance: 30
-    interfaces:
-      xyz.openbmc_project.Inventory.Item:
-        PrettyName:
-          IPMIFruProperty: Name
-          IPMIFruSection: Product
-      xyz.openbmc_project.Inventory.Decorator.Asset:
-        SerialNumber:
-          IPMIFruProperty: Serial Number
-          IPMIFruSection: Product
-        Manufacturer:
-          IPMIFruProperty: Manufacturer
-          IPMIFruSection: Product
-        PartNumber:
-          IPMIFruProperty: Part Number
-          IPMIFruSection: Product
-        BuildDate:
-          IPMIFruProperty: Mfg Date
-          IPMIFruSection: Product
-        Model:
-          IPMIFruProperty: Model Number
-          IPMIFruSection: Product
-      xyz.openbmc_project.Inventory.Decorator.Revision:
-        Version:
-          IPMIFruProperty: Version
-42:
-  /system/chassis/motherboard/dimm30:
-    entityID: 32
-    entityInstance: 31
-    interfaces:
-      xyz.openbmc_project.Inventory.Item:
-        PrettyName:
-          IPMIFruProperty: Name
-          IPMIFruSection: Product
-      xyz.openbmc_project.Inventory.Decorator.Asset:
-        SerialNumber:
-          IPMIFruProperty: Serial Number
-          IPMIFruSection: Product
-        Manufacturer:
-          IPMIFruProperty: Manufacturer
-          IPMIFruSection: Product
-        PartNumber:
-          IPMIFruProperty: Part Number
-          IPMIFruSection: Product
-        BuildDate:
-          IPMIFruProperty: Mfg Date
-          IPMIFruSection: Product
-        Model:
-          IPMIFruProperty: Model Number
-          IPMIFruSection: Product
-      xyz.openbmc_project.Inventory.Decorator.Revision:
-        Version:
-          IPMIFruProperty: Version
-43:
-  /system/chassis/motherboard/dimm31:
-    entityID: 32
-    entityInstance: 32
-    interfaces:
-      xyz.openbmc_project.Inventory.Item:
-        PrettyName:
-          IPMIFruProperty: Name
-          IPMIFruSection: Product
-      xyz.openbmc_project.Inventory.Decorator.Asset:
-        SerialNumber:
-          IPMIFruProperty: Serial Number
-          IPMIFruSection: Product
-        Manufacturer:
-          IPMIFruProperty: Manufacturer
-          IPMIFruSection: Product
-        PartNumber:
-          IPMIFruProperty: Part Number
-          IPMIFruSection: Product
-        BuildDate:
-          IPMIFruProperty: Mfg Date
-          IPMIFruSection: Product
-        Model:
-          IPMIFruProperty: Model Number
-          IPMIFruSection: Product
-      xyz.openbmc_project.Inventory.Decorator.Revision:
-        Version:
-          IPMIFruProperty: Version
diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-garrison/recipes-phosphor/ipmi/phosphor-ipmi-fru-properties%.bbappend b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-garrison/recipes-phosphor/ipmi/phosphor-ipmi-fru-properties%.bbappend
deleted file mode 100644
index 72d991c7e..000000000
--- a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-garrison/recipes-phosphor/ipmi/phosphor-ipmi-fru-properties%.bbappend
+++ /dev/null
@@ -1 +0,0 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-garrison/recipes-phosphor/ipmi/phosphor-ipmi-fru-properties%/extra-properties.yaml b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-garrison/recipes-phosphor/ipmi/phosphor-ipmi-fru-properties%/extra-properties.yaml
deleted file mode 100644
index 5b6005966..000000000
--- a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-garrison/recipes-phosphor/ipmi/phosphor-ipmi-fru-properties%/extra-properties.yaml
+++ /dev/null
@@ -1,352 +0,0 @@
-/system/chassis/motherboard/cpu0:
-    xyz.openbmc_project.Inventory.Decorator.Replaceable:
-        FieldReplaceable: 'true'
-    xyz.openbmc_project.Inventory.Decorator.Cacheable:
-        Cached: 'true'
-    xyz.openbmc_project.Inventory.Item:
-        Present: 'true'
-
-/system/chassis/motherboard/cpu1:
-    xyz.openbmc_project.Inventory.Decorator.Replaceable:
-        FieldReplaceable: 'true'
-    xyz.openbmc_project.Inventory.Decorator.Cacheable:
-        Cached: 'true'
-    xyz.openbmc_project.Inventory.Item:
-        Present: 'true'
-
-/system/chassis/motherboard:
-    xyz.openbmc_project.Inventory.Decorator.Replaceable:
-        FieldReplaceable: 'true'
-    xyz.openbmc_project.Inventory.Decorator.Cacheable:
-        Cached: 'true'
-    xyz.openbmc_project.Inventory.Item:
-        Present: 'true'
-
-/system:
-    xyz.openbmc_project.Inventory.Decorator.Replaceable:
-        FieldReplaceable: 'true'
-    xyz.openbmc_project.Inventory.Decorator.Cacheable:
-        Cached: 'true'
-    xyz.openbmc_project.Inventory.Item:
-        Present: 'true'
-
-/system/chassis/motherboard/membuf0:
-    xyz.openbmc_project.Inventory.Decorator.Replaceable:
-        FieldReplaceable: 'false'
-    xyz.openbmc_project.Inventory.Decorator.Cacheable:
-        Cached: 'true'
-    xyz.openbmc_project.Inventory.Item:
-        Present: 'true'
-
-/system/chassis/motherboard/membuf1:
-    xyz.openbmc_project.Inventory.Decorator.Replaceable:
-        FieldReplaceable: 'false'
-    xyz.openbmc_project.Inventory.Decorator.Cacheable:
-        Cached: 'true'
-    xyz.openbmc_project.Inventory.Item:
-        Present: 'true'
-
-/system/chassis/motherboard/membuf2:
-    xyz.openbmc_project.Inventory.Decorator.Replaceable:
-        FieldReplaceable: 'false'
-    xyz.openbmc_project.Inventory.Decorator.Cacheable:
-        Cached: 'true'
-    xyz.openbmc_project.Inventory.Item:
-        Present: 'true'
-
-/system/chassis/motherboard/membuf3:
-    xyz.openbmc_project.Inventory.Decorator.Replaceable:
-        FieldReplaceable: 'false'
-    xyz.openbmc_project.Inventory.Decorator.Cacheable:
-        Cached: 'true'
-    xyz.openbmc_project.Inventory.Item:
-        Present: 'true'
-
-/system/chassis/motherboard/membuf4:
-    xyz.openbmc_project.Inventory.Decorator.Replaceable:
-        FieldReplaceable: 'false'
-    xyz.openbmc_project.Inventory.Decorator.Cacheable:
-        Cached: 'true'
-    xyz.openbmc_project.Inventory.Item:
-        Present: 'true'
-
-/system/chassis/motherboard/membuf5:
-    xyz.openbmc_project.Inventory.Decorator.Replaceable:
-        FieldReplaceable: 'false'
-    xyz.openbmc_project.Inventory.Decorator.Cacheable:
-        Cached: 'true'
-    xyz.openbmc_project.Inventory.Item:
-        Present: 'true'
-
-/system/chassis/motherboard/membuf6:
-    xyz.openbmc_project.Inventory.Decorator.Replaceable:
-        FieldReplaceable: 'false'
-    xyz.openbmc_project.Inventory.Decorator.Cacheable:
-        Cached: 'true'
-    xyz.openbmc_project.Inventory.Item:
-        Present: 'true'
-
-/system/chassis/motherboard/membuf7:
-    xyz.openbmc_project.Inventory.Decorator.Replaceable:
-        FieldReplaceable: 'false'
-    xyz.openbmc_project.Inventory.Decorator.Cacheable:
-        Cached: 'true'
-    xyz.openbmc_project.Inventory.Item:
-        Present: 'true'
-
-/system/chassis/motherboard/dimm0:
-    xyz.openbmc_project.Inventory.Decorator.Replaceable:
-        FieldReplaceable: 'true'
-    xyz.openbmc_project.Inventory.Decorator.Cacheable:
-        Cached: 'true'
-    xyz.openbmc_project.Inventory.Item:
-        Present: 'true'
-
-/system/chassis/motherboard/dimm1:
-    xyz.openbmc_project.Inventory.Decorator.Replaceable:
-        FieldReplaceable: 'true'
-    xyz.openbmc_project.Inventory.Decorator.Cacheable:
-        Cached: 'true'
-    xyz.openbmc_project.Inventory.Item:
-        Present: 'true'
-
-/system/chassis/motherboard/dimm2:
-    xyz.openbmc_project.Inventory.Decorator.Replaceable:
-        FieldReplaceable: 'true'
-    xyz.openbmc_project.Inventory.Decorator.Cacheable:
-        Cached: 'true'
-    xyz.openbmc_project.Inventory.Item:
-        Present: 'true'
-
-/system/chassis/motherboard/dimm3:
-    xyz.openbmc_project.Inventory.Decorator.Replaceable:
-        FieldReplaceable: 'true'
-    xyz.openbmc_project.Inventory.Decorator.Cacheable:
-        Cached: 'true'
-    xyz.openbmc_project.Inventory.Item:
-        Present: 'true'
-
-/system/chassis/motherboard/dimm4:
-    xyz.openbmc_project.Inventory.Decorator.Replaceable:
-        FieldReplaceable: 'true'
-    xyz.openbmc_project.Inventory.Decorator.Cacheable:
-        Cached: 'true'
-    xyz.openbmc_project.Inventory.Item:
-        Present: 'true'
-
-/system/chassis/motherboard/dimm5:
-    xyz.openbmc_project.Inventory.Decorator.Replaceable:
-        FieldReplaceable: 'true'
-    xyz.openbmc_project.Inventory.Decorator.Cacheable:
-        Cached: 'true'
-    xyz.openbmc_project.Inventory.Item:
-        Present: 'true'
-
-/system/chassis/motherboard/dimm6:
-    xyz.openbmc_project.Inventory.Decorator.Replaceable:
-        FieldReplaceable: 'true'
-    xyz.openbmc_project.Inventory.Decorator.Cacheable:
-        Cached: 'true'
-    xyz.openbmc_project.Inventory.Item:
-        Present: 'true'
-
-/system/chassis/motherboard/dimm7:
-    xyz.openbmc_project.Inventory.Decorator.Replaceable:
-        FieldReplaceable: 'true'
-    xyz.openbmc_project.Inventory.Decorator.Cacheable:
-        Cached: 'true'
-    xyz.openbmc_project.Inventory.Item:
-        Present: 'true'
-
-/system/chassis/motherboard/dimm8:
-    xyz.openbmc_project.Inventory.Decorator.Replaceable:
-        FieldReplaceable: 'true'
-    xyz.openbmc_project.Inventory.Decorator.Cacheable:
-        Cached: 'true'
-    xyz.openbmc_project.Inventory.Item:
-        Present: 'true'
-
-/system/chassis/motherboard/dimm9:
-    xyz.openbmc_project.Inventory.Decorator.Replaceable:
-        FieldReplaceable: 'true'
-    xyz.openbmc_project.Inventory.Decorator.Cacheable:
-        Cached: 'true'
-    xyz.openbmc_project.Inventory.Item:
-        Present: 'true'
-
-/system/chassis/motherboard/dimm10:
-    xyz.openbmc_project.Inventory.Decorator.Replaceable:
-        FieldReplaceable: 'true'
-    xyz.openbmc_project.Inventory.Decorator.Cacheable:
-        Cached: 'true'
-    xyz.openbmc_project.Inventory.Item:
-        Present: 'true'
-
-/system/chassis/motherboard/dimm11:
-    xyz.openbmc_project.Inventory.Decorator.Replaceable:
-        FieldReplaceable: 'true'
-    xyz.openbmc_project.Inventory.Decorator.Cacheable:
-        Cached: 'true'
-    xyz.openbmc_project.Inventory.Item:
-        Present: 'true'
-
-/system/chassis/motherboard/dimm12:
-    xyz.openbmc_project.Inventory.Decorator.Replaceable:
-        FieldReplaceable: 'true'
-    xyz.openbmc_project.Inventory.Decorator.Cacheable:
-        Cached: 'true'
-    xyz.openbmc_project.Inventory.Item:
-        Present: 'true'
-
-/system/chassis/motherboard/dimm13:
-    xyz.openbmc_project.Inventory.Decorator.Replaceable:
-        FieldReplaceable: 'true'
-    xyz.openbmc_project.Inventory.Decorator.Cacheable:
-        Cached: 'true'
-    xyz.openbmc_project.Inventory.Item:
-        Present: 'true'
-
-/system/chassis/motherboard/dimm14:
-    xyz.openbmc_project.Inventory.Decorator.Replaceable:
-        FieldReplaceable: 'true'
-    xyz.openbmc_project.Inventory.Decorator.Cacheable:
-        Cached: 'true'
-    xyz.openbmc_project.Inventory.Item:
-        Present: 'true'
-
-/system/chassis/motherboard/dimm15:
-    xyz.openbmc_project.Inventory.Decorator.Replaceable:
-        FieldReplaceable: 'true'
-    xyz.openbmc_project.Inventory.Decorator.Cacheable:
-        Cached: 'true'
-    xyz.openbmc_project.Inventory.Item:
-        Present: 'true'
-
-/system/chassis/motherboard/dimm16:
-    xyz.openbmc_project.Inventory.Decorator.Replaceable:
-        FieldReplaceable: 'true'
-    xyz.openbmc_project.Inventory.Decorator.Cacheable:
-        Cached: 'true'
-    xyz.openbmc_project.Inventory.Item:
-        Present: 'true'
-
-/system/chassis/motherboard/dimm17:
-    xyz.openbmc_project.Inventory.Decorator.Replaceable:
-        FieldReplaceable: 'true'
-    xyz.openbmc_project.Inventory.Decorator.Cacheable:
-        Cached: 'true'
-    xyz.openbmc_project.Inventory.Item:
-        Present: 'true'
-
-/system/chassis/motherboard/dimm18:
-    xyz.openbmc_project.Inventory.Decorator.Replaceable:
-        FieldReplaceable: 'true'
-    xyz.openbmc_project.Inventory.Decorator.Cacheable:
-        Cached: 'true'
-    xyz.openbmc_project.Inventory.Item:
-        Present: 'true'
-
-/system/chassis/motherboard/dimm19:
-    xyz.openbmc_project.Inventory.Decorator.Replaceable:
-        FieldReplaceable: 'true'
-    xyz.openbmc_project.Inventory.Decorator.Cacheable:
-        Cached: 'true'
-    xyz.openbmc_project.Inventory.Item:
-        Present: 'true'
-
-/system/chassis/motherboard/dimm20:
-    xyz.openbmc_project.Inventory.Decorator.Replaceable:
-        FieldReplaceable: 'true'
-    xyz.openbmc_project.Inventory.Decorator.Cacheable:
-        Cached: 'true'
-    xyz.openbmc_project.Inventory.Item:
-        Present: 'true'
-
-/system/chassis/motherboard/dimm21:
-    xyz.openbmc_project.Inventory.Decorator.Replaceable:
-        FieldReplaceable: 'true'
-    xyz.openbmc_project.Inventory.Decorator.Cacheable:
-        Cached: 'true'
-    xyz.openbmc_project.Inventory.Item:
-        Present: 'true'
-
-/system/chassis/motherboard/dimm22:
-    xyz.openbmc_project.Inventory.Decorator.Replaceable:
-        FieldReplaceable: 'true'
-    xyz.openbmc_project.Inventory.Decorator.Cacheable:
-        Cached: 'true'
-    xyz.openbmc_project.Inventory.Item:
-        Present: 'true'
-
-/system/chassis/motherboard/dimm23:
-    xyz.openbmc_project.Inventory.Decorator.Replaceable:
-        FieldReplaceable: 'true'
-    xyz.openbmc_project.Inventory.Decorator.Cacheable:
-        Cached: 'true'
-    xyz.openbmc_project.Inventory.Item:
-        Present: 'true'
-
-/system/chassis/motherboard/dimm24:
-    xyz.openbmc_project.Inventory.Decorator.Replaceable:
-        FieldReplaceable: 'true'
-    xyz.openbmc_project.Inventory.Decorator.Cacheable:
-        Cached: 'true'
-    xyz.openbmc_project.Inventory.Item:
-        Present: 'true'
-
-/system/chassis/motherboard/dimm25:
-    xyz.openbmc_project.Inventory.Decorator.Replaceable:
-        FieldReplaceable: 'true'
-    xyz.openbmc_project.Inventory.Decorator.Cacheable:
-        Cached: 'true'
-    xyz.openbmc_project.Inventory.Item:
-        Present: 'true'
-
-/system/chassis/motherboard/dimm26:
-    xyz.openbmc_project.Inventory.Decorator.Replaceable:
-        FieldReplaceable: 'true'
-    xyz.openbmc_project.Inventory.Decorator.Cacheable:
-        Cached: 'true'
-    xyz.openbmc_project.Inventory.Item:
-        Present: 'true'
-
-/system/chassis/motherboard/dimm27:
-    xyz.openbmc_project.Inventory.Decorator.Replaceable:
-        FieldReplaceable: 'true'
-    xyz.openbmc_project.Inventory.Decorator.Cacheable:
-        Cached: 'true'
-    xyz.openbmc_project.Inventory.Item:
-        Present: 'true'
-
-/system/chassis/motherboard/dimm28:
-    xyz.openbmc_project.Inventory.Decorator.Replaceable:
-        FieldReplaceable: 'true'
-    xyz.openbmc_project.Inventory.Decorator.Cacheable:
-        Cached: 'true'
-    xyz.openbmc_project.Inventory.Item:
-        Present: 'true'
-
-/system/chassis/motherboard/dimm29:
-    xyz.openbmc_project.Inventory.Decorator.Replaceable:
-        FieldReplaceable: 'true'
-    xyz.openbmc_project.Inventory.Decorator.Cacheable:
-        Cached: 'true'
-    xyz.openbmc_project.Inventory.Item:
-        Present: 'true'
-
-/system/chassis/motherboard/dimm30:
-    xyz.openbmc_project.Inventory.Decorator.Replaceable:
-        FieldReplaceable: 'true'
-    xyz.openbmc_project.Inventory.Decorator.Cacheable:
-        Cached: 'true'
-    xyz.openbmc_project.Inventory.Item:
-        Present: 'true'
-
-/system/chassis/motherboard/dimm31:
-    xyz.openbmc_project.Inventory.Decorator.Replaceable:
-        FieldReplaceable: 'true'
-    xyz.openbmc_project.Inventory.Decorator.Cacheable:
-        Cached: 'true'
-    xyz.openbmc_project.Inventory.Item:
-        Present: 'true'
-
diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-garrison/recipes-phosphor/ipmi/phosphor-ipmi-sensor-inventory%.bbappend b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-garrison/recipes-phosphor/ipmi/phosphor-ipmi-sensor-inventory%.bbappend
deleted file mode 100644
index 72d991c7e..000000000
--- a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-garrison/recipes-phosphor/ipmi/phosphor-ipmi-sensor-inventory%.bbappend
+++ /dev/null
@@ -1 +0,0 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-garrison/recipes-phosphor/ipmi/phosphor-ipmi-sensor-inventory%/config.yaml b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-garrison/recipes-phosphor/ipmi/phosphor-ipmi-sensor-inventory%/config.yaml
deleted file mode 100755
index 75a1fa43b..000000000
--- a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-garrison/recipes-phosphor/ipmi/phosphor-ipmi-sensor-inventory%/config.yaml
+++ /dev/null
@@ -1,1699 +0,0 @@
-0x05:
-  sensorType: 0x0F
-  path: /xyz/openbmc_project/state/host0
-  sensorReadingType: 0x6F
-  serviceInterface: org.freedesktop.DBus.Properties
-  readingType: eventdata2
-  mutability: Mutability::Write|Mutability::Read
-  interfaces:
-    xyz.openbmc_project.State.Boot.Progress:
-      BootProgress:
-        Offsets:
-          0x13:
-            type: string
-            set: xyz.openbmc_project.State.Boot.Progress.ProgressStages.OSStart
-          0x00:
-            type: string
-            set: xyz.openbmc_project.State.Boot.Progress.ProgressStages.Unspecified
-          0x01:
-            type: string
-            set: xyz.openbmc_project.State.Boot.Progress.ProgressStages.MemoryInit
-          0x07:
-            type: string
-            set: xyz.openbmc_project.State.Boot.Progress.ProgressStages.PCIInit
-          0x14:
-            type: string
-            set: xyz.openbmc_project.State.Boot.Progress.ProgressStages.MotherboardInit
-          0x03:
-            type: string
-            set: xyz.openbmc_project.State.Boot.Progress.ProgressStages.SecondaryProcInit
-0x08:
-  sensorType: 0x07
-  path: /org/open_power/control/occ_4_0050
-  sensorReadingType: 0x09
-  serviceInterface: org.freedesktop.DBus.Properties
-  readingType: assertion
-  mutability: Mutability::Write|Mutability::Read
-  interfaces:
-    org.open_power.OCC.Status:
-      OccActive:
-        Offsets:
-          0x00:
-            assert: false
-            deassert: true
-            type: bool
-          0x01:
-            assert: true
-            deassert: false
-            type: bool
-0x09:
-  sensorType: 0x07
-  path: /org/open_power/control/occ_5_0051
-  sensorReadingType: 0x09
-  serviceInterface: org.freedesktop.DBus.Properties
-  readingType: assertion
-  mutability: Mutability::Write|Mutability::Read
-  interfaces:
-    org.open_power.OCC.Status:
-      OccActive:
-        Offsets:
-          0x00:
-            assert: false
-            deassert: true
-            type: bool
-          0x01:
-            assert: true
-            deassert: false
-            type: bool
-0x0c:
-  sensorType: 0x07
-  path: /system/chassis/motherboard/cpu0
-  sensorReadingType: 0x6F
-  serviceInterface: xyz.openbmc_project.Inventory.Manager
-  readingType: assertion
-  mutability: Mutability::Write|Mutability::Read
-  interfaces:
-    xyz.openbmc_project.State.Decorator.OperationalStatus:
-      Functional:
-        Prereqs:
-          0x07:
-            assert: true
-            deassert: false
-            type: bool
-        Offsets:
-          0x08:
-            assert: false
-            deassert: true
-            type: bool
-    xyz.openbmc_project.Inventory.Item:
-      Present:
-        Offsets:
-          0x07:
-            assert: true
-            deassert: false
-            type: bool
-0x0e:
-  sensorType: 0x07
-  path: /system/chassis/motherboard/cpu1
-  sensorReadingType: 0x6F
-  serviceInterface: xyz.openbmc_project.Inventory.Manager
-  readingType: assertion
-  mutability: Mutability::Write|Mutability::Read
-  interfaces:
-    xyz.openbmc_project.State.Decorator.OperationalStatus:
-      Functional:
-        Prereqs:
-          0x07:
-            assert: true
-            deassert: false
-            type: bool
-        Offsets:
-          0x08:
-            assert: false
-            deassert: true
-            type: bool
-    xyz.openbmc_project.Inventory.Item:
-      Present:
-        Offsets:
-          0x07:
-            assert: true
-            deassert: false
-            type: bool
-0x1e:
-  sensorType: 0x0C
-  path: /system/chassis/motherboard/dimm3
-  sensorReadingType: 0x6F
-  serviceInterface: xyz.openbmc_project.Inventory.Manager
-  readingType: assertion
-  mutability: Mutability::Write|Mutability::Read
-  interfaces:
-    xyz.openbmc_project.State.Decorator.OperationalStatus:
-      Functional:
-        Prereqs:
-          0x06:
-            assert: true
-            deassert: false
-            type: bool
-        Offsets:
-          0x04:
-            assert: false
-            deassert: true
-            type: bool
-    xyz.openbmc_project.Inventory.Item:
-      Present:
-        Offsets:
-          0x06:
-            assert: true
-            deassert: false
-            type: bool
-0x1f:
-  sensorType: 0x0C
-  path: /system/chassis/motherboard/dimm2
-  sensorReadingType: 0x6F
-  serviceInterface: xyz.openbmc_project.Inventory.Manager
-  readingType: assertion
-  mutability: Mutability::Write|Mutability::Read
-  interfaces:
-    xyz.openbmc_project.State.Decorator.OperationalStatus:
-      Functional:
-        Prereqs:
-          0x06:
-            assert: true
-            deassert: false
-            type: bool
-        Offsets:
-          0x04:
-            assert: false
-            deassert: true
-            type: bool
-    xyz.openbmc_project.Inventory.Item:
-      Present:
-        Offsets:
-          0x06:
-            assert: true
-            deassert: false
-            type: bool
-0x20:
-  sensorType: 0x0C
-  path: /system/chassis/motherboard/dimm1
-  sensorReadingType: 0x6F
-  serviceInterface: xyz.openbmc_project.Inventory.Manager
-  readingType: assertion
-  mutability: Mutability::Write|Mutability::Read
-  interfaces:
-    xyz.openbmc_project.State.Decorator.OperationalStatus:
-      Functional:
-        Prereqs:
-          0x06:
-            assert: true
-            deassert: false
-            type: bool
-        Offsets:
-          0x04:
-            assert: false
-            deassert: true
-            type: bool
-    xyz.openbmc_project.Inventory.Item:
-      Present:
-        Offsets:
-          0x06:
-            assert: true
-            deassert: false
-            type: bool
-0x21:
-  sensorType: 0x0C
-  path: /system/chassis/motherboard/dimm0
-  sensorReadingType: 0x6F
-  serviceInterface: xyz.openbmc_project.Inventory.Manager
-  readingType: assertion
-  mutability: Mutability::Write|Mutability::Read
-  interfaces:
-    xyz.openbmc_project.State.Decorator.OperationalStatus:
-      Functional:
-        Prereqs:
-          0x06:
-            assert: true
-            deassert: false
-            type: bool
-        Offsets:
-          0x04:
-            assert: false
-            deassert: true
-            type: bool
-    xyz.openbmc_project.Inventory.Item:
-      Present:
-        Offsets:
-          0x06:
-            assert: true
-            deassert: false
-            type: bool
-0x22:
-  sensorType: 0x0C
-  path: /system/chassis/motherboard/dimm7
-  sensorReadingType: 0x6F
-  serviceInterface: xyz.openbmc_project.Inventory.Manager
-  readingType: assertion
-  mutability: Mutability::Write|Mutability::Read
-  interfaces:
-    xyz.openbmc_project.State.Decorator.OperationalStatus:
-      Functional:
-        Prereqs:
-          0x06:
-            assert: true
-            deassert: false
-            type: bool
-        Offsets:
-          0x04:
-            assert: false
-            deassert: true
-            type: bool
-    xyz.openbmc_project.Inventory.Item:
-      Present:
-        Offsets:
-          0x06:
-            assert: true
-            deassert: false
-            type: bool
-0x23:
-  sensorType: 0x0C
-  path: /system/chassis/motherboard/dimm6
-  sensorReadingType: 0x6F
-  serviceInterface: xyz.openbmc_project.Inventory.Manager
-  readingType: assertion
-  mutability: Mutability::Write|Mutability::Read
-  interfaces:
-    xyz.openbmc_project.State.Decorator.OperationalStatus:
-      Functional:
-        Prereqs:
-          0x06:
-            assert: true
-            deassert: false
-            type: bool
-        Offsets:
-          0x04:
-            assert: false
-            deassert: true
-            type: bool
-    xyz.openbmc_project.Inventory.Item:
-      Present:
-        Offsets:
-          0x06:
-            assert: true
-            deassert: false
-            type: bool
-0x24:
-  sensorType: 0x0C
-  path: /system/chassis/motherboard/dimm5
-  sensorReadingType: 0x6F
-  serviceInterface: xyz.openbmc_project.Inventory.Manager
-  readingType: assertion
-  mutability: Mutability::Write|Mutability::Read
-  interfaces:
-    xyz.openbmc_project.State.Decorator.OperationalStatus:
-      Functional:
-        Prereqs:
-          0x06:
-            assert: true
-            deassert: false
-            type: bool
-        Offsets:
-          0x04:
-            assert: false
-            deassert: true
-            type: bool
-    xyz.openbmc_project.Inventory.Item:
-      Present:
-        Offsets:
-          0x06:
-            assert: true
-            deassert: false
-            type: bool
-0x25:
-  sensorType: 0x0C
-  path: /system/chassis/motherboard/dimm4
-  sensorReadingType: 0x6F
-  serviceInterface: xyz.openbmc_project.Inventory.Manager
-  readingType: assertion
-  mutability: Mutability::Write|Mutability::Read
-  interfaces:
-    xyz.openbmc_project.State.Decorator.OperationalStatus:
-      Functional:
-        Prereqs:
-          0x06:
-            assert: true
-            deassert: false
-            type: bool
-        Offsets:
-          0x04:
-            assert: false
-            deassert: true
-            type: bool
-    xyz.openbmc_project.Inventory.Item:
-      Present:
-        Offsets:
-          0x06:
-            assert: true
-            deassert: false
-            type: bool
-0x26:
-  sensorType: 0x0C
-  path: /system/chassis/motherboard/dimm11
-  sensorReadingType: 0x6F
-  serviceInterface: xyz.openbmc_project.Inventory.Manager
-  readingType: assertion
-  mutability: Mutability::Write|Mutability::Read
-  interfaces:
-    xyz.openbmc_project.State.Decorator.OperationalStatus:
-      Functional:
-        Prereqs:
-          0x06:
-            assert: true
-            deassert: false
-            type: bool
-        Offsets:
-          0x04:
-            assert: false
-            deassert: true
-            type: bool
-    xyz.openbmc_project.Inventory.Item:
-      Present:
-        Offsets:
-          0x06:
-            assert: true
-            deassert: false
-            type: bool
-0x27:
-  sensorType: 0x0C
-  path: /system/chassis/motherboard/dimm10
-  sensorReadingType: 0x6F
-  serviceInterface: xyz.openbmc_project.Inventory.Manager
-  readingType: assertion
-  mutability: Mutability::Write|Mutability::Read
-  interfaces:
-    xyz.openbmc_project.State.Decorator.OperationalStatus:
-      Functional:
-        Prereqs:
-          0x06:
-            assert: true
-            deassert: false
-            type: bool
-        Offsets:
-          0x04:
-            assert: false
-            deassert: true
-            type: bool
-    xyz.openbmc_project.Inventory.Item:
-      Present:
-        Offsets:
-          0x06:
-            assert: true
-            deassert: false
-            type: bool
-0x28:
-  sensorType: 0x0C
-  path: /system/chassis/motherboard/dimm9
-  sensorReadingType: 0x6F
-  serviceInterface: xyz.openbmc_project.Inventory.Manager
-  readingType: assertion
-  mutability: Mutability::Write|Mutability::Read
-  interfaces:
-    xyz.openbmc_project.State.Decorator.OperationalStatus:
-      Functional:
-        Prereqs:
-          0x06:
-            assert: true
-            deassert: false
-            type: bool
-        Offsets:
-          0x04:
-            assert: false
-            deassert: true
-            type: bool
-    xyz.openbmc_project.Inventory.Item:
-      Present:
-        Offsets:
-          0x06:
-            assert: true
-            deassert: false
-            type: bool
-0x29:
-  sensorType: 0x0C
-  path: /system/chassis/motherboard/dimm8
-  sensorReadingType: 0x6F
-  serviceInterface: xyz.openbmc_project.Inventory.Manager
-  readingType: assertion
-  mutability: Mutability::Write|Mutability::Read
-  interfaces:
-    xyz.openbmc_project.State.Decorator.OperationalStatus:
-      Functional:
-        Prereqs:
-          0x06:
-            assert: true
-            deassert: false
-            type: bool
-        Offsets:
-          0x04:
-            assert: false
-            deassert: true
-            type: bool
-    xyz.openbmc_project.Inventory.Item:
-      Present:
-        Offsets:
-          0x06:
-            assert: true
-            deassert: false
-            type: bool
-0x2a:
-  sensorType: 0x0C
-  path: /system/chassis/motherboard/dimm15
-  sensorReadingType: 0x6F
-  serviceInterface: xyz.openbmc_project.Inventory.Manager
-  readingType: assertion
-  mutability: Mutability::Write|Mutability::Read
-  interfaces:
-    xyz.openbmc_project.State.Decorator.OperationalStatus:
-      Functional:
-        Prereqs:
-          0x06:
-            assert: true
-            deassert: false
-            type: bool
-        Offsets:
-          0x04:
-            assert: false
-            deassert: true
-            type: bool
-    xyz.openbmc_project.Inventory.Item:
-      Present:
-        Offsets:
-          0x06:
-            assert: true
-            deassert: false
-            type: bool
-0x2b:
-  sensorType: 0x0C
-  path: /system/chassis/motherboard/dimm14
-  sensorReadingType: 0x6F
-  serviceInterface: xyz.openbmc_project.Inventory.Manager
-  readingType: assertion
-  mutability: Mutability::Write|Mutability::Read
-  interfaces:
-    xyz.openbmc_project.State.Decorator.OperationalStatus:
-      Functional:
-        Prereqs:
-          0x06:
-            assert: true
-            deassert: false
-            type: bool
-        Offsets:
-          0x04:
-            assert: false
-            deassert: true
-            type: bool
-    xyz.openbmc_project.Inventory.Item:
-      Present:
-        Offsets:
-          0x06:
-            assert: true
-            deassert: false
-            type: bool
-0x2c:
-  sensorType: 0x0C
-  path: /system/chassis/motherboard/dimm13
-  sensorReadingType: 0x6F
-  serviceInterface: xyz.openbmc_project.Inventory.Manager
-  readingType: assertion
-  mutability: Mutability::Write|Mutability::Read
-  interfaces:
-    xyz.openbmc_project.State.Decorator.OperationalStatus:
-      Functional:
-        Prereqs:
-          0x06:
-            assert: true
-            deassert: false
-            type: bool
-        Offsets:
-          0x04:
-            assert: false
-            deassert: true
-            type: bool
-    xyz.openbmc_project.Inventory.Item:
-      Present:
-        Offsets:
-          0x06:
-            assert: true
-            deassert: false
-            type: bool
-0x2d:
-  sensorType: 0x0C
-  path: /system/chassis/motherboard/dimm12
-  sensorReadingType: 0x6F
-  serviceInterface: xyz.openbmc_project.Inventory.Manager
-  readingType: assertion
-  mutability: Mutability::Write|Mutability::Read
-  interfaces:
-    xyz.openbmc_project.State.Decorator.OperationalStatus:
-      Functional:
-        Prereqs:
-          0x06:
-            assert: true
-            deassert: false
-            type: bool
-        Offsets:
-          0x04:
-            assert: false
-            deassert: true
-            type: bool
-    xyz.openbmc_project.Inventory.Item:
-      Present:
-        Offsets:
-          0x06:
-            assert: true
-            deassert: false
-            type: bool
-0x2e:
-  sensorType: 0x0C
-  path: /system/chassis/motherboard/dimm19
-  sensorReadingType: 0x6F
-  serviceInterface: xyz.openbmc_project.Inventory.Manager
-  readingType: assertion
-  mutability: Mutability::Write|Mutability::Read
-  interfaces:
-    xyz.openbmc_project.State.Decorator.OperationalStatus:
-      Functional:
-        Prereqs:
-          0x06:
-            assert: true
-            deassert: false
-            type: bool
-        Offsets:
-          0x04:
-            assert: false
-            deassert: true
-            type: bool
-    xyz.openbmc_project.Inventory.Item:
-      Present:
-        Offsets:
-          0x06:
-            assert: true
-            deassert: false
-            type: bool
-0x2f:
-  sensorType: 0x0C
-  path: /system/chassis/motherboard/dimm18
-  sensorReadingType: 0x6F
-  serviceInterface: xyz.openbmc_project.Inventory.Manager
-  readingType: assertion
-  mutability: Mutability::Write|Mutability::Read
-  interfaces:
-    xyz.openbmc_project.State.Decorator.OperationalStatus:
-      Functional:
-        Prereqs:
-          0x06:
-            assert: true
-            deassert: false
-            type: bool
-        Offsets:
-          0x04:
-            assert: false
-            deassert: true
-            type: bool
-    xyz.openbmc_project.Inventory.Item:
-      Present:
-        Offsets:
-          0x06:
-            assert: true
-            deassert: false
-            type: bool
-0x30:
-  sensorType: 0x0C
-  path: /system/chassis/motherboard/dimm17
-  sensorReadingType: 0x6F
-  serviceInterface: xyz.openbmc_project.Inventory.Manager
-  readingType: assertion
-  mutability: Mutability::Write|Mutability::Read
-  interfaces:
-    xyz.openbmc_project.State.Decorator.OperationalStatus:
-      Functional:
-        Prereqs:
-          0x06:
-            assert: true
-            deassert: false
-            type: bool
-        Offsets:
-          0x04:
-            assert: false
-            deassert: true
-            type: bool
-    xyz.openbmc_project.Inventory.Item:
-      Present:
-        Offsets:
-          0x06:
-            assert: true
-            deassert: false
-            type: bool
-0x31:
-  sensorType: 0x0C
-  path: /system/chassis/motherboard/dimm16
-  sensorReadingType: 0x6F
-  serviceInterface: xyz.openbmc_project.Inventory.Manager
-  readingType: assertion
-  mutability: Mutability::Write|Mutability::Read
-  interfaces:
-    xyz.openbmc_project.State.Decorator.OperationalStatus:
-      Functional:
-        Prereqs:
-          0x06:
-            assert: true
-            deassert: false
-            type: bool
-        Offsets:
-          0x04:
-            assert: false
-            deassert: true
-            type: bool
-    xyz.openbmc_project.Inventory.Item:
-      Present:
-        Offsets:
-          0x06:
-            assert: true
-            deassert: false
-            type: bool
-0x32:
-  sensorType: 0x0C
-  path: /system/chassis/motherboard/dimm23
-  sensorReadingType: 0x6F
-  serviceInterface: xyz.openbmc_project.Inventory.Manager
-  readingType: assertion
-  mutability: Mutability::Write|Mutability::Read
-  interfaces:
-    xyz.openbmc_project.State.Decorator.OperationalStatus:
-      Functional:
-        Prereqs:
-          0x06:
-            assert: true
-            deassert: false
-            type: bool
-        Offsets:
-          0x04:
-            assert: false
-            deassert: true
-            type: bool
-    xyz.openbmc_project.Inventory.Item:
-      Present:
-        Offsets:
-          0x06:
-            assert: true
-            deassert: false
-            type: bool
-0x33:
-  sensorType: 0x0C
-  path: /system/chassis/motherboard/dimm22
-  sensorReadingType: 0x6F
-  serviceInterface: xyz.openbmc_project.Inventory.Manager
-  readingType: assertion
-  mutability: Mutability::Write|Mutability::Read
-  interfaces:
-    xyz.openbmc_project.State.Decorator.OperationalStatus:
-      Functional:
-        Prereqs:
-          0x06:
-            assert: true
-            deassert: false
-            type: bool
-        Offsets:
-          0x04:
-            assert: false
-            deassert: true
-            type: bool
-    xyz.openbmc_project.Inventory.Item:
-      Present:
-        Offsets:
-          0x06:
-            assert: true
-            deassert: false
-            type: bool
-0x34:
-  sensorType: 0x0C
-  path: /system/chassis/motherboard/dimm21
-  sensorReadingType: 0x6F
-  serviceInterface: xyz.openbmc_project.Inventory.Manager
-  readingType: assertion
-  mutability: Mutability::Write|Mutability::Read
-  interfaces:
-    xyz.openbmc_project.State.Decorator.OperationalStatus:
-      Functional:
-        Prereqs:
-          0x06:
-            assert: true
-            deassert: false
-            type: bool
-        Offsets:
-          0x04:
-            assert: false
-            deassert: true
-            type: bool
-    xyz.openbmc_project.Inventory.Item:
-      Present:
-        Offsets:
-          0x06:
-            assert: true
-            deassert: false
-            type: bool
-0x35:
-  sensorType: 0x0C
-  path: /system/chassis/motherboard/dimm20
-  sensorReadingType: 0x6F
-  serviceInterface: xyz.openbmc_project.Inventory.Manager
-  readingType: assertion
-  mutability: Mutability::Write|Mutability::Read
-  interfaces:
-    xyz.openbmc_project.State.Decorator.OperationalStatus:
-      Functional:
-        Prereqs:
-          0x06:
-            assert: true
-            deassert: false
-            type: bool
-        Offsets:
-          0x04:
-            assert: false
-            deassert: true
-            type: bool
-    xyz.openbmc_project.Inventory.Item:
-      Present:
-        Offsets:
-          0x06:
-            assert: true
-            deassert: false
-            type: bool
-0x36:
-  sensorType: 0x0C
-  path: /system/chassis/motherboard/dimm27
-  sensorReadingType: 0x6F
-  serviceInterface: xyz.openbmc_project.Inventory.Manager
-  readingType: assertion
-  mutability: Mutability::Write|Mutability::Read
-  interfaces:
-    xyz.openbmc_project.State.Decorator.OperationalStatus:
-      Functional:
-        Prereqs:
-          0x06:
-            assert: true
-            deassert: false
-            type: bool
-        Offsets:
-          0x04:
-            assert: false
-            deassert: true
-            type: bool
-    xyz.openbmc_project.Inventory.Item:
-      Present:
-        Offsets:
-          0x06:
-            assert: true
-            deassert: false
-            type: bool
-0x37:
-  sensorType: 0x0C
-  path: /system/chassis/motherboard/dimm26
-  sensorReadingType: 0x6F
-  serviceInterface: xyz.openbmc_project.Inventory.Manager
-  readingType: assertion
-  mutability: Mutability::Write|Mutability::Read
-  interfaces:
-    xyz.openbmc_project.State.Decorator.OperationalStatus:
-      Functional:
-        Prereqs:
-          0x06:
-            assert: true
-            deassert: false
-            type: bool
-        Offsets:
-          0x04:
-            assert: false
-            deassert: true
-            type: bool
-    xyz.openbmc_project.Inventory.Item:
-      Present:
-        Offsets:
-          0x06:
-            assert: true
-            deassert: false
-            type: bool
-0x38:
-  sensorType: 0x0C
-  path: /system/chassis/motherboard/dimm25
-  sensorReadingType: 0x6F
-  serviceInterface: xyz.openbmc_project.Inventory.Manager
-  readingType: assertion
-  mutability: Mutability::Write|Mutability::Read
-  interfaces:
-    xyz.openbmc_project.State.Decorator.OperationalStatus:
-      Functional:
-        Prereqs:
-          0x06:
-            assert: true
-            deassert: false
-            type: bool
-        Offsets:
-          0x04:
-            assert: false
-            deassert: true
-            type: bool
-    xyz.openbmc_project.Inventory.Item:
-      Present:
-        Offsets:
-          0x06:
-            assert: true
-            deassert: false
-            type: bool
-0x39:
-  sensorType: 0x0C
-  path: /system/chassis/motherboard/dimm24
-  sensorReadingType: 0x6F
-  serviceInterface: xyz.openbmc_project.Inventory.Manager
-  readingType: assertion
-  mutability: Mutability::Write|Mutability::Read
-  interfaces:
-    xyz.openbmc_project.State.Decorator.OperationalStatus:
-      Functional:
-        Prereqs:
-          0x06:
-            assert: true
-            deassert: false
-            type: bool
-        Offsets:
-          0x04:
-            assert: false
-            deassert: true
-            type: bool
-    xyz.openbmc_project.Inventory.Item:
-      Present:
-        Offsets:
-          0x06:
-            assert: true
-            deassert: false
-            type: bool
-0x3a:
-  sensorType: 0x0C
-  path: /system/chassis/motherboard/dimm31
-  sensorReadingType: 0x6F
-  serviceInterface: xyz.openbmc_project.Inventory.Manager
-  readingType: assertion
-  mutability: Mutability::Write|Mutability::Read
-  interfaces:
-    xyz.openbmc_project.State.Decorator.OperationalStatus:
-      Functional:
-        Prereqs:
-          0x06:
-            assert: true
-            deassert: false
-            type: bool
-        Offsets:
-          0x04:
-            assert: false
-            deassert: true
-            type: bool
-    xyz.openbmc_project.Inventory.Item:
-      Present:
-        Offsets:
-          0x06:
-            assert: true
-            deassert: false
-            type: bool
-0x3b:
-  sensorType: 0x0C
-  path: /system/chassis/motherboard/dimm30
-  sensorReadingType: 0x6F
-  serviceInterface: xyz.openbmc_project.Inventory.Manager
-  readingType: assertion
-  mutability: Mutability::Write|Mutability::Read
-  interfaces:
-    xyz.openbmc_project.State.Decorator.OperationalStatus:
-      Functional:
-        Prereqs:
-          0x06:
-            assert: true
-            deassert: false
-            type: bool
-        Offsets:
-          0x04:
-            assert: false
-            deassert: true
-            type: bool
-    xyz.openbmc_project.Inventory.Item:
-      Present:
-        Offsets:
-          0x06:
-            assert: true
-            deassert: false
-            type: bool
-0x3c:
-  sensorType: 0x0C
-  path: /system/chassis/motherboard/dimm29
-  sensorReadingType: 0x6F
-  serviceInterface: xyz.openbmc_project.Inventory.Manager
-  readingType: assertion
-  mutability: Mutability::Write|Mutability::Read
-  interfaces:
-    xyz.openbmc_project.State.Decorator.OperationalStatus:
-      Functional:
-        Prereqs:
-          0x06:
-            assert: true
-            deassert: false
-            type: bool
-        Offsets:
-          0x04:
-            assert: false
-            deassert: true
-            type: bool
-    xyz.openbmc_project.Inventory.Item:
-      Present:
-        Offsets:
-          0x06:
-            assert: true
-            deassert: false
-            type: bool
-0x3d:
-  sensorType: 0x0C
-  path: /system/chassis/motherboard/dimm28
-  sensorReadingType: 0x6F
-  serviceInterface: xyz.openbmc_project.Inventory.Manager
-  readingType: assertion
-  mutability: Mutability::Write|Mutability::Read
-  interfaces:
-    xyz.openbmc_project.State.Decorator.OperationalStatus:
-      Functional:
-        Prereqs:
-          0x06:
-            assert: true
-            deassert: false
-            type: bool
-        Offsets:
-          0x04:
-            assert: false
-            deassert: true
-            type: bool
-    xyz.openbmc_project.Inventory.Item:
-      Present:
-        Offsets:
-          0x06:
-            assert: true
-            deassert: false
-            type: bool
-0x3e:
-  sensorType: 0x07
-  path: /system/chassis/motherboard/cpu0/core0
-  sensorReadingType: 0x6F
-  serviceInterface: xyz.openbmc_project.Inventory.Manager
-  readingType: assertion
-  mutability: Mutability::Write|Mutability::Read
-  interfaces:
-    xyz.openbmc_project.State.Decorator.OperationalStatus:
-      Functional:
-        Prereqs:
-          0x07:
-            assert: true
-            deassert: false
-            type: bool
-        Offsets:
-          0x08:
-            assert: false
-            deassert: true
-            type: bool
-    xyz.openbmc_project.Inventory.Item:
-      Present:
-        Offsets:
-          0x07:
-            assert: true
-            deassert: false
-            type: bool
-            skipOn: deassert
-0x3f:
-  sensorType: 0x07
-  path: /system/chassis/motherboard/cpu0/core1
-  sensorReadingType: 0x6F
-  serviceInterface: xyz.openbmc_project.Inventory.Manager
-  readingType: assertion
-  mutability: Mutability::Write|Mutability::Read
-  interfaces:
-    xyz.openbmc_project.State.Decorator.OperationalStatus:
-      Functional:
-        Prereqs:
-          0x07:
-            assert: true
-            deassert: false
-            type: bool
-        Offsets:
-          0x08:
-            assert: false
-            deassert: true
-            type: bool
-    xyz.openbmc_project.Inventory.Item:
-      Present:
-        Offsets:
-          0x07:
-            assert: true
-            deassert: false
-            type: bool
-            skipOn: deassert
-0x40:
-  sensorType: 0x07
-  path: /system/chassis/motherboard/cpu0/core2
-  sensorReadingType: 0x6F
-  serviceInterface: xyz.openbmc_project.Inventory.Manager
-  readingType: assertion
-  mutability: Mutability::Write|Mutability::Read
-  interfaces:
-    xyz.openbmc_project.State.Decorator.OperationalStatus:
-      Functional:
-        Prereqs:
-          0x07:
-            assert: true
-            deassert: false
-            type: bool
-        Offsets:
-          0x08:
-            assert: false
-            deassert: true
-            type: bool
-    xyz.openbmc_project.Inventory.Item:
-      Present:
-        Offsets:
-          0x07:
-            assert: true
-            deassert: false
-            type: bool
-            skipOn: deassert
-0x41:
-  sensorType: 0x07
-  path: /system/chassis/motherboard/cpu0/core3
-  sensorReadingType: 0x6F
-  serviceInterface: xyz.openbmc_project.Inventory.Manager
-  readingType: assertion
-  mutability: Mutability::Write|Mutability::Read
-  interfaces:
-    xyz.openbmc_project.State.Decorator.OperationalStatus:
-      Functional:
-        Prereqs:
-          0x07:
-            assert: true
-            deassert: false
-            type: bool
-        Offsets:
-          0x08:
-            assert: false
-            deassert: true
-            type: bool
-    xyz.openbmc_project.Inventory.Item:
-      Present:
-        Offsets:
-          0x07:
-            assert: true
-            deassert: false
-            type: bool
-            skipOn: deassert
-0x42:
-  sensorType: 0x07
-  path: /system/chassis/motherboard/cpu0/core4
-  sensorReadingType: 0x6F
-  serviceInterface: xyz.openbmc_project.Inventory.Manager
-  readingType: assertion
-  mutability: Mutability::Write|Mutability::Read
-  interfaces:
-    xyz.openbmc_project.State.Decorator.OperationalStatus:
-      Functional:
-        Prereqs:
-          0x07:
-            assert: true
-            deassert: false
-            type: bool
-        Offsets:
-          0x08:
-            assert: false
-            deassert: true
-            type: bool
-    xyz.openbmc_project.Inventory.Item:
-      Present:
-        Offsets:
-          0x07:
-            assert: true
-            deassert: false
-            type: bool
-            skipOn: deassert
-0x43:
-  sensorType: 0x07
-  path: /system/chassis/motherboard/cpu0/core5
-  sensorReadingType: 0x6F
-  serviceInterface: xyz.openbmc_project.Inventory.Manager
-  readingType: assertion
-  mutability: Mutability::Write|Mutability::Read
-  interfaces:
-    xyz.openbmc_project.State.Decorator.OperationalStatus:
-      Functional:
-        Prereqs:
-          0x07:
-            assert: true
-            deassert: false
-            type: bool
-        Offsets:
-          0x08:
-            assert: false
-            deassert: true
-            type: bool
-    xyz.openbmc_project.Inventory.Item:
-      Present:
-        Offsets:
-          0x07:
-            assert: true
-            deassert: false
-            type: bool
-            skipOn: deassert
-0x44:
-  sensorType: 0x07
-  path: /system/chassis/motherboard/cpu0/core6
-  sensorReadingType: 0x6F
-  serviceInterface: xyz.openbmc_project.Inventory.Manager
-  readingType: assertion
-  mutability: Mutability::Write|Mutability::Read
-  interfaces:
-    xyz.openbmc_project.State.Decorator.OperationalStatus:
-      Functional:
-        Prereqs:
-          0x07:
-            assert: true
-            deassert: false
-            type: bool
-        Offsets:
-          0x08:
-            assert: false
-            deassert: true
-            type: bool
-    xyz.openbmc_project.Inventory.Item:
-      Present:
-        Offsets:
-          0x07:
-            assert: true
-            deassert: false
-            type: bool
-            skipOn: deassert
-0x45:
-  sensorType: 0x07
-  path: /system/chassis/motherboard/cpu0/core7
-  sensorReadingType: 0x6F
-  serviceInterface: xyz.openbmc_project.Inventory.Manager
-  readingType: assertion
-  mutability: Mutability::Write|Mutability::Read
-  interfaces:
-    xyz.openbmc_project.State.Decorator.OperationalStatus:
-      Functional:
-        Prereqs:
-          0x07:
-            assert: true
-            deassert: false
-            type: bool
-        Offsets:
-          0x08:
-            assert: false
-            deassert: true
-            type: bool
-    xyz.openbmc_project.Inventory.Item:
-      Present:
-        Offsets:
-          0x07:
-            assert: true
-            deassert: false
-            type: bool
-            skipOn: deassert
-0x46:
-  sensorType: 0x07
-  path: /system/chassis/motherboard/cpu0/core8
-  sensorReadingType: 0x6F
-  serviceInterface: xyz.openbmc_project.Inventory.Manager
-  readingType: assertion
-  mutability: Mutability::Write|Mutability::Read
-  interfaces:
-    xyz.openbmc_project.State.Decorator.OperationalStatus:
-      Functional:
-        Prereqs:
-          0x07:
-            assert: true
-            deassert: false
-            type: bool
-        Offsets:
-          0x08:
-            assert: false
-            deassert: true
-            type: bool
-    xyz.openbmc_project.Inventory.Item:
-      Present:
-        Offsets:
-          0x07:
-            assert: true
-            deassert: false
-            type: bool
-            skipOn: deassert
-0x47:
-  sensorType: 0x07
-  path: /system/chassis/motherboard/cpu0/core9
-  sensorReadingType: 0x6F
-  serviceInterface: xyz.openbmc_project.Inventory.Manager
-  readingType: assertion
-  mutability: Mutability::Write|Mutability::Read
-  interfaces:
-    xyz.openbmc_project.State.Decorator.OperationalStatus:
-      Functional:
-        Prereqs:
-          0x07:
-            assert: true
-            deassert: false
-            type: bool
-        Offsets:
-          0x08:
-            assert: false
-            deassert: true
-            type: bool
-    xyz.openbmc_project.Inventory.Item:
-      Present:
-        Offsets:
-          0x07:
-            assert: true
-            deassert: false
-            type: bool
-            skipOn: deassert
-0x48:
-  sensorType: 0x07
-  path: /system/chassis/motherboard/cpu0/core10
-  sensorReadingType: 0x6F
-  serviceInterface: xyz.openbmc_project.Inventory.Manager
-  readingType: assertion
-  mutability: Mutability::Write|Mutability::Read
-  interfaces:
-    xyz.openbmc_project.State.Decorator.OperationalStatus:
-      Functional:
-        Prereqs:
-          0x07:
-            assert: true
-            deassert: false
-            type: bool
-        Offsets:
-          0x08:
-            assert: false
-            deassert: true
-            type: bool
-    xyz.openbmc_project.Inventory.Item:
-      Present:
-        Offsets:
-          0x07:
-            assert: true
-            deassert: false
-            type: bool
-            skipOn: deassert
-0x49:
-  sensorType: 0x07
-  path: /system/chassis/motherboard/cpu0/core11
-  sensorReadingType: 0x6F
-  serviceInterface: xyz.openbmc_project.Inventory.Manager
-  readingType: assertion
-  mutability: Mutability::Write|Mutability::Read
-  interfaces:
-    xyz.openbmc_project.State.Decorator.OperationalStatus:
-      Functional:
-        Prereqs:
-          0x07:
-            assert: true
-            deassert: false
-            type: bool
-        Offsets:
-          0x08:
-            assert: false
-            deassert: true
-            type: bool
-    xyz.openbmc_project.Inventory.Item:
-      Present:
-        Offsets:
-          0x07:
-            assert: true
-            deassert: false
-            type: bool
-            skipOn: deassert
-0x4a:
-  sensorType: 0x07
-  path: /system/chassis/motherboard/cpu1/core0
-  sensorReadingType: 0x6F
-  serviceInterface: xyz.openbmc_project.Inventory.Manager
-  readingType: assertion
-  mutability: Mutability::Write|Mutability::Read
-  interfaces:
-    xyz.openbmc_project.State.Decorator.OperationalStatus:
-      Functional:
-        Prereqs:
-          0x07:
-            assert: true
-            deassert: false
-            type: bool
-        Offsets:
-          0x08:
-            assert: false
-            deassert: true
-            type: bool
-    xyz.openbmc_project.Inventory.Item:
-      Present:
-        Offsets:
-          0x07:
-            assert: true
-            deassert: false
-            type: bool
-            skipOn: deassert
-0x4b:
-  sensorType: 0x07
-  path: /system/chassis/motherboard/cpu1/core1
-  sensorReadingType: 0x6F
-  serviceInterface: xyz.openbmc_project.Inventory.Manager
-  readingType: assertion
-  mutability: Mutability::Write|Mutability::Read
-  interfaces:
-    xyz.openbmc_project.State.Decorator.OperationalStatus:
-      Functional:
-        Prereqs:
-          0x07:
-            assert: true
-            deassert: false
-            type: bool
-        Offsets:
-          0x08:
-            assert: false
-            deassert: true
-            type: bool
-    xyz.openbmc_project.Inventory.Item:
-      Present:
-        Offsets:
-          0x07:
-            assert: true
-            deassert: false
-            type: bool
-            skipOn: deassert
-0x4c:
-  sensorType: 0x07
-  path: /system/chassis/motherboard/cpu1/core2
-  sensorReadingType: 0x6F
-  serviceInterface: xyz.openbmc_project.Inventory.Manager
-  readingType: assertion
-  mutability: Mutability::Write|Mutability::Read
-  interfaces:
-    xyz.openbmc_project.State.Decorator.OperationalStatus:
-      Functional:
-        Prereqs:
-          0x07:
-            assert: true
-            deassert: false
-            type: bool
-        Offsets:
-          0x08:
-            assert: false
-            deassert: true
-            type: bool
-    xyz.openbmc_project.Inventory.Item:
-      Present:
-        Offsets:
-          0x07:
-            assert: true
-            deassert: false
-            type: bool
-            skipOn: deassert
-0x4d:
-  sensorType: 0x07
-  path: /system/chassis/motherboard/cpu1/core3
-  sensorReadingType: 0x6F
-  serviceInterface: xyz.openbmc_project.Inventory.Manager
-  readingType: assertion
-  mutability: Mutability::Write|Mutability::Read
-  interfaces:
-    xyz.openbmc_project.State.Decorator.OperationalStatus:
-      Functional:
-        Prereqs:
-          0x07:
-            assert: true
-            deassert: false
-            type: bool
-        Offsets:
-          0x08:
-            assert: false
-            deassert: true
-            type: bool
-    xyz.openbmc_project.Inventory.Item:
-      Present:
-        Offsets:
-          0x07:
-            assert: true
-            deassert: false
-            type: bool
-            skipOn: deassert
-0x4e:
-  sensorType: 0x07
-  path: /system/chassis/motherboard/cpu1/core4
-  sensorReadingType: 0x6F
-  serviceInterface: xyz.openbmc_project.Inventory.Manager
-  readingType: assertion
-  mutability: Mutability::Write|Mutability::Read
-  interfaces:
-    xyz.openbmc_project.State.Decorator.OperationalStatus:
-      Functional:
-        Prereqs:
-          0x07:
-            assert: true
-            deassert: false
-            type: bool
-        Offsets:
-          0x08:
-            assert: false
-            deassert: true
-            type: bool
-    xyz.openbmc_project.Inventory.Item:
-      Present:
-        Offsets:
-          0x07:
-            assert: true
-            deassert: false
-            type: bool
-            skipOn: deassert
-0x4f:
-  sensorType: 0x07
-  path: /system/chassis/motherboard/cpu1/core5
-  sensorReadingType: 0x6F
-  serviceInterface: xyz.openbmc_project.Inventory.Manager
-  readingType: assertion
-  mutability: Mutability::Write|Mutability::Read
-  interfaces:
-    xyz.openbmc_project.State.Decorator.OperationalStatus:
-      Functional:
-        Prereqs:
-          0x07:
-            assert: true
-            deassert: false
-            type: bool
-        Offsets:
-          0x08:
-            assert: false
-            deassert: true
-            type: bool
-    xyz.openbmc_project.Inventory.Item:
-      Present:
-        Offsets:
-          0x07:
-            assert: true
-            deassert: false
-            type: bool
-            skipOn: deassert
-0x50:
-  sensorType: 0x07
-  path: /system/chassis/motherboard/cpu1/core6
-  sensorReadingType: 0x6F
-  serviceInterface: xyz.openbmc_project.Inventory.Manager
-  readingType: assertion
-  mutability: Mutability::Write|Mutability::Read
-  interfaces:
-    xyz.openbmc_project.State.Decorator.OperationalStatus:
-      Functional:
-        Prereqs:
-          0x07:
-            assert: true
-            deassert: false
-            type: bool
-        Offsets:
-          0x08:
-            assert: false
-            deassert: true
-            type: bool
-    xyz.openbmc_project.Inventory.Item:
-      Present:
-        Offsets:
-          0x07:
-            assert: true
-            deassert: false
-            type: bool
-            skipOn: deassert
-0x51:
-  sensorType: 0x07
-  path: /system/chassis/motherboard/cpu1/core7
-  sensorReadingType: 0x6F
-  serviceInterface: xyz.openbmc_project.Inventory.Manager
-  readingType: assertion
-  mutability: Mutability::Write|Mutability::Read
-  interfaces:
-    xyz.openbmc_project.State.Decorator.OperationalStatus:
-      Functional:
-        Prereqs:
-          0x07:
-            assert: true
-            deassert: false
-            type: bool
-        Offsets:
-          0x08:
-            assert: false
-            deassert: true
-            type: bool
-    xyz.openbmc_project.Inventory.Item:
-      Present:
-        Offsets:
-          0x07:
-            assert: true
-            deassert: false
-            type: bool
-            skipOn: deassert
-0x52:
-  sensorType: 0x07
-  path: /system/chassis/motherboard/cpu1/core8
-  sensorReadingType: 0x6F
-  serviceInterface: xyz.openbmc_project.Inventory.Manager
-  readingType: assertion
-  mutability: Mutability::Write|Mutability::Read
-  interfaces:
-    xyz.openbmc_project.State.Decorator.OperationalStatus:
-      Functional:
-        Prereqs:
-          0x07:
-            assert: true
-            deassert: false
-            type: bool
-        Offsets:
-          0x08:
-            assert: false
-            deassert: true
-            type: bool
-    xyz.openbmc_project.Inventory.Item:
-      Present:
-        Offsets:
-          0x07:
-            assert: true
-            deassert: false
-            type: bool
-            skipOn: deassert
-0x53:
-  sensorType: 0x07
-  path: /system/chassis/motherboard/cpu1/core9
-  sensorReadingType: 0x6F
-  serviceInterface: xyz.openbmc_project.Inventory.Manager
-  readingType: assertion
-  mutability: Mutability::Write|Mutability::Read
-  interfaces:
-    xyz.openbmc_project.State.Decorator.OperationalStatus:
-      Functional:
-        Prereqs:
-          0x07:
-            assert: true
-            deassert: false
-            type: bool
-        Offsets:
-          0x08:
-            assert: false
-            deassert: true
-            type: bool
-    xyz.openbmc_project.Inventory.Item:
-      Present:
-        Offsets:
-          0x07:
-            assert: true
-            deassert: false
-            type: bool
-            skipOn: deassert
-0x54:
-  sensorType: 0x07
-  path: /system/chassis/motherboard/cpu1/core10
-  sensorReadingType: 0x6F
-  serviceInterface: xyz.openbmc_project.Inventory.Manager
-  readingType: assertion
-  mutability: Mutability::Write|Mutability::Read
-  interfaces:
-    xyz.openbmc_project.State.Decorator.OperationalStatus:
-      Functional:
-        Prereqs:
-          0x07:
-            assert: true
-            deassert: false
-            type: bool
-        Offsets:
-          0x08:
-            assert: false
-            deassert: true
-            type: bool
-    xyz.openbmc_project.Inventory.Item:
-      Present:
-        Offsets:
-          0x07:
-            assert: true
-            deassert: false
-            type: bool
-            skipOn: deassert
-0x55:
-  sensorType: 0x07
-  path: /system/chassis/motherboard/cpu1/core11
-  sensorReadingType: 0x6F
-  serviceInterface: xyz.openbmc_project.Inventory.Manager
-  readingType: assertion
-  mutability: Mutability::Write|Mutability::Read
-  interfaces:
-    xyz.openbmc_project.State.Decorator.OperationalStatus:
-      Functional:
-        Prereqs:
-          0x07:
-            assert: true
-            deassert: false
-            type: bool
-        Offsets:
-          0x08:
-            assert: false
-            deassert: true
-            type: bool
-    xyz.openbmc_project.Inventory.Item:
-      Present:
-        Offsets:
-          0x07:
-            assert: true
-            deassert: false
-            type: bool
-            skipOn: deassert
-0x5F:
-  sensorType: 0xC3
-  path: /xyz/openbmc_project/state/host0
-  sensorReadingType: 0x6F
-  serviceInterface: org.freedesktop.DBus.Properties
-  readingType: readingAssertion
-  mutability: Mutability::Write|Mutability::Read
-  interfaces:
-    xyz.openbmc_project.Control.Boot.RebootAttempts:
-      AttemptsLeft:
-        Offsets:
-          0xFF:
-            type: uint32_t
-0xB5:
-  sensorType: 0x1F
-  path: /xyz/openbmc_project/state/host0
-  sensorReadingType: 0x6F
-  serviceInterface: org.freedesktop.DBus.Properties
-  readingType: assertion
-  mutability: Mutability::Write|Mutability::Read
-  interfaces:
-    xyz.openbmc_project.State.OperatingSystem.Status:
-      OperatingSystemState:
-        Offsets:
-          0x02:
-            assert: xyz.openbmc_project.State.OperatingSystem.Status.OSStatus.PXEBoot
-            type: string
-          0x06:
-            assert: xyz.openbmc_project.State.OperatingSystem.Status.OSStatus.BootComplete
-            type: string
-          0x04:
-            assert: xyz.openbmc_project.State.OperatingSystem.Status.OSStatus.CDROMBoot
-            type: string
-          0x01:
-            assert: xyz.openbmc_project.State.OperatingSystem.Status.OSStatus.CBoot
-            type: string
-          0x03:
-            assert: xyz.openbmc_project.State.OperatingSystem.Status.OSStatus.DiagBoot
-            type: string
-          0x05:
-            assert: xyz.openbmc_project.State.OperatingSystem.Status.OSStatus.ROMBoot
-            type: string
diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-garrison/recipes-phosphor/workbook/garrison-config.bb b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-garrison/recipes-phosphor/workbook/garrison-config.bb
deleted file mode 100644
index 51ec6765c..000000000
--- a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-garrison/recipes-phosphor/workbook/garrison-config.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-SUMMARY = "Garrison board wiring"
-DESCRIPTION = "Board wiring information for the Garrison system."
-PR = "r1"
-
-inherit config-in-skeleton