Revert "Accelerator interface for sensorinventory items"
This reverts commit f510f7b6b708b22db1f08faf369994f01edd0ddc.
The change causes a compilation error when building the swift machine,
reverting until a fix is submitted.
Tested: Built swift successfully.
(From meta-phosphor rev: 7fb0c049d3a290c8f9d7f7c9690cdef9a97b3c52)
Change-Id: I690ff08d233ff9e654cfc6fbf1b466f39b447360
Signed-off-by: Adriana Kobylak <anoo@us.ibm.com>
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-host/merge_yamls.py b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-host/merge_yamls.py
index 877e3eb..5e6c4b5 100755
--- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-host/merge_yamls.py
+++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-host/merge_yamls.py
@@ -12,11 +12,6 @@
import yaml
import copy
-# Custom representer for None types. This is to handle empty dictionaries.
-# By default Pyyaml outputs these as "null", whereas we want an empty character.
-def represent_none(self, _):
- return self.represent_scalar('tag:yaml.org,2002:null', '')
-
def dict_merge(target, source):
"""Deep merge for dicts.
@@ -48,8 +43,6 @@
# No overrides to handle
sys.exit(0)
-yaml.add_representer(type(None), represent_none)
-
target_filename = sys.argv[1]
with open(target_filename) as target_file:
data = yaml.safe_load(target_file)
diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-sensor-inventory-mrw-config/config.yaml b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-sensor-inventory-mrw-config/config.yaml
index 8188612..ec82afe 100644
--- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-sensor-inventory-mrw-config/config.yaml
+++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-sensor-inventory-mrw-config/config.yaml
@@ -207,7 +207,6 @@
type: "bool"
assert: true
deassert: false
- xyz.openbmc_project.Inventory.Item.Accelerator:
# Field replaceable doesn't come as a sensor data
# but we know that GPU is Field replaceable so setting
# true in both cases.