From c0e3dc01a72ad1388e961e29c4da2e08e60153f3 Mon Sep 17 00:00:00 2001 From: George Liu Date: Thu, 11 Nov 2021 15:39:57 +0800 Subject: meta-inspur: fp5280g2: Update fru ID Generally we will set the fruID of the board to 0. Tested: ipmitool -I lanplus -H ${IP} -U root -P 0penBmc -C 17 fru list FRU Device Description : Builtin FRU Device (ID 0) Board Mfg Date : Mon Jan 1 08:00:00 1996 Board Serial : 000000000000 Board Part Number : 0000000 FRU Device Description : cpu0 (ID 1) Board Mfg Date : Mon Jan 1 08:00:00 1996 Board Mfg : IBM Board Product : PROCESSOR MODULE Board Serial : YA1934426664 Board Part Number : 02CY296 ... Signed-off-by: George Liu Change-Id: I3912636105310855e59810cbc1fab4a4cad53a1b --- .../fp5280g2-yaml-config/fp5280g2-ipmi-fru.yaml | 126 ++++++++++++--------- 1 file changed, 70 insertions(+), 56 deletions(-) diff --git a/meta-inspur/meta-fp5280g2/recipes-phosphor/configuration/fp5280g2-yaml-config/fp5280g2-ipmi-fru.yaml b/meta-inspur/meta-fp5280g2/recipes-phosphor/configuration/fp5280g2-yaml-config/fp5280g2-ipmi-fru.yaml index 7fc2d157f..034186471 100644 --- a/meta-inspur/meta-fp5280g2/recipes-phosphor/configuration/fp5280g2-yaml-config/fp5280g2-ipmi-fru.yaml +++ b/meta-inspur/meta-fp5280g2/recipes-phosphor/configuration/fp5280g2-yaml-config/fp5280g2-ipmi-fru.yaml @@ -1,35 +1,35 @@ -1: - /system/chassis/motherboard/cpu0: - entityID: 3 +0: + /system: + entityID: 6 entityInstance: 1 interfaces: xyz.openbmc_project.Inventory.Decorator.Asset: BuildDate: IPMIFruProperty: Mfg Date - IPMIFruSection: Board + IPMIFruSection: Product Manufacturer: IPMIFruProperty: Manufacturer - IPMIFruSection: Board + IPMIFruSection: Product + Model: + IPMIFruProperty: Model Number + IPMIFruSection: Product PartNumber: IPMIFruProperty: Part Number - IPMIFruSection: Board + IPMIFruSection: Product SerialNumber: IPMIFruProperty: Serial Number - IPMIFruSection: Board + IPMIFruSection: Product xyz.openbmc_project.Inventory.Decorator.Revision: Version: - IPMIFruProperty: Custom Field 2 - IPMIFruSection: Board - IPMIFruValueDelimiter: 58 + IPMIFruProperty: Version xyz.openbmc_project.Inventory.Item: PrettyName: IPMIFruProperty: Name - IPMIFruSection: Board - xyz.openbmc_project.Inventory.Item.Cpu: -2: - /system/chassis/motherboard/cpu1: - entityID: 3 - entityInstance: 2 + IPMIFruSection: Product + xyz.openbmc_project.Inventory.Item.System: + /system/chassis/motherboard/bmc: + entityID: 7 + entityInstance: 1 interfaces: xyz.openbmc_project.Inventory.Decorator.Asset: BuildDate: @@ -44,49 +44,56 @@ SerialNumber: IPMIFruProperty: Serial Number IPMIFruSection: Board - xyz.openbmc_project.Inventory.Decorator.Revision: - Version: - IPMIFruProperty: Custom Field 2 - IPMIFruSection: Board - IPMIFruValueDelimiter: 58 xyz.openbmc_project.Inventory.Item: PrettyName: IPMIFruProperty: Name IPMIFruSection: Board - Value: false - xyz.openbmc_project.Inventory.Item.Cpu: -3: - /system: - entityID: 6 + /system/chassis: + entityID: 7 + entityInstance: 2 + interfaces: + xyz.openbmc_project.Inventory.Decorator.Asset: + SerialNumber: + IPMIFruProperty: Serial Number + IPMIFruSection: Chassis + PartNumber: + IPMIFruProperty: Model Number + IPMIFruSection: Chassis + Model: + IPMIFruProperty: Type + IPMIFruSection: Chassis +1: + /system/chassis/motherboard/cpu0: + entityID: 3 entityInstance: 1 interfaces: xyz.openbmc_project.Inventory.Decorator.Asset: BuildDate: IPMIFruProperty: Mfg Date - IPMIFruSection: Product + IPMIFruSection: Board Manufacturer: IPMIFruProperty: Manufacturer - IPMIFruSection: Product - Model: - IPMIFruProperty: Model Number - IPMIFruSection: Product + IPMIFruSection: Board PartNumber: IPMIFruProperty: Part Number - IPMIFruSection: Product + IPMIFruSection: Board SerialNumber: IPMIFruProperty: Serial Number - IPMIFruSection: Product + IPMIFruSection: Board xyz.openbmc_project.Inventory.Decorator.Revision: Version: - IPMIFruProperty: Version + IPMIFruProperty: Custom Field 2 + IPMIFruSection: Board + IPMIFruValueDelimiter: 58 xyz.openbmc_project.Inventory.Item: PrettyName: IPMIFruProperty: Name - IPMIFruSection: Product - xyz.openbmc_project.Inventory.Item.System: - /system/chassis/motherboard/bmc: - entityID: 7 - entityInstance: 1 + IPMIFruSection: Board + xyz.openbmc_project.Inventory.Item.Cpu: +2: + /system/chassis/motherboard/cpu1: + entityID: 3 + entityInstance: 2 interfaces: xyz.openbmc_project.Inventory.Decorator.Asset: BuildDate: @@ -101,11 +108,18 @@ SerialNumber: IPMIFruProperty: Serial Number IPMIFruSection: Board + xyz.openbmc_project.Inventory.Decorator.Revision: + Version: + IPMIFruProperty: Custom Field 2 + IPMIFruSection: Board + IPMIFruValueDelimiter: 58 xyz.openbmc_project.Inventory.Item: PrettyName: IPMIFruProperty: Name IPMIFruSection: Board -4: + Value: false + xyz.openbmc_project.Inventory.Item.Cpu: +3: /system/chassis/motherboard/dimm0: entityID: 32 entityInstance: 1 @@ -134,7 +148,7 @@ IPMIFruProperty: Name IPMIFruSection: Product xyz.openbmc_project.Inventory.Item.Dimm: -5: +4: /system/chassis/motherboard/dimm1: entityID: 32 entityInstance: 2 @@ -163,7 +177,7 @@ IPMIFruProperty: Name IPMIFruSection: Product xyz.openbmc_project.Inventory.Item.Dimm: -6: +5: /system/chassis/motherboard/dimm2: entityID: 32 entityInstance: 3 @@ -192,7 +206,7 @@ IPMIFruProperty: Name IPMIFruSection: Product xyz.openbmc_project.Inventory.Item.Dimm: -7: +6: /system/chassis/motherboard/dimm3: entityID: 32 entityInstance: 4 @@ -221,7 +235,7 @@ IPMIFruProperty: Name IPMIFruSection: Product xyz.openbmc_project.Inventory.Item.Dimm: -8: +7: /system/chassis/motherboard/dimm4: entityID: 32 entityInstance: 5 @@ -250,7 +264,7 @@ IPMIFruProperty: Name IPMIFruSection: Product xyz.openbmc_project.Inventory.Item.Dimm: -9: +8: /system/chassis/motherboard/dimm5: entityID: 32 entityInstance: 6 @@ -279,7 +293,7 @@ IPMIFruProperty: Name IPMIFruSection: Product xyz.openbmc_project.Inventory.Item.Dimm: -10: +9: /system/chassis/motherboard/dimm6: entityID: 32 entityInstance: 7 @@ -308,7 +322,7 @@ IPMIFruProperty: Name IPMIFruSection: Product xyz.openbmc_project.Inventory.Item.Dimm: -11: +10: /system/chassis/motherboard/dimm7: entityID: 32 entityInstance: 8 @@ -337,7 +351,7 @@ IPMIFruProperty: Name IPMIFruSection: Product xyz.openbmc_project.Inventory.Item.Dimm: -12: +11: /system/chassis/motherboard/dimm8: entityID: 32 entityInstance: 9 @@ -366,7 +380,7 @@ IPMIFruProperty: Name IPMIFruSection: Product xyz.openbmc_project.Inventory.Item.Dimm: -13: +12: /system/chassis/motherboard/dimm9: entityID: 32 entityInstance: 10 @@ -395,7 +409,7 @@ IPMIFruProperty: Name IPMIFruSection: Product xyz.openbmc_project.Inventory.Item.Dimm: -14: +13: /system/chassis/motherboard/dimm10: entityID: 32 entityInstance: 11 @@ -424,7 +438,7 @@ IPMIFruProperty: Name IPMIFruSection: Product xyz.openbmc_project.Inventory.Item.Dimm: -15: +14: /system/chassis/motherboard/dimm11: entityID: 32 entityInstance: 12 @@ -453,7 +467,7 @@ IPMIFruProperty: Name IPMIFruSection: Product xyz.openbmc_project.Inventory.Item.Dimm: -16: +15: /system/chassis/motherboard/dimm12: entityID: 32 entityInstance: 13 @@ -482,7 +496,7 @@ IPMIFruProperty: Name IPMIFruSection: Product xyz.openbmc_project.Inventory.Item.Dimm: -17: +16: /system/chassis/motherboard/dimm13: entityID: 32 entityInstance: 14 @@ -511,7 +525,7 @@ IPMIFruProperty: Name IPMIFruSection: Product xyz.openbmc_project.Inventory.Item.Dimm: -18: +17: /system/chassis/motherboard/dimm14: entityID: 32 entityInstance: 15 @@ -540,7 +554,7 @@ IPMIFruProperty: Name IPMIFruSection: Product xyz.openbmc_project.Inventory.Item.Dimm: -19: +18: /system/chassis/motherboard/dimm15: entityID: 32 entityInstance: 16 @@ -569,7 +583,7 @@ IPMIFruProperty: Name IPMIFruSection: Product xyz.openbmc_project.Inventory.Item.Dimm: -20: +19: /system/chassis/motherboard/bmc/ethernet: entityID: 7 entityInstance: 2 -- cgit v1.2.3