meta-quanta-q71l: new recipes for ipmi preferences

New ipmi-channel-config
New fru-merge-config recipe
Updated: ipmi-inventory-map
Updated: ipmi-sensor-map

Change-Id: I508265159eaf9b8c4f1c53080fdbe568ab19c953
Signed-off-by: Patrick Venture <venture@google.com>

meta-openbmc-machines/meta-x86/meta-quanta/meta-q71l/conf/machine/quanta-q71l.conf

@@ -31,7 +31,9 @@ PREFERRED_PROVIDER_virtual/obmc-inventory-data ?= "${VIRTUAL-RUNTIME_skeleton_wo
 # These are meant to include the inventory config.yaml and so on.
 PREFERRED_PROVIDER_virtual/phosphor-ipmi-fru-inventory = "q71l-ipmi-inventory-map-native"
 PREFERRED_PROVIDER_virtual/phosphor-ipmi-fru-properties = "q71l-ipmi-fru-properties"
-
 PREFERRED_PROVIDER_virtual/phosphor-ipmi-sensor-inventory = "q71l-ipmi-sensor-map-native"
+PREFERRED_PROVIDER_virtual/phosphor-ipmi-channel-config = "q71l-ipmi-channel-config-native"
+PREFERRED_PROVIDER_virtual/phosphor-ipmi-fru-merge-config = "q71l-ipmi-fru-merge-config-native"
+
 
 PREFERRED_PROVIDER_virtual/obmc-host-ipmi-hw = "phosphor-ipmi-bt"

meta-openbmc-machines/meta-x86/meta-quanta/meta-q71l/recipes-phosphor/ipmi/q71l-ipmi-channel-config-native.bb

+SUMMARY = "Quanta Q71l IPMI Channel to if_name mapping."
+PR = "r1"
+
+inherit native
+inherit phosphor-ipmi-host
+inherit obmc-phosphor-license
+
+PROVIDES += "virtual/phosphor-ipmi-channel-config"
+
+SRC_URI += "file://channel.yaml"
+
+S = "${WORKDIR}"
+
+do_install() {
+	DEST=${D}${sensor_datadir}
+        install -d ${DEST}
+	install channel.yaml ${DEST}/channel.yaml
+}

meta-openbmc-machines/meta-x86/meta-quanta/meta-q71l/recipes-phosphor/ipmi/q71l-ipmi-channel-config/channel.yaml

+1:
+  ifName: eth0
+2:
+  ifName: eth1
+

meta-openbmc-machines/meta-x86/meta-quanta/meta-q71l/recipes-phosphor/ipmi/q71l-ipmi-fru-merge-config-native.bb

+inherit native
+inherit obmc-phosphor-license
+
+DEPENDS += "virtual/phosphor-ipmi-fru-inventory"
+PROVIDES += "virtual/phosphor-ipmi-fru-merge-config"
+
+# Put the fru_config in the right place with the right name.
+# Pull the IPMI FRU YAML config to use it in the IPMI HOST YAML.
+do_install_append() {
+  IPMI_FRU_SRC=${datadir}/phosphor-ipmi-fru/config
+  IPMI_HOST_DEST=${D}${datadir}/phosphor-ipmi-host/config
+  install -d ${IPMI_HOST_DEST}
+  cat ${IPMI_FRU_SRC}/config.yaml > ${IPMI_HOST_DEST}/fru_config.yaml
+}

meta-openbmc-machines/meta-x86/meta-quanta/meta-q71l/recipes-phosphor/ipmi/q71l-ipmi-inventory-map-native.bb

-SUMMARY = "Quanta Q71l IPMI to DBus Inventory mapping."
+SUMMARY = "Quanta-Q71l IPMI to DBus Inventory mapping."
 PR = "r1"
 
 inherit native
@@ -12,9 +12,6 @@ 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}

meta-openbmc-machines/meta-x86/meta-quanta/meta-q71l/recipes-phosphor/ipmi/q71l-ipmi-inventory-map/config.yaml

 0x56:
   /system/chassis/motherboard:
-    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
+    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:
-    xyz.openbmc_project.Inventory.Decorator.Asset:
-      SerialNumber:
-        IPMIFruProperty: Serial Number
-        IPMIFruSection: Chassis
-      PartNumber:
-        IPMIFruProperty: Part Number
-        IPMIFruSection: Chassis
-      Model:
-        IPMIFruProperty: Type
-        IPMIFruSection: Chassis
+    entityID: 23
+    entityInstance: 1
+    interfaces:
+      xyz.openbmc_project.Inventory.Decorator.Asset:
+        SerialNumber:
+          IPMIFruProperty: Serial Number
+          IPMIFruSection: Chassis
+        PartNumber:
+          IPMIFruProperty: Part Number
+          IPMIFruSection: Chassis
+        Model:
+          IPMIFruProperty: Type
+          IPMIFruSection: Chassis
 
 0x50:
   /system/chassis/motherboard/bmc:
-    xyz.openbmc_project.Inventory.Item:
-      PrettyName:
-        IPMIFruProperty: Name
-        IPMIFruSection: Board
-    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.Decorator.Revision:
-      Version:
-        IPMIFruProperty: FRU File ID
-        IPMIFruSection: Board
+    entityID: 6
+    entityInstance: 1
+    interfaces:
+      xyz.openbmc_project.Inventory.Item:
+        PrettyName:
+          IPMIFruProperty: Name
+          IPMIFruSection: Board
+      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.Decorator.Revision:
+        Version:
+          IPMIFruProperty: FRU File ID
+          IPMIFruSection: Board
 
 0x52:
   /system/chassis/pdb:
-    xyz.openbmc_project.Inventory.Item:
-      PrettyName:
-        IPMIFruProperty: Name
-        IPMIFruSection: Board
-    xyz.openbmc_project.Inventory.Decorator.Asset:
-      SerialNumber:
-        IPMIFruProperty: Serial Number
-        IPMIFruSection: Board
-      Manufacturer:
-        IPMIFruProperty: Manufacturer
-        IPMIFruSection: Board
-      PartNumber:
-        IPMIFruProperty: Part Number
-        IPMIFruSection: Board
-      BuildDate:
-        IPMIFruProperty: Mfg Date
-        IPMIFruSection: Board
-      Model:
-        IPMIFruProperty: Model Number
-        IPMIFruSection: Board
-    xyz.openbmc_project.Inventory.Decorator.Revision:
-      Version:
-        IPMIFruProperty: FRU File ID
-        IPMIFruSection: Board
+    entityID: 21
+    entityInstance: 1
+    interfaces:
+      xyz.openbmc_project.Inventory.Item:
+        PrettyName:
+          IPMIFruProperty: Name
+          IPMIFruSection: Board
+      xyz.openbmc_project.Inventory.Decorator.Asset:
+        SerialNumber:
+          IPMIFruProperty: Serial Number
+          IPMIFruSection: Board
+        Manufacturer:
+          IPMIFruProperty: Manufacturer
+          IPMIFruSection: Board
+        PartNumber:
+          IPMIFruProperty: Part Number
+          IPMIFruSection: Board
+        BuildDate:
+          IPMIFruProperty: Mfg Date
+          IPMIFruSection: Board
+        Model:
+          IPMIFruProperty: Model Number
+          IPMIFruSection: Board
+      xyz.openbmc_project.Inventory.Decorator.Revision:
+        Version:
+          IPMIFruProperty: FRU File ID
+          IPMIFruSection: Board
 
 0x57:
   /system/chassis/fp:
-    xyz.openbmc_project.Inventory.Item:
-      PrettyName:
-        IPMIFruProperty: Name
-        IPMIFruSection: Board
-    xyz.openbmc_project.Inventory.Decorator.Asset:
-      SerialNumber:
-        IPMIFruProperty: Serial Number
-        IPMIFruSection: Board
-      Manufacturer:
-        IPMIFruProperty: Manufacturer
-        IPMIFruSection: Board
-      PartNumber:
-        IPMIFruProperty: Part Number
-        IPMIFruSection: Board
-      BuildDate:
-        IPMIFruProperty: Mfg Date
-        IPMIFruSection: Board
-      Model:
-        IPMIFruProperty: Model Number
-        IPMIFruSection: Board
-    xyz.openbmc_project.Inventory.Decorator.Revision:
-      Version:
-        IPMIFruProperty: FRU File ID
-        IPMIFruSection: Board
+    entityID: 2
+    entityInstance: 1
+    interfaces:
+      xyz.openbmc_project.Inventory.Item:
+        PrettyName:
+          IPMIFruProperty: Name
+          IPMIFruSection: Board
+      xyz.openbmc_project.Inventory.Decorator.Asset:
+        SerialNumber:
+          IPMIFruProperty: Serial Number
+          IPMIFruSection: Board
+        Manufacturer:
+          IPMIFruProperty: Manufacturer
+          IPMIFruSection: Board
+        PartNumber:
+          IPMIFruProperty: Part Number
+          IPMIFruSection: Board
+        BuildDate:
+          IPMIFruProperty: Mfg Date
+          IPMIFruSection: Board
+        Model:
+          IPMIFruProperty: Model Number
+          IPMIFruSection: Board
+      xyz.openbmc_project.Inventory.Decorator.Revision:
+        Version:
+          IPMIFruProperty: FRU File ID
+          IPMIFruSection: Board
 
+0x20:
+  /system/chassis/motherboard/mezzanine8/memory_riser:
+    entityID: 8
+    entityInstance: 1
+    interfaces: &riser
+      xyz.openbmc_project.Inventory.Item:
+        PrettyName:
+          IPMIFruProperty: Name
+          IPMIFruSection: Board
+      xyz.openbmc_project.Inventory.Decorator.Asset:
+        SerialNumber:
+          IPMIFruProperty: Serial Number
+          IPMIFruSection: Board
+        Manufacturer:
+          IPMIFruProperty: Manufacturer
+          IPMIFruSection: Board
+        PartNumber:
+          IPMIFruProperty: Part Number
+          IPMIFruSection: Board
+        BuildDate:
+          IPMIFruProperty: Mfg Date
+          IPMIFruSection: Board
+        Model:
+          IPMIFruProperty: Model Number
+          IPMIFruSection: Board
+      xyz.openbmc_project.Inventory.Decorator.Revision:
+        Version:
+          IPMIFruProperty: FRU File ID
+          IPMIFruSection: Board
+
+0x21:
+  /system/chassis/motherboard/mezzanine7/memory_riser:
+    entityID: 8
+    entityInstance: 2
+    interfaces:
+      <<: *riser
+
+0x22:
+  /system/chassis/motherboard/mezzanine6/memory_riser:
+    entityID: 8
+    entityInstance: 3
+    interfaces:
+      <<: *riser
+
+0x23:
+  /system/chassis/motherboard/mezzanine5/memory_riser:
+    entityID: 8
+    entityInstance: 4
+    interfaces:
+      <<: *riser
+
+0x24:
+  /system/chassis/motherboard/mezzanine4/memory_riser:
+    entityID: 8
+    entityInstance: 5
+    interfaces:
+      <<: *riser
+
+0x25:
+  /system/chassis/motherboard/mezzanine3/memory_riser:
+    entityID: 8
+    entityInstance: 6
+    interfaces:
+      <<: *riser
+
+0x26:
+  /system/chassis/motherboard/mezzanine2/memory_riser:
+    entityID: 8
+    entityInstance: 7
+    interfaces:
+      <<: *riser
+
+0x27:
+  /system/chassis/motherboard/mezzanine1/memory_riser:
+    entityID: 8
+    entityInstance: 8
+    interfaces:
+      <<: *riser