configurations: minerva: change fan board probe condition

We found that the old probe condition causes a "Duplicate found"
error, as shown in the logs below:

```
May 02 01:45:23 bmc entity-manager[10222]: Duplicates found, replacing $bus - 15 with found device index.
May 02 01:45:23 bmc entity-manager[10222]:  Consider fixing template to not have duplicates
May 02 01:45:23 bmc entity-manager[10222]: Duplicates found, replacing $bus - 15 with found device index.
May 02 01:45:23 bmc entity-manager[10222]:  Consider fixing template to not have duplicates
May 02 01:45:23 bmc entity-manager[10222]: Duplicates found, replacing $bus - 15 with found device index.
May 02 01:45:23 bmc entity-manager[10222]:  Consider fixing template to not have duplicates
May 02 01:45:23 bmc entity-manager[10222]: Duplicates found, replacing $bus - 15 with found device index.
May 02 01:45:23 bmc entity-manager[10222]:  Consider fixing template to not have duplicates
May 02 01:45:23 bmc entity-manager[10222]: Duplicates found, replacing $bus - 15 with found device index.
May 02 01:45:23 bmc entity-manager[10222]:  Consider fixing template to not have duplicates
May 02 01:45:23 bmc entity-manager[10222]: Duplicates found, replacing $bus - 15 with found device index.
May 02 01:45:23 bmc entity-manager[10222]:  Consider fixing template to not have duplicates
```

To resolve this, we expanded the probe conditions to explicitly handle
each fan board, including both 1st/2nd source.

Additionally, we use BOARD_PART_NUMBER for the DVT1 boards and a new
field (BOARD_INFO_AM4) starting from the DVT2 stage to distinguish
between different sources of the fan board.

Change-Id: I46d05f78a1de3202941418aea7be49396f686e54
Signed-off-by: Yang Chen <yang.chen@quantatw.com>
diff --git a/configurations/meta/minerva_fanboard_adc_silergy.json b/configurations/meta/minerva_fanboard_adc_silergy.json
index 20e8bb6..723a43e 100644
--- a/configurations/meta/minerva_fanboard_adc_silergy.json
+++ b/configurations/meta/minerva_fanboard_adc_silergy.json
@@ -446,23 +446,1409 @@
                 "Type": "TMP75"
             }
         ],
-        "Name": "Minerva Fan Board $bus - 15",
+        "Name": "Minerva Fan Board 1",
         "Probe": [
             "xyz.openbmc_project.FruDevice({'BOARD_PRODUCT_NAME': 'Minerva Fan Board.*', 'PRODUCT_MANUFACTURER': 'Quanta', 'BUS': 16, 'BOARD_INFO_AM4': 'pwr-silergy'})",
             "OR",
+            "xyz.openbmc_project.FruDevice({'BOARD_PRODUCT_NAME': 'Minerva Fan Board DVT', 'PRODUCT_MANUFACTURER': 'Quanta', 'BUS': 16, 'BOARD_PART_NUMBER': '3XF0MFB0030'})"
+        ],
+        "Type": "Board",
+        "xyz.openbmc_project.Inventory.Decorator.Asset": {
+            "BuildDate": "$BOARD_MANUFACTURE_DATE",
+            "Manufacturer": "$BOARD_MANUFACTURER",
+            "Model": "$BOARD_PRODUCT_NAME",
+            "PartNumber": "$BOARD_PART_NUMBER",
+            "SerialNumber": "$BOARD_SERIAL_NUMBER",
+            "SparePartNumber": "$BOARD_INFO_AM1"
+        },
+        "xyz.openbmc_project.Inventory.Decorator.AssetTag": {
+            "AssetTag": "$PRODUCT_ASSET_TAG"
+        }
+    },
+    {
+        "Exposes": [
+            {
+                "Address": "0x5e",
+                "Bus": "$bus",
+                "Connector": {
+                    "Name": "FCB_$bus - 15 FAN $bus * 4 - 64 + 1 TACH_IL",
+                    "Pwm": 2,
+                    "PwmName": "FCB_$bus - 15 FAN_PWM",
+                    "Tachs": [
+                        0
+                    ]
+                },
+                "Index": 0,
+                "Name": "FCB_$bus - 15 FAN $bus * 4 - 64 + 1 TACH_IL_SPEED_RPM",
+                "PowerState": "Always",
+                "Thresholds": [
+                    {
+                        "Direction": "greater than",
+                        "Hysteresis": 400.0,
+                        "Name": "upper critical",
+                        "Severity": 1,
+                        "Value": 20000
+                    },
+                    {
+                        "Direction": "less than",
+                        "Hysteresis": 16.0,
+                        "Name": "lower critical",
+                        "Severity": 1,
+                        "Value": 800
+                    }
+                ],
+                "Type": "I2CFan"
+            },
+            {
+                "Address": "0x5e",
+                "Bus": "$bus",
+                "Connector": {
+                    "Name": "FCB_$bus - 15 FAN $bus * 4 - 64 + 1 TACH_OL",
+                    "Pwm": 2,
+                    "PwmName": "FCB_$bus - 15 FAN_PWM",
+                    "Tachs": [
+                        1
+                    ]
+                },
+                "Index": 1,
+                "Name": "FCB_$bus - 15 FAN $bus * 4 - 64 + 1 TACH_OL_SPEED_RPM",
+                "PowerState": "Always",
+                "Thresholds": [
+                    {
+                        "Direction": "greater than",
+                        "Hysteresis": 400.0,
+                        "Name": "upper critical",
+                        "Severity": 1,
+                        "Value": 20000
+                    },
+                    {
+                        "Direction": "less than",
+                        "Hysteresis": 16.0,
+                        "Name": "lower critical",
+                        "Severity": 1,
+                        "Value": 800
+                    }
+                ],
+                "Type": "I2CFan"
+            },
+            {
+                "Address": "0x5e",
+                "Bus": "$bus",
+                "Connector": {
+                    "Name": "FCB_$bus - 15 FAN $bus * 4 - 64 + 2 TACH_IL",
+                    "Pwm": 2,
+                    "PwmName": "FCB_$bus - 15 FAN_PWM",
+                    "Tachs": [
+                        2
+                    ]
+                },
+                "Index": 2,
+                "Name": "FCB_$bus - 15 FAN $bus * 4 - 64 + 2 TACH_IL_SPEED_RPM",
+                "PowerState": "Always",
+                "Thresholds": [
+                    {
+                        "Direction": "greater than",
+                        "Hysteresis": 400.0,
+                        "Name": "upper critical",
+                        "Severity": 1,
+                        "Value": 20000
+                    },
+                    {
+                        "Direction": "less than",
+                        "Hysteresis": 16.0,
+                        "Name": "lower critical",
+                        "Severity": 1,
+                        "Value": 800
+                    }
+                ],
+                "Type": "I2CFan"
+            },
+            {
+                "Address": "0x5e",
+                "Bus": "$bus",
+                "Connector": {
+                    "Name": "FCB_$bus - 15 FAN $bus * 4 - 64 + 2 TACH_OL",
+                    "Pwm": 2,
+                    "PwmName": "FCB_$bus - 15 FAN_PWM",
+                    "Tachs": [
+                        3
+                    ]
+                },
+                "Index": 3,
+                "Name": "FCB_$bus - 15 FAN $bus * 4 - 64 + 2 TACH_OL_SPEED_RPM",
+                "PowerState": "Always",
+                "Thresholds": [
+                    {
+                        "Direction": "greater than",
+                        "Hysteresis": 400.0,
+                        "Name": "upper critical",
+                        "Severity": 1,
+                        "Value": 20000
+                    },
+                    {
+                        "Direction": "less than",
+                        "Hysteresis": 16.0,
+                        "Name": "lower critical",
+                        "Severity": 1,
+                        "Value": 800
+                    }
+                ],
+                "Type": "I2CFan"
+            },
+            {
+                "Address": "0x5e",
+                "Bus": "$bus",
+                "Connector": {
+                    "Name": "FCB_$bus - 15 FAN $bus * 4 - 64 + 3 TACH_IL",
+                    "Pwm": 2,
+                    "PwmName": "FCB_$bus - 15 FAN_PWM",
+                    "Tachs": [
+                        4
+                    ]
+                },
+                "Index": 4,
+                "Name": "FCB_$bus - 15 FAN $bus * 4 - 64 + 3 TACH_IL_SPEED_RPM",
+                "PowerState": "Always",
+                "Thresholds": [
+                    {
+                        "Direction": "greater than",
+                        "Hysteresis": 400.0,
+                        "Name": "upper critical",
+                        "Severity": 1,
+                        "Value": 20000
+                    },
+                    {
+                        "Direction": "less than",
+                        "Hysteresis": 16.0,
+                        "Name": "lower critical",
+                        "Severity": 1,
+                        "Value": 800
+                    }
+                ],
+                "Type": "I2CFan"
+            },
+            {
+                "Address": "0x5e",
+                "Bus": "$bus",
+                "Connector": {
+                    "Name": "FCB_$bus - 15 FAN $bus * 4 - 64 + 3 TACH_OL",
+                    "Pwm": 2,
+                    "PwmName": "FCB_$bus - 15 FAN_PWM",
+                    "Tachs": [
+                        5
+                    ]
+                },
+                "Index": 5,
+                "Name": "FCB_$bus - 15 FAN $bus * 4 - 64 + 3 TACH_OL_SPEED_RPM",
+                "PowerState": "Always",
+                "Thresholds": [
+                    {
+                        "Direction": "greater than",
+                        "Hysteresis": 400.0,
+                        "Name": "upper critical",
+                        "Severity": 1,
+                        "Value": 20000
+                    },
+                    {
+                        "Direction": "less than",
+                        "Hysteresis": 16.0,
+                        "Name": "lower critical",
+                        "Severity": 1,
+                        "Value": 800
+                    }
+                ],
+                "Type": "I2CFan"
+            },
+            {
+                "Address": "0x5e",
+                "Bus": "$bus",
+                "Connector": {
+                    "Name": "FCB_$bus - 15 FAN $bus * 4 - 64 + 4 TACH_IL",
+                    "Pwm": 2,
+                    "PwmName": "FCB_$bus - 15 FAN_PWM",
+                    "Tachs": [
+                        6
+                    ]
+                },
+                "Index": 6,
+                "Name": "FCB_$bus - 15 FAN $bus * 4 - 64 + 4 TACH_IL_SPEED_RPM",
+                "PowerState": "Always",
+                "Thresholds": [
+                    {
+                        "Direction": "greater than",
+                        "Hysteresis": 400.0,
+                        "Name": "upper critical",
+                        "Severity": 1,
+                        "Value": 20000
+                    },
+                    {
+                        "Direction": "less than",
+                        "Hysteresis": 16.0,
+                        "Name": "lower critical",
+                        "Severity": 1,
+                        "Value": 800
+                    }
+                ],
+                "Type": "I2CFan"
+            },
+            {
+                "Address": "0x5e",
+                "Bus": "$bus",
+                "Connector": {
+                    "Name": "FCB_$bus - 15 FAN $bus * 4 - 64 + 4 TACH_OL",
+                    "Pwm": 2,
+                    "PwmName": "FCB_$bus - 15 FAN_PWM",
+                    "Tachs": [
+                        7
+                    ]
+                },
+                "Index": 7,
+                "Name": "FCB_$bus - 15 FAN $bus * 4 - 64 + 4 TACH_OL_SPEED_RPM",
+                "PowerState": "Always",
+                "Thresholds": [
+                    {
+                        "Direction": "greater than",
+                        "Hysteresis": 400.0,
+                        "Name": "upper critical",
+                        "Severity": 1,
+                        "Value": 20000
+                    },
+                    {
+                        "Direction": "less than",
+                        "Hysteresis": 16.0,
+                        "Name": "lower critical",
+                        "Severity": 1,
+                        "Value": 800
+                    }
+                ],
+                "Type": "I2CFan"
+            },
+            {
+                "Address": "0x40",
+                "Bus": "$bus",
+                "Labels": [
+                    "in1",
+                    "curr1"
+                ],
+                "Name": "FCB_$bus - 15 FAN_$bus * 4 - 64 + 1",
+                "Thresholds": [
+                    {
+                        "Direction": "less than",
+                        "Hysteresis": 0.969,
+                        "Label": "in1",
+                        "Name": "lower critical",
+                        "Severity": 1,
+                        "Value": 48.45
+                    },
+                    {
+                        "Direction": "greater than",
+                        "Hysteresis": 1.067,
+                        "Label": "in1",
+                        "Name": "upper critical",
+                        "Severity": 1,
+                        "Value": 53.35
+                    },
+                    {
+                        "Direction": "greater than",
+                        "Hysteresis": 0.14,
+                        "Label": "curr1",
+                        "Name": "upper critical",
+                        "Severity": 1,
+                        "Value": 7.0
+                    }
+                ],
+                "Type": "INA238",
+                "curr1_Name": "FCB_$bus - 15 FAN $bus * 4 - 64 + 1 CURR_A",
+                "in1_Name": "FCB_$bus - 15 FAN $bus * 4 - 64 + 1 VOLT_V",
+                "in1_Scale": 833.3333
+            },
+            {
+                "Address": "0x41",
+                "Bus": "$bus",
+                "Labels": [
+                    "in1",
+                    "curr1"
+                ],
+                "Name": "FCB_$bus - 15 FAN_$bus * 4 - 64 + 2",
+                "Thresholds": [
+                    {
+                        "Direction": "less than",
+                        "Hysteresis": 0.969,
+                        "Label": "in1",
+                        "Name": "lower critical",
+                        "Severity": 1,
+                        "Value": 48.45
+                    },
+                    {
+                        "Direction": "greater than",
+                        "Hysteresis": 1.067,
+                        "Label": "in1",
+                        "Name": "upper critical",
+                        "Severity": 1,
+                        "Value": 53.35
+                    },
+                    {
+                        "Direction": "greater than",
+                        "Hysteresis": 0.14,
+                        "Label": "curr1",
+                        "Name": "upper critical",
+                        "Severity": 1,
+                        "Value": 7.0
+                    }
+                ],
+                "Type": "INA238",
+                "curr1_Name": "FCB_$bus - 15 FAN $bus * 4 - 64 + 2 CURR_A",
+                "in1_Name": "FCB_$bus - 15 FAN $bus * 4 - 64 + 2 VOLT_V",
+                "in1_Scale": 833.3333
+            },
+            {
+                "Address": "0x44",
+                "Bus": "$bus",
+                "Labels": [
+                    "in1",
+                    "curr1"
+                ],
+                "Name": "FCB_$bus - 15 FAN_$bus * 4 - 64 + 3",
+                "Thresholds": [
+                    {
+                        "Direction": "less than",
+                        "Hysteresis": 0.969,
+                        "Label": "in1",
+                        "Name": "lower critical",
+                        "Severity": 1,
+                        "Value": 48.45
+                    },
+                    {
+                        "Direction": "greater than",
+                        "Hysteresis": 1.067,
+                        "Label": "in1",
+                        "Name": "upper critical",
+                        "Severity": 1,
+                        "Value": 53.35
+                    },
+                    {
+                        "Direction": "greater than",
+                        "Hysteresis": 0.14,
+                        "Label": "curr1",
+                        "Name": "upper critical",
+                        "Severity": 1,
+                        "Value": 7.0
+                    }
+                ],
+                "Type": "INA238",
+                "curr1_Name": "FCB_$bus - 15 FAN $bus * 4 - 64 + 3 CURR_A",
+                "in1_Name": "FCB_$bus - 15 FAN $bus * 4 - 64 + 3 VOLT_V",
+                "in1_Scale": 833.3333
+            },
+            {
+                "Address": "0x45",
+                "Bus": "$bus",
+                "Labels": [
+                    "in1",
+                    "curr1"
+                ],
+                "Name": "FCB_$bus - 15 FAN_$bus * 4 - 64 + 4",
+                "Thresholds": [
+                    {
+                        "Direction": "less than",
+                        "Hysteresis": 0.969,
+                        "Label": "in1",
+                        "Name": "lower critical",
+                        "Severity": 1,
+                        "Value": 48.45
+                    },
+                    {
+                        "Direction": "greater than",
+                        "Hysteresis": 1.067,
+                        "Label": "in1",
+                        "Name": "upper critical",
+                        "Severity": 1,
+                        "Value": 53.35
+                    },
+                    {
+                        "Direction": "greater than",
+                        "Hysteresis": 0.14,
+                        "Label": "curr1",
+                        "Name": "upper critical",
+                        "Severity": 1,
+                        "Value": 7.0
+                    }
+                ],
+                "Type": "INA238",
+                "curr1_Name": "FCB_$bus - 15 FAN $bus * 4 - 64 + 4 CURR_A",
+                "in1_Name": "FCB_$bus - 15 FAN $bus * 4 - 64 + 4 VOLT_V",
+                "in1_Scale": 833.3333
+            },
+            {
+                "Address": "0x49",
+                "Bus": "$bus",
+                "Labels": [
+                    "temp1"
+                ],
+                "Name": "FCB_$bus - 15 T_SENSE",
+                "Type": "INA238",
+                "temp1_Name": "FCB_$bus - 15 T_SENSE_TEMP_C"
+            },
+            {
+                "Address": "0x4b",
+                "Bus": "$bus",
+                "Name": "FCB_$bus - 15 TEMP_C",
+                "Thresholds": [
+                    {
+                        "Direction": "greater than",
+                        "Hysteresis": 1.6,
+                        "Name": "upper critical",
+                        "Severity": 1,
+                        "Value": 80
+                    },
+                    {
+                        "Direction": "less than",
+                        "Hysteresis": 0.0,
+                        "Name": "lower critical",
+                        "Severity": 1,
+                        "Value": 0
+                    }
+                ],
+                "Type": "TMP75"
+            }
+        ],
+        "Name": "Minerva Fan Board 2",
+        "Probe": [
             "xyz.openbmc_project.FruDevice({'BOARD_PRODUCT_NAME': 'Minerva Fan Board.*', 'PRODUCT_MANUFACTURER': 'Quanta', 'BUS': 17, 'BOARD_INFO_AM4': 'pwr-silergy'})",
             "OR",
+            "xyz.openbmc_project.FruDevice({'BOARD_PRODUCT_NAME': 'Minerva Fan Board DVT', 'PRODUCT_MANUFACTURER': 'Quanta', 'BUS': 17, 'BOARD_PART_NUMBER': '3XF0MFB0030'})"
+        ],
+        "Type": "Board",
+        "xyz.openbmc_project.Inventory.Decorator.Asset": {
+            "BuildDate": "$BOARD_MANUFACTURE_DATE",
+            "Manufacturer": "$BOARD_MANUFACTURER",
+            "Model": "$BOARD_PRODUCT_NAME",
+            "PartNumber": "$BOARD_PART_NUMBER",
+            "SerialNumber": "$BOARD_SERIAL_NUMBER",
+            "SparePartNumber": "$BOARD_INFO_AM1"
+        },
+        "xyz.openbmc_project.Inventory.Decorator.AssetTag": {
+            "AssetTag": "$PRODUCT_ASSET_TAG"
+        }
+    },
+    {
+        "Exposes": [
+            {
+                "Address": "0x5e",
+                "Bus": "$bus",
+                "Connector": {
+                    "Name": "FCB_$bus - 15 FAN $bus * 4 - 64 + 1 TACH_IL",
+                    "Pwm": 2,
+                    "PwmName": "FCB_$bus - 15 FAN_PWM",
+                    "Tachs": [
+                        0
+                    ]
+                },
+                "Index": 0,
+                "Name": "FCB_$bus - 15 FAN $bus * 4 - 64 + 1 TACH_IL_SPEED_RPM",
+                "PowerState": "Always",
+                "Thresholds": [
+                    {
+                        "Direction": "greater than",
+                        "Hysteresis": 400.0,
+                        "Name": "upper critical",
+                        "Severity": 1,
+                        "Value": 20000
+                    },
+                    {
+                        "Direction": "less than",
+                        "Hysteresis": 16.0,
+                        "Name": "lower critical",
+                        "Severity": 1,
+                        "Value": 800
+                    }
+                ],
+                "Type": "I2CFan"
+            },
+            {
+                "Address": "0x5e",
+                "Bus": "$bus",
+                "Connector": {
+                    "Name": "FCB_$bus - 15 FAN $bus * 4 - 64 + 1 TACH_OL",
+                    "Pwm": 2,
+                    "PwmName": "FCB_$bus - 15 FAN_PWM",
+                    "Tachs": [
+                        1
+                    ]
+                },
+                "Index": 1,
+                "Name": "FCB_$bus - 15 FAN $bus * 4 - 64 + 1 TACH_OL_SPEED_RPM",
+                "PowerState": "Always",
+                "Thresholds": [
+                    {
+                        "Direction": "greater than",
+                        "Hysteresis": 400.0,
+                        "Name": "upper critical",
+                        "Severity": 1,
+                        "Value": 20000
+                    },
+                    {
+                        "Direction": "less than",
+                        "Hysteresis": 16.0,
+                        "Name": "lower critical",
+                        "Severity": 1,
+                        "Value": 800
+                    }
+                ],
+                "Type": "I2CFan"
+            },
+            {
+                "Address": "0x5e",
+                "Bus": "$bus",
+                "Connector": {
+                    "Name": "FCB_$bus - 15 FAN $bus * 4 - 64 + 2 TACH_IL",
+                    "Pwm": 2,
+                    "PwmName": "FCB_$bus - 15 FAN_PWM",
+                    "Tachs": [
+                        2
+                    ]
+                },
+                "Index": 2,
+                "Name": "FCB_$bus - 15 FAN $bus * 4 - 64 + 2 TACH_IL_SPEED_RPM",
+                "PowerState": "Always",
+                "Thresholds": [
+                    {
+                        "Direction": "greater than",
+                        "Hysteresis": 400.0,
+                        "Name": "upper critical",
+                        "Severity": 1,
+                        "Value": 20000
+                    },
+                    {
+                        "Direction": "less than",
+                        "Hysteresis": 16.0,
+                        "Name": "lower critical",
+                        "Severity": 1,
+                        "Value": 800
+                    }
+                ],
+                "Type": "I2CFan"
+            },
+            {
+                "Address": "0x5e",
+                "Bus": "$bus",
+                "Connector": {
+                    "Name": "FCB_$bus - 15 FAN $bus * 4 - 64 + 2 TACH_OL",
+                    "Pwm": 2,
+                    "PwmName": "FCB_$bus - 15 FAN_PWM",
+                    "Tachs": [
+                        3
+                    ]
+                },
+                "Index": 3,
+                "Name": "FCB_$bus - 15 FAN $bus * 4 - 64 + 2 TACH_OL_SPEED_RPM",
+                "PowerState": "Always",
+                "Thresholds": [
+                    {
+                        "Direction": "greater than",
+                        "Hysteresis": 400.0,
+                        "Name": "upper critical",
+                        "Severity": 1,
+                        "Value": 20000
+                    },
+                    {
+                        "Direction": "less than",
+                        "Hysteresis": 16.0,
+                        "Name": "lower critical",
+                        "Severity": 1,
+                        "Value": 800
+                    }
+                ],
+                "Type": "I2CFan"
+            },
+            {
+                "Address": "0x5e",
+                "Bus": "$bus",
+                "Connector": {
+                    "Name": "FCB_$bus - 15 FAN $bus * 4 - 64 + 3 TACH_IL",
+                    "Pwm": 2,
+                    "PwmName": "FCB_$bus - 15 FAN_PWM",
+                    "Tachs": [
+                        4
+                    ]
+                },
+                "Index": 4,
+                "Name": "FCB_$bus - 15 FAN $bus * 4 - 64 + 3 TACH_IL_SPEED_RPM",
+                "PowerState": "Always",
+                "Thresholds": [
+                    {
+                        "Direction": "greater than",
+                        "Hysteresis": 400.0,
+                        "Name": "upper critical",
+                        "Severity": 1,
+                        "Value": 20000
+                    },
+                    {
+                        "Direction": "less than",
+                        "Hysteresis": 16.0,
+                        "Name": "lower critical",
+                        "Severity": 1,
+                        "Value": 800
+                    }
+                ],
+                "Type": "I2CFan"
+            },
+            {
+                "Address": "0x5e",
+                "Bus": "$bus",
+                "Connector": {
+                    "Name": "FCB_$bus - 15 FAN $bus * 4 - 64 + 3 TACH_OL",
+                    "Pwm": 2,
+                    "PwmName": "FCB_$bus - 15 FAN_PWM",
+                    "Tachs": [
+                        5
+                    ]
+                },
+                "Index": 5,
+                "Name": "FCB_$bus - 15 FAN $bus * 4 - 64 + 3 TACH_OL_SPEED_RPM",
+                "PowerState": "Always",
+                "Thresholds": [
+                    {
+                        "Direction": "greater than",
+                        "Hysteresis": 400.0,
+                        "Name": "upper critical",
+                        "Severity": 1,
+                        "Value": 20000
+                    },
+                    {
+                        "Direction": "less than",
+                        "Hysteresis": 16.0,
+                        "Name": "lower critical",
+                        "Severity": 1,
+                        "Value": 800
+                    }
+                ],
+                "Type": "I2CFan"
+            },
+            {
+                "Address": "0x5e",
+                "Bus": "$bus",
+                "Connector": {
+                    "Name": "FCB_$bus - 15 FAN $bus * 4 - 64 + 4 TACH_IL",
+                    "Pwm": 2,
+                    "PwmName": "FCB_$bus - 15 FAN_PWM",
+                    "Tachs": [
+                        6
+                    ]
+                },
+                "Index": 6,
+                "Name": "FCB_$bus - 15 FAN $bus * 4 - 64 + 4 TACH_IL_SPEED_RPM",
+                "PowerState": "Always",
+                "Thresholds": [
+                    {
+                        "Direction": "greater than",
+                        "Hysteresis": 400.0,
+                        "Name": "upper critical",
+                        "Severity": 1,
+                        "Value": 20000
+                    },
+                    {
+                        "Direction": "less than",
+                        "Hysteresis": 16.0,
+                        "Name": "lower critical",
+                        "Severity": 1,
+                        "Value": 800
+                    }
+                ],
+                "Type": "I2CFan"
+            },
+            {
+                "Address": "0x5e",
+                "Bus": "$bus",
+                "Connector": {
+                    "Name": "FCB_$bus - 15 FAN $bus * 4 - 64 + 4 TACH_OL",
+                    "Pwm": 2,
+                    "PwmName": "FCB_$bus - 15 FAN_PWM",
+                    "Tachs": [
+                        7
+                    ]
+                },
+                "Index": 7,
+                "Name": "FCB_$bus - 15 FAN $bus * 4 - 64 + 4 TACH_OL_SPEED_RPM",
+                "PowerState": "Always",
+                "Thresholds": [
+                    {
+                        "Direction": "greater than",
+                        "Hysteresis": 400.0,
+                        "Name": "upper critical",
+                        "Severity": 1,
+                        "Value": 20000
+                    },
+                    {
+                        "Direction": "less than",
+                        "Hysteresis": 16.0,
+                        "Name": "lower critical",
+                        "Severity": 1,
+                        "Value": 800
+                    }
+                ],
+                "Type": "I2CFan"
+            },
+            {
+                "Address": "0x40",
+                "Bus": "$bus",
+                "Labels": [
+                    "in1",
+                    "curr1"
+                ],
+                "Name": "FCB_$bus - 15 FAN_$bus * 4 - 64 + 1",
+                "Thresholds": [
+                    {
+                        "Direction": "less than",
+                        "Hysteresis": 0.969,
+                        "Label": "in1",
+                        "Name": "lower critical",
+                        "Severity": 1,
+                        "Value": 48.45
+                    },
+                    {
+                        "Direction": "greater than",
+                        "Hysteresis": 1.067,
+                        "Label": "in1",
+                        "Name": "upper critical",
+                        "Severity": 1,
+                        "Value": 53.35
+                    },
+                    {
+                        "Direction": "greater than",
+                        "Hysteresis": 0.14,
+                        "Label": "curr1",
+                        "Name": "upper critical",
+                        "Severity": 1,
+                        "Value": 7.0
+                    }
+                ],
+                "Type": "INA238",
+                "curr1_Name": "FCB_$bus - 15 FAN $bus * 4 - 64 + 1 CURR_A",
+                "in1_Name": "FCB_$bus - 15 FAN $bus * 4 - 64 + 1 VOLT_V",
+                "in1_Scale": 833.3333
+            },
+            {
+                "Address": "0x41",
+                "Bus": "$bus",
+                "Labels": [
+                    "in1",
+                    "curr1"
+                ],
+                "Name": "FCB_$bus - 15 FAN_$bus * 4 - 64 + 2",
+                "Thresholds": [
+                    {
+                        "Direction": "less than",
+                        "Hysteresis": 0.969,
+                        "Label": "in1",
+                        "Name": "lower critical",
+                        "Severity": 1,
+                        "Value": 48.45
+                    },
+                    {
+                        "Direction": "greater than",
+                        "Hysteresis": 1.067,
+                        "Label": "in1",
+                        "Name": "upper critical",
+                        "Severity": 1,
+                        "Value": 53.35
+                    },
+                    {
+                        "Direction": "greater than",
+                        "Hysteresis": 0.14,
+                        "Label": "curr1",
+                        "Name": "upper critical",
+                        "Severity": 1,
+                        "Value": 7.0
+                    }
+                ],
+                "Type": "INA238",
+                "curr1_Name": "FCB_$bus - 15 FAN $bus * 4 - 64 + 2 CURR_A",
+                "in1_Name": "FCB_$bus - 15 FAN $bus * 4 - 64 + 2 VOLT_V",
+                "in1_Scale": 833.3333
+            },
+            {
+                "Address": "0x44",
+                "Bus": "$bus",
+                "Labels": [
+                    "in1",
+                    "curr1"
+                ],
+                "Name": "FCB_$bus - 15 FAN_$bus * 4 - 64 + 3",
+                "Thresholds": [
+                    {
+                        "Direction": "less than",
+                        "Hysteresis": 0.969,
+                        "Label": "in1",
+                        "Name": "lower critical",
+                        "Severity": 1,
+                        "Value": 48.45
+                    },
+                    {
+                        "Direction": "greater than",
+                        "Hysteresis": 1.067,
+                        "Label": "in1",
+                        "Name": "upper critical",
+                        "Severity": 1,
+                        "Value": 53.35
+                    },
+                    {
+                        "Direction": "greater than",
+                        "Hysteresis": 0.14,
+                        "Label": "curr1",
+                        "Name": "upper critical",
+                        "Severity": 1,
+                        "Value": 7.0
+                    }
+                ],
+                "Type": "INA238",
+                "curr1_Name": "FCB_$bus - 15 FAN $bus * 4 - 64 + 3 CURR_A",
+                "in1_Name": "FCB_$bus - 15 FAN $bus * 4 - 64 + 3 VOLT_V",
+                "in1_Scale": 833.3333
+            },
+            {
+                "Address": "0x45",
+                "Bus": "$bus",
+                "Labels": [
+                    "in1",
+                    "curr1"
+                ],
+                "Name": "FCB_$bus - 15 FAN_$bus * 4 - 64 + 4",
+                "Thresholds": [
+                    {
+                        "Direction": "less than",
+                        "Hysteresis": 0.969,
+                        "Label": "in1",
+                        "Name": "lower critical",
+                        "Severity": 1,
+                        "Value": 48.45
+                    },
+                    {
+                        "Direction": "greater than",
+                        "Hysteresis": 1.067,
+                        "Label": "in1",
+                        "Name": "upper critical",
+                        "Severity": 1,
+                        "Value": 53.35
+                    },
+                    {
+                        "Direction": "greater than",
+                        "Hysteresis": 0.14,
+                        "Label": "curr1",
+                        "Name": "upper critical",
+                        "Severity": 1,
+                        "Value": 7.0
+                    }
+                ],
+                "Type": "INA238",
+                "curr1_Name": "FCB_$bus - 15 FAN $bus * 4 - 64 + 4 CURR_A",
+                "in1_Name": "FCB_$bus - 15 FAN $bus * 4 - 64 + 4 VOLT_V",
+                "in1_Scale": 833.3333
+            },
+            {
+                "Address": "0x49",
+                "Bus": "$bus",
+                "Labels": [
+                    "temp1"
+                ],
+                "Name": "FCB_$bus - 15 T_SENSE",
+                "Type": "INA238",
+                "temp1_Name": "FCB_$bus - 15 T_SENSE_TEMP_C"
+            },
+            {
+                "Address": "0x4b",
+                "Bus": "$bus",
+                "Name": "FCB_$bus - 15 TEMP_C",
+                "Thresholds": [
+                    {
+                        "Direction": "greater than",
+                        "Hysteresis": 1.6,
+                        "Name": "upper critical",
+                        "Severity": 1,
+                        "Value": 80
+                    },
+                    {
+                        "Direction": "less than",
+                        "Hysteresis": 0.0,
+                        "Name": "lower critical",
+                        "Severity": 1,
+                        "Value": 0
+                    }
+                ],
+                "Type": "TMP75"
+            }
+        ],
+        "Name": "Minerva Fan Board 3",
+        "Probe": [
             "xyz.openbmc_project.FruDevice({'BOARD_PRODUCT_NAME': 'Minerva Fan Board.*', 'PRODUCT_MANUFACTURER': 'Quanta', 'BUS': 18, 'BOARD_INFO_AM4': 'pwr-silergy'})",
             "OR",
+            "xyz.openbmc_project.FruDevice({'BOARD_PRODUCT_NAME': 'Minerva Fan Board DVT', 'PRODUCT_MANUFACTURER': 'Quanta', 'BUS': 18, 'BOARD_PART_NUMBER': '3XF0MFB0030'})"
+        ],
+        "Type": "Board",
+        "xyz.openbmc_project.Inventory.Decorator.Asset": {
+            "BuildDate": "$BOARD_MANUFACTURE_DATE",
+            "Manufacturer": "$BOARD_MANUFACTURER",
+            "Model": "$BOARD_PRODUCT_NAME",
+            "PartNumber": "$BOARD_PART_NUMBER",
+            "SerialNumber": "$BOARD_SERIAL_NUMBER",
+            "SparePartNumber": "$BOARD_INFO_AM1"
+        },
+        "xyz.openbmc_project.Inventory.Decorator.AssetTag": {
+            "AssetTag": "$PRODUCT_ASSET_TAG"
+        }
+    },
+    {
+        "Exposes": [
+            {
+                "Address": "0x5e",
+                "Bus": "$bus",
+                "Connector": {
+                    "Name": "FCB_$bus - 15 FAN $bus * 4 - 64 + 1 TACH_IL",
+                    "Pwm": 2,
+                    "PwmName": "FCB_$bus - 15 FAN_PWM",
+                    "Tachs": [
+                        0
+                    ]
+                },
+                "Index": 0,
+                "Name": "FCB_$bus - 15 FAN $bus * 4 - 64 + 1 TACH_IL_SPEED_RPM",
+                "PowerState": "Always",
+                "Thresholds": [
+                    {
+                        "Direction": "greater than",
+                        "Hysteresis": 400.0,
+                        "Name": "upper critical",
+                        "Severity": 1,
+                        "Value": 20000
+                    },
+                    {
+                        "Direction": "less than",
+                        "Hysteresis": 16.0,
+                        "Name": "lower critical",
+                        "Severity": 1,
+                        "Value": 800
+                    }
+                ],
+                "Type": "I2CFan"
+            },
+            {
+                "Address": "0x5e",
+                "Bus": "$bus",
+                "Connector": {
+                    "Name": "FCB_$bus - 15 FAN $bus * 4 - 64 + 1 TACH_OL",
+                    "Pwm": 2,
+                    "PwmName": "FCB_$bus - 15 FAN_PWM",
+                    "Tachs": [
+                        1
+                    ]
+                },
+                "Index": 1,
+                "Name": "FCB_$bus - 15 FAN $bus * 4 - 64 + 1 TACH_OL_SPEED_RPM",
+                "PowerState": "Always",
+                "Thresholds": [
+                    {
+                        "Direction": "greater than",
+                        "Hysteresis": 400.0,
+                        "Name": "upper critical",
+                        "Severity": 1,
+                        "Value": 20000
+                    },
+                    {
+                        "Direction": "less than",
+                        "Hysteresis": 16.0,
+                        "Name": "lower critical",
+                        "Severity": 1,
+                        "Value": 800
+                    }
+                ],
+                "Type": "I2CFan"
+            },
+            {
+                "Address": "0x5e",
+                "Bus": "$bus",
+                "Connector": {
+                    "Name": "FCB_$bus - 15 FAN $bus * 4 - 64 + 2 TACH_IL",
+                    "Pwm": 2,
+                    "PwmName": "FCB_$bus - 15 FAN_PWM",
+                    "Tachs": [
+                        2
+                    ]
+                },
+                "Index": 2,
+                "Name": "FCB_$bus - 15 FAN $bus * 4 - 64 + 2 TACH_IL_SPEED_RPM",
+                "PowerState": "Always",
+                "Thresholds": [
+                    {
+                        "Direction": "greater than",
+                        "Hysteresis": 400.0,
+                        "Name": "upper critical",
+                        "Severity": 1,
+                        "Value": 20000
+                    },
+                    {
+                        "Direction": "less than",
+                        "Hysteresis": 16.0,
+                        "Name": "lower critical",
+                        "Severity": 1,
+                        "Value": 800
+                    }
+                ],
+                "Type": "I2CFan"
+            },
+            {
+                "Address": "0x5e",
+                "Bus": "$bus",
+                "Connector": {
+                    "Name": "FCB_$bus - 15 FAN $bus * 4 - 64 + 2 TACH_OL",
+                    "Pwm": 2,
+                    "PwmName": "FCB_$bus - 15 FAN_PWM",
+                    "Tachs": [
+                        3
+                    ]
+                },
+                "Index": 3,
+                "Name": "FCB_$bus - 15 FAN $bus * 4 - 64 + 2 TACH_OL_SPEED_RPM",
+                "PowerState": "Always",
+                "Thresholds": [
+                    {
+                        "Direction": "greater than",
+                        "Hysteresis": 400.0,
+                        "Name": "upper critical",
+                        "Severity": 1,
+                        "Value": 20000
+                    },
+                    {
+                        "Direction": "less than",
+                        "Hysteresis": 16.0,
+                        "Name": "lower critical",
+                        "Severity": 1,
+                        "Value": 800
+                    }
+                ],
+                "Type": "I2CFan"
+            },
+            {
+                "Address": "0x5e",
+                "Bus": "$bus",
+                "Connector": {
+                    "Name": "FCB_$bus - 15 FAN $bus * 4 - 64 + 3 TACH_IL",
+                    "Pwm": 2,
+                    "PwmName": "FCB_$bus - 15 FAN_PWM",
+                    "Tachs": [
+                        4
+                    ]
+                },
+                "Index": 4,
+                "Name": "FCB_$bus - 15 FAN $bus * 4 - 64 + 3 TACH_IL_SPEED_RPM",
+                "PowerState": "Always",
+                "Thresholds": [
+                    {
+                        "Direction": "greater than",
+                        "Hysteresis": 400.0,
+                        "Name": "upper critical",
+                        "Severity": 1,
+                        "Value": 20000
+                    },
+                    {
+                        "Direction": "less than",
+                        "Hysteresis": 16.0,
+                        "Name": "lower critical",
+                        "Severity": 1,
+                        "Value": 800
+                    }
+                ],
+                "Type": "I2CFan"
+            },
+            {
+                "Address": "0x5e",
+                "Bus": "$bus",
+                "Connector": {
+                    "Name": "FCB_$bus - 15 FAN $bus * 4 - 64 + 3 TACH_OL",
+                    "Pwm": 2,
+                    "PwmName": "FCB_$bus - 15 FAN_PWM",
+                    "Tachs": [
+                        5
+                    ]
+                },
+                "Index": 5,
+                "Name": "FCB_$bus - 15 FAN $bus * 4 - 64 + 3 TACH_OL_SPEED_RPM",
+                "PowerState": "Always",
+                "Thresholds": [
+                    {
+                        "Direction": "greater than",
+                        "Hysteresis": 400.0,
+                        "Name": "upper critical",
+                        "Severity": 1,
+                        "Value": 20000
+                    },
+                    {
+                        "Direction": "less than",
+                        "Hysteresis": 16.0,
+                        "Name": "lower critical",
+                        "Severity": 1,
+                        "Value": 800
+                    }
+                ],
+                "Type": "I2CFan"
+            },
+            {
+                "Address": "0x5e",
+                "Bus": "$bus",
+                "Connector": {
+                    "Name": "FCB_$bus - 15 FAN $bus * 4 - 64 + 4 TACH_IL",
+                    "Pwm": 2,
+                    "PwmName": "FCB_$bus - 15 FAN_PWM",
+                    "Tachs": [
+                        6
+                    ]
+                },
+                "Index": 6,
+                "Name": "FCB_$bus - 15 FAN $bus * 4 - 64 + 4 TACH_IL_SPEED_RPM",
+                "PowerState": "Always",
+                "Thresholds": [
+                    {
+                        "Direction": "greater than",
+                        "Hysteresis": 400.0,
+                        "Name": "upper critical",
+                        "Severity": 1,
+                        "Value": 20000
+                    },
+                    {
+                        "Direction": "less than",
+                        "Hysteresis": 16.0,
+                        "Name": "lower critical",
+                        "Severity": 1,
+                        "Value": 800
+                    }
+                ],
+                "Type": "I2CFan"
+            },
+            {
+                "Address": "0x5e",
+                "Bus": "$bus",
+                "Connector": {
+                    "Name": "FCB_$bus - 15 FAN $bus * 4 - 64 + 4 TACH_OL",
+                    "Pwm": 2,
+                    "PwmName": "FCB_$bus - 15 FAN_PWM",
+                    "Tachs": [
+                        7
+                    ]
+                },
+                "Index": 7,
+                "Name": "FCB_$bus - 15 FAN $bus * 4 - 64 + 4 TACH_OL_SPEED_RPM",
+                "PowerState": "Always",
+                "Thresholds": [
+                    {
+                        "Direction": "greater than",
+                        "Hysteresis": 400.0,
+                        "Name": "upper critical",
+                        "Severity": 1,
+                        "Value": 20000
+                    },
+                    {
+                        "Direction": "less than",
+                        "Hysteresis": 16.0,
+                        "Name": "lower critical",
+                        "Severity": 1,
+                        "Value": 800
+                    }
+                ],
+                "Type": "I2CFan"
+            },
+            {
+                "Address": "0x40",
+                "Bus": "$bus",
+                "Labels": [
+                    "in1",
+                    "curr1"
+                ],
+                "Name": "FCB_$bus - 15 FAN_$bus * 4 - 64 + 1",
+                "Thresholds": [
+                    {
+                        "Direction": "less than",
+                        "Hysteresis": 0.969,
+                        "Label": "in1",
+                        "Name": "lower critical",
+                        "Severity": 1,
+                        "Value": 48.45
+                    },
+                    {
+                        "Direction": "greater than",
+                        "Hysteresis": 1.067,
+                        "Label": "in1",
+                        "Name": "upper critical",
+                        "Severity": 1,
+                        "Value": 53.35
+                    },
+                    {
+                        "Direction": "greater than",
+                        "Hysteresis": 0.14,
+                        "Label": "curr1",
+                        "Name": "upper critical",
+                        "Severity": 1,
+                        "Value": 7.0
+                    }
+                ],
+                "Type": "INA238",
+                "curr1_Name": "FCB_$bus - 15 FAN $bus * 4 - 64 + 1 CURR_A",
+                "in1_Name": "FCB_$bus - 15 FAN $bus * 4 - 64 + 1 VOLT_V",
+                "in1_Scale": 833.3333
+            },
+            {
+                "Address": "0x41",
+                "Bus": "$bus",
+                "Labels": [
+                    "in1",
+                    "curr1"
+                ],
+                "Name": "FCB_$bus - 15 FAN_$bus * 4 - 64 + 2",
+                "Thresholds": [
+                    {
+                        "Direction": "less than",
+                        "Hysteresis": 0.969,
+                        "Label": "in1",
+                        "Name": "lower critical",
+                        "Severity": 1,
+                        "Value": 48.45
+                    },
+                    {
+                        "Direction": "greater than",
+                        "Hysteresis": 1.067,
+                        "Label": "in1",
+                        "Name": "upper critical",
+                        "Severity": 1,
+                        "Value": 53.35
+                    },
+                    {
+                        "Direction": "greater than",
+                        "Hysteresis": 0.14,
+                        "Label": "curr1",
+                        "Name": "upper critical",
+                        "Severity": 1,
+                        "Value": 7.0
+                    }
+                ],
+                "Type": "INA238",
+                "curr1_Name": "FCB_$bus - 15 FAN $bus * 4 - 64 + 2 CURR_A",
+                "in1_Name": "FCB_$bus - 15 FAN $bus * 4 - 64 + 2 VOLT_V",
+                "in1_Scale": 833.3333
+            },
+            {
+                "Address": "0x44",
+                "Bus": "$bus",
+                "Labels": [
+                    "in1",
+                    "curr1"
+                ],
+                "Name": "FCB_$bus - 15 FAN_$bus * 4 - 64 + 3",
+                "Thresholds": [
+                    {
+                        "Direction": "less than",
+                        "Hysteresis": 0.969,
+                        "Label": "in1",
+                        "Name": "lower critical",
+                        "Severity": 1,
+                        "Value": 48.45
+                    },
+                    {
+                        "Direction": "greater than",
+                        "Hysteresis": 1.067,
+                        "Label": "in1",
+                        "Name": "upper critical",
+                        "Severity": 1,
+                        "Value": 53.35
+                    },
+                    {
+                        "Direction": "greater than",
+                        "Hysteresis": 0.14,
+                        "Label": "curr1",
+                        "Name": "upper critical",
+                        "Severity": 1,
+                        "Value": 7.0
+                    }
+                ],
+                "Type": "INA238",
+                "curr1_Name": "FCB_$bus - 15 FAN $bus * 4 - 64 + 3 CURR_A",
+                "in1_Name": "FCB_$bus - 15 FAN $bus * 4 - 64 + 3 VOLT_V",
+                "in1_Scale": 833.3333
+            },
+            {
+                "Address": "0x45",
+                "Bus": "$bus",
+                "Labels": [
+                    "in1",
+                    "curr1"
+                ],
+                "Name": "FCB_$bus - 15 FAN_$bus * 4 - 64 + 4",
+                "Thresholds": [
+                    {
+                        "Direction": "less than",
+                        "Hysteresis": 0.969,
+                        "Label": "in1",
+                        "Name": "lower critical",
+                        "Severity": 1,
+                        "Value": 48.45
+                    },
+                    {
+                        "Direction": "greater than",
+                        "Hysteresis": 1.067,
+                        "Label": "in1",
+                        "Name": "upper critical",
+                        "Severity": 1,
+                        "Value": 53.35
+                    },
+                    {
+                        "Direction": "greater than",
+                        "Hysteresis": 0.14,
+                        "Label": "curr1",
+                        "Name": "upper critical",
+                        "Severity": 1,
+                        "Value": 7.0
+                    }
+                ],
+                "Type": "INA238",
+                "curr1_Name": "FCB_$bus - 15 FAN $bus * 4 - 64 + 4 CURR_A",
+                "in1_Name": "FCB_$bus - 15 FAN $bus * 4 - 64 + 4 VOLT_V",
+                "in1_Scale": 833.3333
+            },
+            {
+                "Address": "0x49",
+                "Bus": "$bus",
+                "Labels": [
+                    "temp1"
+                ],
+                "Name": "FCB_$bus - 15 T_SENSE",
+                "Type": "INA238",
+                "temp1_Name": "FCB_$bus - 15 T_SENSE_TEMP_C"
+            },
+            {
+                "Address": "0x4b",
+                "Bus": "$bus",
+                "Name": "FCB_$bus - 15 TEMP_C",
+                "Thresholds": [
+                    {
+                        "Direction": "greater than",
+                        "Hysteresis": 1.6,
+                        "Name": "upper critical",
+                        "Severity": 1,
+                        "Value": 80
+                    },
+                    {
+                        "Direction": "less than",
+                        "Hysteresis": 0.0,
+                        "Name": "lower critical",
+                        "Severity": 1,
+                        "Value": 0
+                    }
+                ],
+                "Type": "TMP75"
+            }
+        ],
+        "Name": "Minerva Fan Board 4",
+        "Probe": [
             "xyz.openbmc_project.FruDevice({'BOARD_PRODUCT_NAME': 'Minerva Fan Board.*', 'PRODUCT_MANUFACTURER': 'Quanta', 'BUS': 19, 'BOARD_INFO_AM4': 'pwr-silergy'})",
             "OR",
-            "xyz.openbmc_project.FruDevice({'BOARD_PRODUCT_NAME': 'Minerva Fan Board.*', 'PRODUCT_MANUFACTURER': 'Quanta', 'BUS': 16, 'BOARD_PART_NUMBER': '3XF0MFB0030'})",
-            "OR",
-            "xyz.openbmc_project.FruDevice({'BOARD_PRODUCT_NAME': 'Minerva Fan Board.*', 'PRODUCT_MANUFACTURER': 'Quanta', 'BUS': 17, 'BOARD_PART_NUMBER': '3XF0MFB0030'})",
-            "OR",
-            "xyz.openbmc_project.FruDevice({'BOARD_PRODUCT_NAME': 'Minerva Fan Board.*', 'PRODUCT_MANUFACTURER': 'Quanta', 'BUS': 18, 'BOARD_PART_NUMBER': '3XF0MFB0030'})",
-            "OR",
-            "xyz.openbmc_project.FruDevice({'BOARD_PRODUCT_NAME': 'Minerva Fan Board.*', 'PRODUCT_MANUFACTURER': 'Quanta', 'BUS': 19, 'BOARD_PART_NUMBER': '3XF0MFB0030'})"
+            "xyz.openbmc_project.FruDevice({'BOARD_PRODUCT_NAME': 'Minerva Fan Board DVT', 'PRODUCT_MANUFACTURER': 'Quanta', 'BUS': 19, 'BOARD_PART_NUMBER': '3XF0MFB0030'})"
         ],
         "Type": "Board",
         "xyz.openbmc_project.Inventory.Decorator.Asset": {
@@ -924,15 +2310,477 @@
                 "Type": "TMP75"
             }
         ],
-        "Name": "Minerva Fan Board $bus - 15",
+        "Name": "Minerva Fan Board 5",
         "Probe": [
             "xyz.openbmc_project.FruDevice({'BOARD_PRODUCT_NAME': 'Minerva Fan Board.*', 'PRODUCT_MANUFACTURER': 'Quanta', 'BUS': 20, 'BOARD_INFO_AM4': 'pwr-silergy'})",
             "OR",
+            "xyz.openbmc_project.FruDevice({'BOARD_PRODUCT_NAME': 'Minerva Fan Board DVT', 'PRODUCT_MANUFACTURER': 'Quanta', 'BUS': 20, 'BOARD_PART_NUMBER': '3XF0MFB0030'})"
+        ],
+        "Type": "Board",
+        "xyz.openbmc_project.Inventory.Decorator.Asset": {
+            "BuildDate": "$BOARD_MANUFACTURE_DATE",
+            "Manufacturer": "$BOARD_MANUFACTURER",
+            "Model": "$BOARD_PRODUCT_NAME",
+            "PartNumber": "$BOARD_PART_NUMBER",
+            "SerialNumber": "$BOARD_SERIAL_NUMBER",
+            "SparePartNumber": "$BOARD_INFO_AM1"
+        },
+        "xyz.openbmc_project.Inventory.Decorator.AssetTag": {
+            "AssetTag": "$PRODUCT_ASSET_TAG"
+        }
+    },
+    {
+        "Exposes": [
+            {
+                "Address": "0x5e",
+                "Bus": "$bus",
+                "Connector": {
+                    "Name": "FCB_$bus - 15 FAN $bus * 4 - 64 + 1 TACH_IL",
+                    "Pwm": 2,
+                    "PwmName": "FCB_$bus - 15 FAN_PWM",
+                    "Tachs": [
+                        6
+                    ]
+                },
+                "Index": 6,
+                "Name": "FCB_$bus - 15 FAN $bus * 4 - 64 + 1 TACH_IL_SPEED_RPM",
+                "PowerState": "Always",
+                "Thresholds": [
+                    {
+                        "Direction": "greater than",
+                        "Hysteresis": 400.0,
+                        "Name": "upper critical",
+                        "Severity": 1,
+                        "Value": 20000
+                    },
+                    {
+                        "Direction": "less than",
+                        "Hysteresis": 16.0,
+                        "Name": "lower critical",
+                        "Severity": 1,
+                        "Value": 800
+                    }
+                ],
+                "Type": "I2CFan"
+            },
+            {
+                "Address": "0x5e",
+                "Bus": "$bus",
+                "Connector": {
+                    "Name": "FCB_$bus - 15 FAN $bus * 4 - 64 + 1 TACH_OL",
+                    "Pwm": 2,
+                    "PwmName": "FCB_$bus - 15 FAN_PWM",
+                    "Tachs": [
+                        7
+                    ]
+                },
+                "Index": 7,
+                "Name": "FCB_$bus - 15 FAN $bus * 4 - 64 + 1 TACH_OL_SPEED_RPM",
+                "PowerState": "Always",
+                "Thresholds": [
+                    {
+                        "Direction": "greater than",
+                        "Hysteresis": 400.0,
+                        "Name": "upper critical",
+                        "Severity": 1,
+                        "Value": 20000
+                    },
+                    {
+                        "Direction": "less than",
+                        "Hysteresis": 16.0,
+                        "Name": "lower critical",
+                        "Severity": 1,
+                        "Value": 800
+                    }
+                ],
+                "Type": "I2CFan"
+            },
+            {
+                "Address": "0x5e",
+                "Bus": "$bus",
+                "Connector": {
+                    "Name": "FCB_$bus - 15 FAN $bus * 4 - 64 + 2 TACH_IL",
+                    "Pwm": 2,
+                    "PwmName": "FCB_$bus - 15 FAN_PWM",
+                    "Tachs": [
+                        4
+                    ]
+                },
+                "Index": 4,
+                "Name": "FCB_$bus - 15 FAN $bus * 4 - 64 + 2 TACH_IL_SPEED_RPM",
+                "PowerState": "Always",
+                "Thresholds": [
+                    {
+                        "Direction": "greater than",
+                        "Hysteresis": 400.0,
+                        "Name": "upper critical",
+                        "Severity": 1,
+                        "Value": 20000
+                    },
+                    {
+                        "Direction": "less than",
+                        "Hysteresis": 16.0,
+                        "Name": "lower critical",
+                        "Severity": 1,
+                        "Value": 800
+                    }
+                ],
+                "Type": "I2CFan"
+            },
+            {
+                "Address": "0x5e",
+                "Bus": "$bus",
+                "Connector": {
+                    "Name": "FCB_$bus - 15 FAN $bus * 4 - 64 + 2 TACH_OL",
+                    "Pwm": 2,
+                    "PwmName": "FCB_$bus - 15 FAN_PWM",
+                    "Tachs": [
+                        5
+                    ]
+                },
+                "Index": 5,
+                "Name": "FCB_$bus - 15 FAN $bus * 4 - 64 + 2 TACH_OL_SPEED_RPM",
+                "PowerState": "Always",
+                "Thresholds": [
+                    {
+                        "Direction": "greater than",
+                        "Hysteresis": 400.0,
+                        "Name": "upper critical",
+                        "Severity": 1,
+                        "Value": 20000
+                    },
+                    {
+                        "Direction": "less than",
+                        "Hysteresis": 16.0,
+                        "Name": "lower critical",
+                        "Severity": 1,
+                        "Value": 800
+                    }
+                ],
+                "Type": "I2CFan"
+            },
+            {
+                "Address": "0x5e",
+                "Bus": "$bus",
+                "Connector": {
+                    "Name": "FCB_$bus - 15 FAN $bus * 4 - 64 + 3 TACH_IL",
+                    "Pwm": 2,
+                    "PwmName": "FCB_$bus - 15 FAN_PWM",
+                    "Tachs": [
+                        2
+                    ]
+                },
+                "Index": 2,
+                "Name": "FCB_$bus - 15 FAN $bus * 4 - 64 + 3 TACH_IL_SPEED_RPM",
+                "PowerState": "Always",
+                "Thresholds": [
+                    {
+                        "Direction": "greater than",
+                        "Hysteresis": 400.0,
+                        "Name": "upper critical",
+                        "Severity": 1,
+                        "Value": 20000
+                    },
+                    {
+                        "Direction": "less than",
+                        "Hysteresis": 16.0,
+                        "Name": "lower critical",
+                        "Severity": 1,
+                        "Value": 800
+                    }
+                ],
+                "Type": "I2CFan"
+            },
+            {
+                "Address": "0x5e",
+                "Bus": "$bus",
+                "Connector": {
+                    "Name": "FCB_$bus - 15 FAN $bus * 4 - 64 + 3 TACH_OL",
+                    "Pwm": 2,
+                    "PwmName": "FCB_$bus - 15 FAN_PWM",
+                    "Tachs": [
+                        3
+                    ]
+                },
+                "Index": 3,
+                "Name": "FCB_$bus - 15 FAN $bus * 4 - 64 + 3 TACH_OL_SPEED_RPM",
+                "PowerState": "Always",
+                "Thresholds": [
+                    {
+                        "Direction": "greater than",
+                        "Hysteresis": 400.0,
+                        "Name": "upper critical",
+                        "Severity": 1,
+                        "Value": 20000
+                    },
+                    {
+                        "Direction": "less than",
+                        "Hysteresis": 16.0,
+                        "Name": "lower critical",
+                        "Severity": 1,
+                        "Value": 800
+                    }
+                ],
+                "Type": "I2CFan"
+            },
+            {
+                "Address": "0x5e",
+                "Bus": "$bus",
+                "Connector": {
+                    "Name": "FCB_$bus - 15 FAN $bus * 4 - 64 + 4 TACH_IL",
+                    "Pwm": 2,
+                    "PwmName": "FCB_$bus - 15 FAN_PWM",
+                    "Tachs": [
+                        0
+                    ]
+                },
+                "Index": 0,
+                "Name": "FCB_$bus - 15 FAN $bus * 4 - 64 + 4 TACH_IL_SPEED_RPM",
+                "PowerState": "Always",
+                "Thresholds": [
+                    {
+                        "Direction": "greater than",
+                        "Hysteresis": 400.0,
+                        "Name": "upper critical",
+                        "Severity": 1,
+                        "Value": 20000
+                    },
+                    {
+                        "Direction": "less than",
+                        "Hysteresis": 16.0,
+                        "Name": "lower critical",
+                        "Severity": 1,
+                        "Value": 800
+                    }
+                ],
+                "Type": "I2CFan"
+            },
+            {
+                "Address": "0x5e",
+                "Bus": "$bus",
+                "Connector": {
+                    "Name": "FCB_$bus - 15 FAN $bus * 4 - 64 + 4 TACH_OL",
+                    "Pwm": 2,
+                    "PwmName": "FCB_$bus - 15 FAN_PWM",
+                    "Tachs": [
+                        1
+                    ]
+                },
+                "Index": 1,
+                "Name": "FCB_$bus - 15 FAN $bus * 4 - 64 + 4 TACH_OL_SPEED_RPM",
+                "PowerState": "Always",
+                "Thresholds": [
+                    {
+                        "Direction": "greater than",
+                        "Hysteresis": 400.0,
+                        "Name": "upper critical",
+                        "Severity": 1,
+                        "Value": 20000
+                    },
+                    {
+                        "Direction": "less than",
+                        "Hysteresis": 16.0,
+                        "Name": "lower critical",
+                        "Severity": 1,
+                        "Value": 800
+                    }
+                ],
+                "Type": "I2CFan"
+            },
+            {
+                "Address": "0x40",
+                "Bus": "$bus",
+                "Labels": [
+                    "in1",
+                    "curr1"
+                ],
+                "Name": "FCB_$bus - 15 FAN_$bus * 4 - 64 + 1",
+                "Thresholds": [
+                    {
+                        "Direction": "less than",
+                        "Hysteresis": 0.969,
+                        "Label": "in1",
+                        "Name": "lower critical",
+                        "Severity": 1,
+                        "Value": 48.45
+                    },
+                    {
+                        "Direction": "greater than",
+                        "Hysteresis": 1.067,
+                        "Label": "in1",
+                        "Name": "upper critical",
+                        "Severity": 1,
+                        "Value": 53.35
+                    },
+                    {
+                        "Direction": "greater than",
+                        "Hysteresis": 0.14,
+                        "Label": "curr1",
+                        "Name": "upper critical",
+                        "Severity": 1,
+                        "Value": 7.0
+                    }
+                ],
+                "Type": "INA238",
+                "curr1_Name": "FCB_$bus - 15 FAN $bus * 4 - 64 + 1 CURR_A",
+                "in1_Name": "FCB_$bus - 15 FAN $bus * 4 - 64 + 1 VOLT_V",
+                "in1_Scale": 833.3333
+            },
+            {
+                "Address": "0x41",
+                "Bus": "$bus",
+                "Labels": [
+                    "in1",
+                    "curr1"
+                ],
+                "Name": "FCB_$bus - 15 FAN_$bus * 4 - 64 + 2",
+                "Thresholds": [
+                    {
+                        "Direction": "less than",
+                        "Hysteresis": 0.969,
+                        "Label": "in1",
+                        "Name": "lower critical",
+                        "Severity": 1,
+                        "Value": 48.45
+                    },
+                    {
+                        "Direction": "greater than",
+                        "Hysteresis": 1.067,
+                        "Label": "in1",
+                        "Name": "upper critical",
+                        "Severity": 1,
+                        "Value": 53.35
+                    },
+                    {
+                        "Direction": "greater than",
+                        "Hysteresis": 0.14,
+                        "Label": "curr1",
+                        "Name": "upper critical",
+                        "Severity": 1,
+                        "Value": 7.0
+                    }
+                ],
+                "Type": "INA238",
+                "curr1_Name": "FCB_$bus - 15 FAN $bus * 4 - 64 + 2 CURR_A",
+                "in1_Name": "FCB_$bus - 15 FAN $bus * 4 - 64 + 2 VOLT_V",
+                "in1_Scale": 833.3333
+            },
+            {
+                "Address": "0x44",
+                "Bus": "$bus",
+                "Labels": [
+                    "in1",
+                    "curr1"
+                ],
+                "Name": "FCB_$bus - 15 FAN_$bus * 4 - 64 + 3",
+                "Thresholds": [
+                    {
+                        "Direction": "less than",
+                        "Hysteresis": 0.969,
+                        "Label": "in1",
+                        "Name": "lower critical",
+                        "Severity": 1,
+                        "Value": 48.45
+                    },
+                    {
+                        "Direction": "greater than",
+                        "Hysteresis": 1.067,
+                        "Label": "in1",
+                        "Name": "upper critical",
+                        "Severity": 1,
+                        "Value": 53.35
+                    },
+                    {
+                        "Direction": "greater than",
+                        "Hysteresis": 0.14,
+                        "Label": "curr1",
+                        "Name": "upper critical",
+                        "Severity": 1,
+                        "Value": 7.0
+                    }
+                ],
+                "Type": "INA238",
+                "curr1_Name": "FCB_$bus - 15 FAN $bus * 4 - 64 + 3 CURR_A",
+                "in1_Name": "FCB_$bus - 15 FAN $bus * 4 - 64 + 3 VOLT_V",
+                "in1_Scale": 833.3333
+            },
+            {
+                "Address": "0x45",
+                "Bus": "$bus",
+                "Labels": [
+                    "in1",
+                    "curr1"
+                ],
+                "Name": "FCB_$bus - 15 FAN_$bus * 4 - 64 + 4",
+                "Thresholds": [
+                    {
+                        "Direction": "less than",
+                        "Hysteresis": 0.969,
+                        "Label": "in1",
+                        "Name": "lower critical",
+                        "Severity": 1,
+                        "Value": 48.45
+                    },
+                    {
+                        "Direction": "greater than",
+                        "Hysteresis": 1.067,
+                        "Label": "in1",
+                        "Name": "upper critical",
+                        "Severity": 1,
+                        "Value": 53.35
+                    },
+                    {
+                        "Direction": "greater than",
+                        "Hysteresis": 0.14,
+                        "Label": "curr1",
+                        "Name": "upper critical",
+                        "Severity": 1,
+                        "Value": 7.0
+                    }
+                ],
+                "Type": "INA238",
+                "curr1_Name": "FCB_$bus - 15 FAN $bus * 4 - 64 + 4 CURR_A",
+                "in1_Name": "FCB_$bus - 15 FAN $bus * 4 - 64 + 4 VOLT_V",
+                "in1_Scale": 833.3333
+            },
+            {
+                "Address": "0x49",
+                "Bus": "$bus",
+                "Labels": [
+                    "temp1"
+                ],
+                "Name": "FCB_$bus - 15 T_SENSE",
+                "Type": "INA238",
+                "temp1_Name": "FCB_$bus - 15 T_SENSE_TEMP_C"
+            },
+            {
+                "Address": "0x4b",
+                "Bus": "$bus",
+                "Name": "FCB_$bus - 15 TEMP_C",
+                "Thresholds": [
+                    {
+                        "Direction": "greater than",
+                        "Hysteresis": 1.6,
+                        "Name": "upper critical",
+                        "Severity": 1,
+                        "Value": 80
+                    },
+                    {
+                        "Direction": "less than",
+                        "Hysteresis": 0.0,
+                        "Name": "lower critical",
+                        "Severity": 1,
+                        "Value": 0
+                    }
+                ],
+                "Type": "TMP75"
+            }
+        ],
+        "Name": "Minerva Fan Board 6",
+        "Probe": [
             "xyz.openbmc_project.FruDevice({'BOARD_PRODUCT_NAME': 'Minerva Fan Board.*', 'PRODUCT_MANUFACTURER': 'Quanta', 'BUS': 21, 'BOARD_INFO_AM4': 'pwr-silergy'})",
             "OR",
-            "xyz.openbmc_project.FruDevice({'BOARD_PRODUCT_NAME': 'Minerva Fan Board.*', 'PRODUCT_MANUFACTURER': 'Quanta', 'BUS': 20, 'BOARD_PART_NUMBER': '3XF0MFB0030'})",
-            "OR",
-            "xyz.openbmc_project.FruDevice({'BOARD_PRODUCT_NAME': 'Minerva Fan Board.*', 'PRODUCT_MANUFACTURER': 'Quanta', 'BUS': 21, 'BOARD_PART_NUMBER': '3XF0MFB0030'})"
+            "xyz.openbmc_project.FruDevice({'BOARD_PRODUCT_NAME': 'Minerva Fan Board DVT', 'PRODUCT_MANUFACTURER': 'Quanta', 'BUS': 21, 'BOARD_PART_NUMBER': '3XF0MFB0030'})"
         ],
         "Type": "Board",
         "xyz.openbmc_project.Inventory.Decorator.Asset": {
diff --git a/configurations/meta/minerva_fanboard_adc_ti.json b/configurations/meta/minerva_fanboard_adc_ti.json
index fefd1ed..56a4f7d 100644
--- a/configurations/meta/minerva_fanboard_adc_ti.json
+++ b/configurations/meta/minerva_fanboard_adc_ti.json
@@ -442,23 +442,1397 @@
                 "Type": "TMP75"
             }
         ],
-        "Name": "Minerva Fan Board $bus - 15",
+        "Name": "Minerva Fan Board 1",
         "Probe": [
             "xyz.openbmc_project.FruDevice({'BOARD_PRODUCT_NAME': 'Minerva Fan Board.*', 'PRODUCT_MANUFACTURER': 'Quanta', 'BUS': 16, 'BOARD_INFO_AM4': 'pwr-ti'})",
             "OR",
+            "xyz.openbmc_project.FruDevice({'BOARD_PRODUCT_NAME': 'Minerva Fan Board DVT', 'PRODUCT_MANUFACTURER': 'Quanta', 'BUS': 16, 'BOARD_PART_NUMBER': '3XF0MFB0010'})"
+        ],
+        "Type": "Board",
+        "xyz.openbmc_project.Inventory.Decorator.Asset": {
+            "BuildDate": "$BOARD_MANUFACTURE_DATE",
+            "Manufacturer": "$BOARD_MANUFACTURER",
+            "Model": "$BOARD_PRODUCT_NAME",
+            "PartNumber": "$BOARD_PART_NUMBER",
+            "SerialNumber": "$BOARD_SERIAL_NUMBER",
+            "SparePartNumber": "$BOARD_INFO_AM1"
+        },
+        "xyz.openbmc_project.Inventory.Decorator.AssetTag": {
+            "AssetTag": "$PRODUCT_ASSET_TAG"
+        }
+    },
+    {
+        "Exposes": [
+            {
+                "Address": "0x5e",
+                "Bus": "$bus",
+                "Connector": {
+                    "Name": "FCB_$bus - 15 FAN $bus * 4 - 64 + 1 TACH_IL",
+                    "Pwm": 2,
+                    "PwmName": "FCB_$bus - 15 FAN_PWM",
+                    "Tachs": [
+                        0
+                    ]
+                },
+                "Index": 0,
+                "Name": "FCB_$bus - 15 FAN $bus * 4 - 64 + 1 TACH_IL_SPEED_RPM",
+                "PowerState": "Always",
+                "Thresholds": [
+                    {
+                        "Direction": "greater than",
+                        "Hysteresis": 400.0,
+                        "Name": "upper critical",
+                        "Severity": 1,
+                        "Value": 20000
+                    },
+                    {
+                        "Direction": "less than",
+                        "Hysteresis": 16.0,
+                        "Name": "lower critical",
+                        "Severity": 1,
+                        "Value": 800
+                    }
+                ],
+                "Type": "I2CFan"
+            },
+            {
+                "Address": "0x5e",
+                "Bus": "$bus",
+                "Connector": {
+                    "Name": "FCB_$bus - 15 FAN $bus * 4 - 64 + 1 TACH_OL",
+                    "Pwm": 2,
+                    "PwmName": "FCB_$bus - 15 FAN_PWM",
+                    "Tachs": [
+                        1
+                    ]
+                },
+                "Index": 1,
+                "Name": "FCB_$bus - 15 FAN $bus * 4 - 64 + 1 TACH_OL_SPEED_RPM",
+                "PowerState": "Always",
+                "Thresholds": [
+                    {
+                        "Direction": "greater than",
+                        "Hysteresis": 400.0,
+                        "Name": "upper critical",
+                        "Severity": 1,
+                        "Value": 20000
+                    },
+                    {
+                        "Direction": "less than",
+                        "Hysteresis": 16.0,
+                        "Name": "lower critical",
+                        "Severity": 1,
+                        "Value": 800
+                    }
+                ],
+                "Type": "I2CFan"
+            },
+            {
+                "Address": "0x5e",
+                "Bus": "$bus",
+                "Connector": {
+                    "Name": "FCB_$bus - 15 FAN $bus * 4 - 64 + 2 TACH_IL",
+                    "Pwm": 2,
+                    "PwmName": "FCB_$bus - 15 FAN_PWM",
+                    "Tachs": [
+                        2
+                    ]
+                },
+                "Index": 2,
+                "Name": "FCB_$bus - 15 FAN $bus * 4 - 64 + 2 TACH_IL_SPEED_RPM",
+                "PowerState": "Always",
+                "Thresholds": [
+                    {
+                        "Direction": "greater than",
+                        "Hysteresis": 400.0,
+                        "Name": "upper critical",
+                        "Severity": 1,
+                        "Value": 20000
+                    },
+                    {
+                        "Direction": "less than",
+                        "Hysteresis": 16.0,
+                        "Name": "lower critical",
+                        "Severity": 1,
+                        "Value": 800
+                    }
+                ],
+                "Type": "I2CFan"
+            },
+            {
+                "Address": "0x5e",
+                "Bus": "$bus",
+                "Connector": {
+                    "Name": "FCB_$bus - 15 FAN $bus * 4 - 64 + 2 TACH_OL",
+                    "Pwm": 2,
+                    "PwmName": "FCB_$bus - 15 FAN_PWM",
+                    "Tachs": [
+                        3
+                    ]
+                },
+                "Index": 3,
+                "Name": "FCB_$bus - 15 FAN $bus * 4 - 64 + 2 TACH_OL_SPEED_RPM",
+                "PowerState": "Always",
+                "Thresholds": [
+                    {
+                        "Direction": "greater than",
+                        "Hysteresis": 400.0,
+                        "Name": "upper critical",
+                        "Severity": 1,
+                        "Value": 20000
+                    },
+                    {
+                        "Direction": "less than",
+                        "Hysteresis": 16.0,
+                        "Name": "lower critical",
+                        "Severity": 1,
+                        "Value": 800
+                    }
+                ],
+                "Type": "I2CFan"
+            },
+            {
+                "Address": "0x5e",
+                "Bus": "$bus",
+                "Connector": {
+                    "Name": "FCB_$bus - 15 FAN $bus * 4 - 64 + 3 TACH_IL",
+                    "Pwm": 2,
+                    "PwmName": "FCB_$bus - 15 FAN_PWM",
+                    "Tachs": [
+                        4
+                    ]
+                },
+                "Index": 4,
+                "Name": "FCB_$bus - 15 FAN $bus * 4 - 64 + 3 TACH_IL_SPEED_RPM",
+                "PowerState": "Always",
+                "Thresholds": [
+                    {
+                        "Direction": "greater than",
+                        "Hysteresis": 400.0,
+                        "Name": "upper critical",
+                        "Severity": 1,
+                        "Value": 20000
+                    },
+                    {
+                        "Direction": "less than",
+                        "Hysteresis": 16.0,
+                        "Name": "lower critical",
+                        "Severity": 1,
+                        "Value": 800
+                    }
+                ],
+                "Type": "I2CFan"
+            },
+            {
+                "Address": "0x5e",
+                "Bus": "$bus",
+                "Connector": {
+                    "Name": "FCB_$bus - 15 FAN $bus * 4 - 64 + 3 TACH_OL",
+                    "Pwm": 2,
+                    "PwmName": "FCB_$bus - 15 FAN_PWM",
+                    "Tachs": [
+                        5
+                    ]
+                },
+                "Index": 5,
+                "Name": "FCB_$bus - 15 FAN $bus * 4 - 64 + 3 TACH_OL_SPEED_RPM",
+                "PowerState": "Always",
+                "Thresholds": [
+                    {
+                        "Direction": "greater than",
+                        "Hysteresis": 400.0,
+                        "Name": "upper critical",
+                        "Severity": 1,
+                        "Value": 20000
+                    },
+                    {
+                        "Direction": "less than",
+                        "Hysteresis": 16.0,
+                        "Name": "lower critical",
+                        "Severity": 1,
+                        "Value": 800
+                    }
+                ],
+                "Type": "I2CFan"
+            },
+            {
+                "Address": "0x5e",
+                "Bus": "$bus",
+                "Connector": {
+                    "Name": "FCB_$bus - 15 FAN $bus * 4 - 64 + 4 TACH_IL",
+                    "Pwm": 2,
+                    "PwmName": "FCB_$bus - 15 FAN_PWM",
+                    "Tachs": [
+                        6
+                    ]
+                },
+                "Index": 6,
+                "Name": "FCB_$bus - 15 FAN $bus * 4 - 64 + 4 TACH_IL_SPEED_RPM",
+                "PowerState": "Always",
+                "Thresholds": [
+                    {
+                        "Direction": "greater than",
+                        "Hysteresis": 400.0,
+                        "Name": "upper critical",
+                        "Severity": 1,
+                        "Value": 20000
+                    },
+                    {
+                        "Direction": "less than",
+                        "Hysteresis": 16.0,
+                        "Name": "lower critical",
+                        "Severity": 1,
+                        "Value": 800
+                    }
+                ],
+                "Type": "I2CFan"
+            },
+            {
+                "Address": "0x5e",
+                "Bus": "$bus",
+                "Connector": {
+                    "Name": "FCB_$bus - 15 FAN $bus * 4 - 64 + 4 TACH_OL",
+                    "Pwm": 2,
+                    "PwmName": "FCB_$bus - 15 FAN_PWM",
+                    "Tachs": [
+                        7
+                    ]
+                },
+                "Index": 7,
+                "Name": "FCB_$bus - 15 FAN $bus * 4 - 64 + 4 TACH_OL_SPEED_RPM",
+                "PowerState": "Always",
+                "Thresholds": [
+                    {
+                        "Direction": "greater than",
+                        "Hysteresis": 400.0,
+                        "Name": "upper critical",
+                        "Severity": 1,
+                        "Value": 20000
+                    },
+                    {
+                        "Direction": "less than",
+                        "Hysteresis": 16.0,
+                        "Name": "lower critical",
+                        "Severity": 1,
+                        "Value": 800
+                    }
+                ],
+                "Type": "I2CFan"
+            },
+            {
+                "Address": "0x40",
+                "Bus": "$bus",
+                "Labels": [
+                    "in1",
+                    "curr1"
+                ],
+                "Name": "FCB_$bus - 15 FAN_$bus * 4 - 64 + 1",
+                "Thresholds": [
+                    {
+                        "Direction": "less than",
+                        "Hysteresis": 0.969,
+                        "Label": "in1",
+                        "Name": "lower critical",
+                        "Severity": 1,
+                        "Value": 48.45
+                    },
+                    {
+                        "Direction": "greater than",
+                        "Hysteresis": 1.067,
+                        "Label": "in1",
+                        "Name": "upper critical",
+                        "Severity": 1,
+                        "Value": 53.35
+                    },
+                    {
+                        "Direction": "greater than",
+                        "Hysteresis": 0.14,
+                        "Label": "curr1",
+                        "Name": "upper critical",
+                        "Severity": 1,
+                        "Value": 7.0
+                    }
+                ],
+                "Type": "INA238",
+                "curr1_Name": "FCB_$bus - 15 FAN $bus * 4 - 64 + 1 CURR_A",
+                "in1_Name": "FCB_$bus - 15 FAN $bus * 4 - 64 + 1 VOLT_V"
+            },
+            {
+                "Address": "0x41",
+                "Bus": "$bus",
+                "Labels": [
+                    "in1",
+                    "curr1"
+                ],
+                "Name": "FCB_$bus - 15 FAN_$bus * 4 - 64 + 2",
+                "Thresholds": [
+                    {
+                        "Direction": "less than",
+                        "Hysteresis": 0.969,
+                        "Label": "in1",
+                        "Name": "lower critical",
+                        "Severity": 1,
+                        "Value": 48.45
+                    },
+                    {
+                        "Direction": "greater than",
+                        "Hysteresis": 1.067,
+                        "Label": "in1",
+                        "Name": "upper critical",
+                        "Severity": 1,
+                        "Value": 53.35
+                    },
+                    {
+                        "Direction": "greater than",
+                        "Hysteresis": 0.14,
+                        "Label": "curr1",
+                        "Name": "upper critical",
+                        "Severity": 1,
+                        "Value": 7.0
+                    }
+                ],
+                "Type": "INA238",
+                "curr1_Name": "FCB_$bus - 15 FAN $bus * 4 - 64 + 2 CURR_A",
+                "in1_Name": "FCB_$bus - 15 FAN $bus * 4 - 64 + 2 VOLT_V"
+            },
+            {
+                "Address": "0x44",
+                "Bus": "$bus",
+                "Labels": [
+                    "in1",
+                    "curr1"
+                ],
+                "Name": "FCB_$bus - 15 FAN_$bus * 4 - 64 + 3",
+                "Thresholds": [
+                    {
+                        "Direction": "less than",
+                        "Hysteresis": 0.969,
+                        "Label": "in1",
+                        "Name": "lower critical",
+                        "Severity": 1,
+                        "Value": 48.45
+                    },
+                    {
+                        "Direction": "greater than",
+                        "Hysteresis": 1.067,
+                        "Label": "in1",
+                        "Name": "upper critical",
+                        "Severity": 1,
+                        "Value": 53.35
+                    },
+                    {
+                        "Direction": "greater than",
+                        "Hysteresis": 0.14,
+                        "Label": "curr1",
+                        "Name": "upper critical",
+                        "Severity": 1,
+                        "Value": 7.0
+                    }
+                ],
+                "Type": "INA238",
+                "curr1_Name": "FCB_$bus - 15 FAN $bus * 4 - 64 + 3 CURR_A",
+                "in1_Name": "FCB_$bus - 15 FAN $bus * 4 - 64 + 3 VOLT_V"
+            },
+            {
+                "Address": "0x45",
+                "Bus": "$bus",
+                "Labels": [
+                    "in1",
+                    "curr1"
+                ],
+                "Name": "FCB_$bus - 15 FAN_$bus * 4 - 64 + 4",
+                "Thresholds": [
+                    {
+                        "Direction": "less than",
+                        "Hysteresis": 0.969,
+                        "Label": "in1",
+                        "Name": "lower critical",
+                        "Severity": 1,
+                        "Value": 48.45
+                    },
+                    {
+                        "Direction": "greater than",
+                        "Hysteresis": 1.067,
+                        "Label": "in1",
+                        "Name": "upper critical",
+                        "Severity": 1,
+                        "Value": 53.35
+                    },
+                    {
+                        "Direction": "greater than",
+                        "Hysteresis": 0.14,
+                        "Label": "curr1",
+                        "Name": "upper critical",
+                        "Severity": 1,
+                        "Value": 7.0
+                    }
+                ],
+                "Type": "INA238",
+                "curr1_Name": "FCB_$bus - 15 FAN $bus * 4 - 64 + 4 CURR_A",
+                "in1_Name": "FCB_$bus - 15 FAN $bus * 4 - 64 + 4 VOLT_V"
+            },
+            {
+                "Address": "0x49",
+                "Bus": "$bus",
+                "Labels": [
+                    "temp1"
+                ],
+                "Name": "FCB_$bus - 15 T_SENSE",
+                "Type": "INA238",
+                "temp1_Name": "FCB_$bus - 15 T_SENSE_TEMP_C"
+            },
+            {
+                "Address": "0x4b",
+                "Bus": "$bus",
+                "Name": "FCB_$bus - 15 TEMP_C",
+                "Thresholds": [
+                    {
+                        "Direction": "greater than",
+                        "Hysteresis": 1.6,
+                        "Name": "upper critical",
+                        "Severity": 1,
+                        "Value": 80
+                    },
+                    {
+                        "Direction": "less than",
+                        "Hysteresis": 0.0,
+                        "Name": "lower critical",
+                        "Severity": 1,
+                        "Value": 0
+                    }
+                ],
+                "Type": "TMP75"
+            }
+        ],
+        "Name": "Minerva Fan Board 2",
+        "Probe": [
             "xyz.openbmc_project.FruDevice({'BOARD_PRODUCT_NAME': 'Minerva Fan Board.*', 'PRODUCT_MANUFACTURER': 'Quanta', 'BUS': 17, 'BOARD_INFO_AM4': 'pwr-ti'})",
             "OR",
+            "xyz.openbmc_project.FruDevice({'BOARD_PRODUCT_NAME': 'Minerva Fan Board DVT', 'PRODUCT_MANUFACTURER': 'Quanta', 'BUS': 17, 'BOARD_PART_NUMBER': '3XF0MFB0010'})"
+        ],
+        "Type": "Board",
+        "xyz.openbmc_project.Inventory.Decorator.Asset": {
+            "BuildDate": "$BOARD_MANUFACTURE_DATE",
+            "Manufacturer": "$BOARD_MANUFACTURER",
+            "Model": "$BOARD_PRODUCT_NAME",
+            "PartNumber": "$BOARD_PART_NUMBER",
+            "SerialNumber": "$BOARD_SERIAL_NUMBER",
+            "SparePartNumber": "$BOARD_INFO_AM1"
+        },
+        "xyz.openbmc_project.Inventory.Decorator.AssetTag": {
+            "AssetTag": "$PRODUCT_ASSET_TAG"
+        }
+    },
+    {
+        "Exposes": [
+            {
+                "Address": "0x5e",
+                "Bus": "$bus",
+                "Connector": {
+                    "Name": "FCB_$bus - 15 FAN $bus * 4 - 64 + 1 TACH_IL",
+                    "Pwm": 2,
+                    "PwmName": "FCB_$bus - 15 FAN_PWM",
+                    "Tachs": [
+                        0
+                    ]
+                },
+                "Index": 0,
+                "Name": "FCB_$bus - 15 FAN $bus * 4 - 64 + 1 TACH_IL_SPEED_RPM",
+                "PowerState": "Always",
+                "Thresholds": [
+                    {
+                        "Direction": "greater than",
+                        "Hysteresis": 400.0,
+                        "Name": "upper critical",
+                        "Severity": 1,
+                        "Value": 20000
+                    },
+                    {
+                        "Direction": "less than",
+                        "Hysteresis": 16.0,
+                        "Name": "lower critical",
+                        "Severity": 1,
+                        "Value": 800
+                    }
+                ],
+                "Type": "I2CFan"
+            },
+            {
+                "Address": "0x5e",
+                "Bus": "$bus",
+                "Connector": {
+                    "Name": "FCB_$bus - 15 FAN $bus * 4 - 64 + 1 TACH_OL",
+                    "Pwm": 2,
+                    "PwmName": "FCB_$bus - 15 FAN_PWM",
+                    "Tachs": [
+                        1
+                    ]
+                },
+                "Index": 1,
+                "Name": "FCB_$bus - 15 FAN $bus * 4 - 64 + 1 TACH_OL_SPEED_RPM",
+                "PowerState": "Always",
+                "Thresholds": [
+                    {
+                        "Direction": "greater than",
+                        "Hysteresis": 400.0,
+                        "Name": "upper critical",
+                        "Severity": 1,
+                        "Value": 20000
+                    },
+                    {
+                        "Direction": "less than",
+                        "Hysteresis": 16.0,
+                        "Name": "lower critical",
+                        "Severity": 1,
+                        "Value": 800
+                    }
+                ],
+                "Type": "I2CFan"
+            },
+            {
+                "Address": "0x5e",
+                "Bus": "$bus",
+                "Connector": {
+                    "Name": "FCB_$bus - 15 FAN $bus * 4 - 64 + 2 TACH_IL",
+                    "Pwm": 2,
+                    "PwmName": "FCB_$bus - 15 FAN_PWM",
+                    "Tachs": [
+                        2
+                    ]
+                },
+                "Index": 2,
+                "Name": "FCB_$bus - 15 FAN $bus * 4 - 64 + 2 TACH_IL_SPEED_RPM",
+                "PowerState": "Always",
+                "Thresholds": [
+                    {
+                        "Direction": "greater than",
+                        "Hysteresis": 400.0,
+                        "Name": "upper critical",
+                        "Severity": 1,
+                        "Value": 20000
+                    },
+                    {
+                        "Direction": "less than",
+                        "Hysteresis": 16.0,
+                        "Name": "lower critical",
+                        "Severity": 1,
+                        "Value": 800
+                    }
+                ],
+                "Type": "I2CFan"
+            },
+            {
+                "Address": "0x5e",
+                "Bus": "$bus",
+                "Connector": {
+                    "Name": "FCB_$bus - 15 FAN $bus * 4 - 64 + 2 TACH_OL",
+                    "Pwm": 2,
+                    "PwmName": "FCB_$bus - 15 FAN_PWM",
+                    "Tachs": [
+                        3
+                    ]
+                },
+                "Index": 3,
+                "Name": "FCB_$bus - 15 FAN $bus * 4 - 64 + 2 TACH_OL_SPEED_RPM",
+                "PowerState": "Always",
+                "Thresholds": [
+                    {
+                        "Direction": "greater than",
+                        "Hysteresis": 400.0,
+                        "Name": "upper critical",
+                        "Severity": 1,
+                        "Value": 20000
+                    },
+                    {
+                        "Direction": "less than",
+                        "Hysteresis": 16.0,
+                        "Name": "lower critical",
+                        "Severity": 1,
+                        "Value": 800
+                    }
+                ],
+                "Type": "I2CFan"
+            },
+            {
+                "Address": "0x5e",
+                "Bus": "$bus",
+                "Connector": {
+                    "Name": "FCB_$bus - 15 FAN $bus * 4 - 64 + 3 TACH_IL",
+                    "Pwm": 2,
+                    "PwmName": "FCB_$bus - 15 FAN_PWM",
+                    "Tachs": [
+                        4
+                    ]
+                },
+                "Index": 4,
+                "Name": "FCB_$bus - 15 FAN $bus * 4 - 64 + 3 TACH_IL_SPEED_RPM",
+                "PowerState": "Always",
+                "Thresholds": [
+                    {
+                        "Direction": "greater than",
+                        "Hysteresis": 400.0,
+                        "Name": "upper critical",
+                        "Severity": 1,
+                        "Value": 20000
+                    },
+                    {
+                        "Direction": "less than",
+                        "Hysteresis": 16.0,
+                        "Name": "lower critical",
+                        "Severity": 1,
+                        "Value": 800
+                    }
+                ],
+                "Type": "I2CFan"
+            },
+            {
+                "Address": "0x5e",
+                "Bus": "$bus",
+                "Connector": {
+                    "Name": "FCB_$bus - 15 FAN $bus * 4 - 64 + 3 TACH_OL",
+                    "Pwm": 2,
+                    "PwmName": "FCB_$bus - 15 FAN_PWM",
+                    "Tachs": [
+                        5
+                    ]
+                },
+                "Index": 5,
+                "Name": "FCB_$bus - 15 FAN $bus * 4 - 64 + 3 TACH_OL_SPEED_RPM",
+                "PowerState": "Always",
+                "Thresholds": [
+                    {
+                        "Direction": "greater than",
+                        "Hysteresis": 400.0,
+                        "Name": "upper critical",
+                        "Severity": 1,
+                        "Value": 20000
+                    },
+                    {
+                        "Direction": "less than",
+                        "Hysteresis": 16.0,
+                        "Name": "lower critical",
+                        "Severity": 1,
+                        "Value": 800
+                    }
+                ],
+                "Type": "I2CFan"
+            },
+            {
+                "Address": "0x5e",
+                "Bus": "$bus",
+                "Connector": {
+                    "Name": "FCB_$bus - 15 FAN $bus * 4 - 64 + 4 TACH_IL",
+                    "Pwm": 2,
+                    "PwmName": "FCB_$bus - 15 FAN_PWM",
+                    "Tachs": [
+                        6
+                    ]
+                },
+                "Index": 6,
+                "Name": "FCB_$bus - 15 FAN $bus * 4 - 64 + 4 TACH_IL_SPEED_RPM",
+                "PowerState": "Always",
+                "Thresholds": [
+                    {
+                        "Direction": "greater than",
+                        "Hysteresis": 400.0,
+                        "Name": "upper critical",
+                        "Severity": 1,
+                        "Value": 20000
+                    },
+                    {
+                        "Direction": "less than",
+                        "Hysteresis": 16.0,
+                        "Name": "lower critical",
+                        "Severity": 1,
+                        "Value": 800
+                    }
+                ],
+                "Type": "I2CFan"
+            },
+            {
+                "Address": "0x5e",
+                "Bus": "$bus",
+                "Connector": {
+                    "Name": "FCB_$bus - 15 FAN $bus * 4 - 64 + 4 TACH_OL",
+                    "Pwm": 2,
+                    "PwmName": "FCB_$bus - 15 FAN_PWM",
+                    "Tachs": [
+                        7
+                    ]
+                },
+                "Index": 7,
+                "Name": "FCB_$bus - 15 FAN $bus * 4 - 64 + 4 TACH_OL_SPEED_RPM",
+                "PowerState": "Always",
+                "Thresholds": [
+                    {
+                        "Direction": "greater than",
+                        "Hysteresis": 400.0,
+                        "Name": "upper critical",
+                        "Severity": 1,
+                        "Value": 20000
+                    },
+                    {
+                        "Direction": "less than",
+                        "Hysteresis": 16.0,
+                        "Name": "lower critical",
+                        "Severity": 1,
+                        "Value": 800
+                    }
+                ],
+                "Type": "I2CFan"
+            },
+            {
+                "Address": "0x40",
+                "Bus": "$bus",
+                "Labels": [
+                    "in1",
+                    "curr1"
+                ],
+                "Name": "FCB_$bus - 15 FAN_$bus * 4 - 64 + 1",
+                "Thresholds": [
+                    {
+                        "Direction": "less than",
+                        "Hysteresis": 0.969,
+                        "Label": "in1",
+                        "Name": "lower critical",
+                        "Severity": 1,
+                        "Value": 48.45
+                    },
+                    {
+                        "Direction": "greater than",
+                        "Hysteresis": 1.067,
+                        "Label": "in1",
+                        "Name": "upper critical",
+                        "Severity": 1,
+                        "Value": 53.35
+                    },
+                    {
+                        "Direction": "greater than",
+                        "Hysteresis": 0.14,
+                        "Label": "curr1",
+                        "Name": "upper critical",
+                        "Severity": 1,
+                        "Value": 7.0
+                    }
+                ],
+                "Type": "INA238",
+                "curr1_Name": "FCB_$bus - 15 FAN $bus * 4 - 64 + 1 CURR_A",
+                "in1_Name": "FCB_$bus - 15 FAN $bus * 4 - 64 + 1 VOLT_V"
+            },
+            {
+                "Address": "0x41",
+                "Bus": "$bus",
+                "Labels": [
+                    "in1",
+                    "curr1"
+                ],
+                "Name": "FCB_$bus - 15 FAN_$bus * 4 - 64 + 2",
+                "Thresholds": [
+                    {
+                        "Direction": "less than",
+                        "Hysteresis": 0.969,
+                        "Label": "in1",
+                        "Name": "lower critical",
+                        "Severity": 1,
+                        "Value": 48.45
+                    },
+                    {
+                        "Direction": "greater than",
+                        "Hysteresis": 1.067,
+                        "Label": "in1",
+                        "Name": "upper critical",
+                        "Severity": 1,
+                        "Value": 53.35
+                    },
+                    {
+                        "Direction": "greater than",
+                        "Hysteresis": 0.14,
+                        "Label": "curr1",
+                        "Name": "upper critical",
+                        "Severity": 1,
+                        "Value": 7.0
+                    }
+                ],
+                "Type": "INA238",
+                "curr1_Name": "FCB_$bus - 15 FAN $bus * 4 - 64 + 2 CURR_A",
+                "in1_Name": "FCB_$bus - 15 FAN $bus * 4 - 64 + 2 VOLT_V"
+            },
+            {
+                "Address": "0x44",
+                "Bus": "$bus",
+                "Labels": [
+                    "in1",
+                    "curr1"
+                ],
+                "Name": "FCB_$bus - 15 FAN_$bus * 4 - 64 + 3",
+                "Thresholds": [
+                    {
+                        "Direction": "less than",
+                        "Hysteresis": 0.969,
+                        "Label": "in1",
+                        "Name": "lower critical",
+                        "Severity": 1,
+                        "Value": 48.45
+                    },
+                    {
+                        "Direction": "greater than",
+                        "Hysteresis": 1.067,
+                        "Label": "in1",
+                        "Name": "upper critical",
+                        "Severity": 1,
+                        "Value": 53.35
+                    },
+                    {
+                        "Direction": "greater than",
+                        "Hysteresis": 0.14,
+                        "Label": "curr1",
+                        "Name": "upper critical",
+                        "Severity": 1,
+                        "Value": 7.0
+                    }
+                ],
+                "Type": "INA238",
+                "curr1_Name": "FCB_$bus - 15 FAN $bus * 4 - 64 + 3 CURR_A",
+                "in1_Name": "FCB_$bus - 15 FAN $bus * 4 - 64 + 3 VOLT_V"
+            },
+            {
+                "Address": "0x45",
+                "Bus": "$bus",
+                "Labels": [
+                    "in1",
+                    "curr1"
+                ],
+                "Name": "FCB_$bus - 15 FAN_$bus * 4 - 64 + 4",
+                "Thresholds": [
+                    {
+                        "Direction": "less than",
+                        "Hysteresis": 0.969,
+                        "Label": "in1",
+                        "Name": "lower critical",
+                        "Severity": 1,
+                        "Value": 48.45
+                    },
+                    {
+                        "Direction": "greater than",
+                        "Hysteresis": 1.067,
+                        "Label": "in1",
+                        "Name": "upper critical",
+                        "Severity": 1,
+                        "Value": 53.35
+                    },
+                    {
+                        "Direction": "greater than",
+                        "Hysteresis": 0.14,
+                        "Label": "curr1",
+                        "Name": "upper critical",
+                        "Severity": 1,
+                        "Value": 7.0
+                    }
+                ],
+                "Type": "INA238",
+                "curr1_Name": "FCB_$bus - 15 FAN $bus * 4 - 64 + 4 CURR_A",
+                "in1_Name": "FCB_$bus - 15 FAN $bus * 4 - 64 + 4 VOLT_V"
+            },
+            {
+                "Address": "0x49",
+                "Bus": "$bus",
+                "Labels": [
+                    "temp1"
+                ],
+                "Name": "FCB_$bus - 15 T_SENSE",
+                "Type": "INA238",
+                "temp1_Name": "FCB_$bus - 15 T_SENSE_TEMP_C"
+            },
+            {
+                "Address": "0x4b",
+                "Bus": "$bus",
+                "Name": "FCB_$bus - 15 TEMP_C",
+                "Thresholds": [
+                    {
+                        "Direction": "greater than",
+                        "Hysteresis": 1.6,
+                        "Name": "upper critical",
+                        "Severity": 1,
+                        "Value": 80
+                    },
+                    {
+                        "Direction": "less than",
+                        "Hysteresis": 0.0,
+                        "Name": "lower critical",
+                        "Severity": 1,
+                        "Value": 0
+                    }
+                ],
+                "Type": "TMP75"
+            }
+        ],
+        "Name": "Minerva Fan Board 3",
+        "Probe": [
             "xyz.openbmc_project.FruDevice({'BOARD_PRODUCT_NAME': 'Minerva Fan Board.*', 'PRODUCT_MANUFACTURER': 'Quanta', 'BUS': 18, 'BOARD_INFO_AM4': 'pwr-ti'})",
             "OR",
+            "xyz.openbmc_project.FruDevice({'BOARD_PRODUCT_NAME': 'Minerva Fan Board DVT', 'PRODUCT_MANUFACTURER': 'Quanta', 'BUS': 18, 'BOARD_PART_NUMBER': '3XF0MFB0010'})"
+        ],
+        "Type": "Board",
+        "xyz.openbmc_project.Inventory.Decorator.Asset": {
+            "BuildDate": "$BOARD_MANUFACTURE_DATE",
+            "Manufacturer": "$BOARD_MANUFACTURER",
+            "Model": "$BOARD_PRODUCT_NAME",
+            "PartNumber": "$BOARD_PART_NUMBER",
+            "SerialNumber": "$BOARD_SERIAL_NUMBER",
+            "SparePartNumber": "$BOARD_INFO_AM1"
+        },
+        "xyz.openbmc_project.Inventory.Decorator.AssetTag": {
+            "AssetTag": "$PRODUCT_ASSET_TAG"
+        }
+    },
+    {
+        "Exposes": [
+            {
+                "Address": "0x5e",
+                "Bus": "$bus",
+                "Connector": {
+                    "Name": "FCB_$bus - 15 FAN $bus * 4 - 64 + 1 TACH_IL",
+                    "Pwm": 2,
+                    "PwmName": "FCB_$bus - 15 FAN_PWM",
+                    "Tachs": [
+                        0
+                    ]
+                },
+                "Index": 0,
+                "Name": "FCB_$bus - 15 FAN $bus * 4 - 64 + 1 TACH_IL_SPEED_RPM",
+                "PowerState": "Always",
+                "Thresholds": [
+                    {
+                        "Direction": "greater than",
+                        "Hysteresis": 400.0,
+                        "Name": "upper critical",
+                        "Severity": 1,
+                        "Value": 20000
+                    },
+                    {
+                        "Direction": "less than",
+                        "Hysteresis": 16.0,
+                        "Name": "lower critical",
+                        "Severity": 1,
+                        "Value": 800
+                    }
+                ],
+                "Type": "I2CFan"
+            },
+            {
+                "Address": "0x5e",
+                "Bus": "$bus",
+                "Connector": {
+                    "Name": "FCB_$bus - 15 FAN $bus * 4 - 64 + 1 TACH_OL",
+                    "Pwm": 2,
+                    "PwmName": "FCB_$bus - 15 FAN_PWM",
+                    "Tachs": [
+                        1
+                    ]
+                },
+                "Index": 1,
+                "Name": "FCB_$bus - 15 FAN $bus * 4 - 64 + 1 TACH_OL_SPEED_RPM",
+                "PowerState": "Always",
+                "Thresholds": [
+                    {
+                        "Direction": "greater than",
+                        "Hysteresis": 400.0,
+                        "Name": "upper critical",
+                        "Severity": 1,
+                        "Value": 20000
+                    },
+                    {
+                        "Direction": "less than",
+                        "Hysteresis": 16.0,
+                        "Name": "lower critical",
+                        "Severity": 1,
+                        "Value": 800
+                    }
+                ],
+                "Type": "I2CFan"
+            },
+            {
+                "Address": "0x5e",
+                "Bus": "$bus",
+                "Connector": {
+                    "Name": "FCB_$bus - 15 FAN $bus * 4 - 64 + 2 TACH_IL",
+                    "Pwm": 2,
+                    "PwmName": "FCB_$bus - 15 FAN_PWM",
+                    "Tachs": [
+                        2
+                    ]
+                },
+                "Index": 2,
+                "Name": "FCB_$bus - 15 FAN $bus * 4 - 64 + 2 TACH_IL_SPEED_RPM",
+                "PowerState": "Always",
+                "Thresholds": [
+                    {
+                        "Direction": "greater than",
+                        "Hysteresis": 400.0,
+                        "Name": "upper critical",
+                        "Severity": 1,
+                        "Value": 20000
+                    },
+                    {
+                        "Direction": "less than",
+                        "Hysteresis": 16.0,
+                        "Name": "lower critical",
+                        "Severity": 1,
+                        "Value": 800
+                    }
+                ],
+                "Type": "I2CFan"
+            },
+            {
+                "Address": "0x5e",
+                "Bus": "$bus",
+                "Connector": {
+                    "Name": "FCB_$bus - 15 FAN $bus * 4 - 64 + 2 TACH_OL",
+                    "Pwm": 2,
+                    "PwmName": "FCB_$bus - 15 FAN_PWM",
+                    "Tachs": [
+                        3
+                    ]
+                },
+                "Index": 3,
+                "Name": "FCB_$bus - 15 FAN $bus * 4 - 64 + 2 TACH_OL_SPEED_RPM",
+                "PowerState": "Always",
+                "Thresholds": [
+                    {
+                        "Direction": "greater than",
+                        "Hysteresis": 400.0,
+                        "Name": "upper critical",
+                        "Severity": 1,
+                        "Value": 20000
+                    },
+                    {
+                        "Direction": "less than",
+                        "Hysteresis": 16.0,
+                        "Name": "lower critical",
+                        "Severity": 1,
+                        "Value": 800
+                    }
+                ],
+                "Type": "I2CFan"
+            },
+            {
+                "Address": "0x5e",
+                "Bus": "$bus",
+                "Connector": {
+                    "Name": "FCB_$bus - 15 FAN $bus * 4 - 64 + 3 TACH_IL",
+                    "Pwm": 2,
+                    "PwmName": "FCB_$bus - 15 FAN_PWM",
+                    "Tachs": [
+                        4
+                    ]
+                },
+                "Index": 4,
+                "Name": "FCB_$bus - 15 FAN $bus * 4 - 64 + 3 TACH_IL_SPEED_RPM",
+                "PowerState": "Always",
+                "Thresholds": [
+                    {
+                        "Direction": "greater than",
+                        "Hysteresis": 400.0,
+                        "Name": "upper critical",
+                        "Severity": 1,
+                        "Value": 20000
+                    },
+                    {
+                        "Direction": "less than",
+                        "Hysteresis": 16.0,
+                        "Name": "lower critical",
+                        "Severity": 1,
+                        "Value": 800
+                    }
+                ],
+                "Type": "I2CFan"
+            },
+            {
+                "Address": "0x5e",
+                "Bus": "$bus",
+                "Connector": {
+                    "Name": "FCB_$bus - 15 FAN $bus * 4 - 64 + 3 TACH_OL",
+                    "Pwm": 2,
+                    "PwmName": "FCB_$bus - 15 FAN_PWM",
+                    "Tachs": [
+                        5
+                    ]
+                },
+                "Index": 5,
+                "Name": "FCB_$bus - 15 FAN $bus * 4 - 64 + 3 TACH_OL_SPEED_RPM",
+                "PowerState": "Always",
+                "Thresholds": [
+                    {
+                        "Direction": "greater than",
+                        "Hysteresis": 400.0,
+                        "Name": "upper critical",
+                        "Severity": 1,
+                        "Value": 20000
+                    },
+                    {
+                        "Direction": "less than",
+                        "Hysteresis": 16.0,
+                        "Name": "lower critical",
+                        "Severity": 1,
+                        "Value": 800
+                    }
+                ],
+                "Type": "I2CFan"
+            },
+            {
+                "Address": "0x5e",
+                "Bus": "$bus",
+                "Connector": {
+                    "Name": "FCB_$bus - 15 FAN $bus * 4 - 64 + 4 TACH_IL",
+                    "Pwm": 2,
+                    "PwmName": "FCB_$bus - 15 FAN_PWM",
+                    "Tachs": [
+                        6
+                    ]
+                },
+                "Index": 6,
+                "Name": "FCB_$bus - 15 FAN $bus * 4 - 64 + 4 TACH_IL_SPEED_RPM",
+                "PowerState": "Always",
+                "Thresholds": [
+                    {
+                        "Direction": "greater than",
+                        "Hysteresis": 400.0,
+                        "Name": "upper critical",
+                        "Severity": 1,
+                        "Value": 20000
+                    },
+                    {
+                        "Direction": "less than",
+                        "Hysteresis": 16.0,
+                        "Name": "lower critical",
+                        "Severity": 1,
+                        "Value": 800
+                    }
+                ],
+                "Type": "I2CFan"
+            },
+            {
+                "Address": "0x5e",
+                "Bus": "$bus",
+                "Connector": {
+                    "Name": "FCB_$bus - 15 FAN $bus * 4 - 64 + 4 TACH_OL",
+                    "Pwm": 2,
+                    "PwmName": "FCB_$bus - 15 FAN_PWM",
+                    "Tachs": [
+                        7
+                    ]
+                },
+                "Index": 7,
+                "Name": "FCB_$bus - 15 FAN $bus * 4 - 64 + 4 TACH_OL_SPEED_RPM",
+                "PowerState": "Always",
+                "Thresholds": [
+                    {
+                        "Direction": "greater than",
+                        "Hysteresis": 400.0,
+                        "Name": "upper critical",
+                        "Severity": 1,
+                        "Value": 20000
+                    },
+                    {
+                        "Direction": "less than",
+                        "Hysteresis": 16.0,
+                        "Name": "lower critical",
+                        "Severity": 1,
+                        "Value": 800
+                    }
+                ],
+                "Type": "I2CFan"
+            },
+            {
+                "Address": "0x40",
+                "Bus": "$bus",
+                "Labels": [
+                    "in1",
+                    "curr1"
+                ],
+                "Name": "FCB_$bus - 15 FAN_$bus * 4 - 64 + 1",
+                "Thresholds": [
+                    {
+                        "Direction": "less than",
+                        "Hysteresis": 0.969,
+                        "Label": "in1",
+                        "Name": "lower critical",
+                        "Severity": 1,
+                        "Value": 48.45
+                    },
+                    {
+                        "Direction": "greater than",
+                        "Hysteresis": 1.067,
+                        "Label": "in1",
+                        "Name": "upper critical",
+                        "Severity": 1,
+                        "Value": 53.35
+                    },
+                    {
+                        "Direction": "greater than",
+                        "Hysteresis": 0.14,
+                        "Label": "curr1",
+                        "Name": "upper critical",
+                        "Severity": 1,
+                        "Value": 7.0
+                    }
+                ],
+                "Type": "INA238",
+                "curr1_Name": "FCB_$bus - 15 FAN $bus * 4 - 64 + 1 CURR_A",
+                "in1_Name": "FCB_$bus - 15 FAN $bus * 4 - 64 + 1 VOLT_V"
+            },
+            {
+                "Address": "0x41",
+                "Bus": "$bus",
+                "Labels": [
+                    "in1",
+                    "curr1"
+                ],
+                "Name": "FCB_$bus - 15 FAN_$bus * 4 - 64 + 2",
+                "Thresholds": [
+                    {
+                        "Direction": "less than",
+                        "Hysteresis": 0.969,
+                        "Label": "in1",
+                        "Name": "lower critical",
+                        "Severity": 1,
+                        "Value": 48.45
+                    },
+                    {
+                        "Direction": "greater than",
+                        "Hysteresis": 1.067,
+                        "Label": "in1",
+                        "Name": "upper critical",
+                        "Severity": 1,
+                        "Value": 53.35
+                    },
+                    {
+                        "Direction": "greater than",
+                        "Hysteresis": 0.14,
+                        "Label": "curr1",
+                        "Name": "upper critical",
+                        "Severity": 1,
+                        "Value": 7.0
+                    }
+                ],
+                "Type": "INA238",
+                "curr1_Name": "FCB_$bus - 15 FAN $bus * 4 - 64 + 2 CURR_A",
+                "in1_Name": "FCB_$bus - 15 FAN $bus * 4 - 64 + 2 VOLT_V"
+            },
+            {
+                "Address": "0x44",
+                "Bus": "$bus",
+                "Labels": [
+                    "in1",
+                    "curr1"
+                ],
+                "Name": "FCB_$bus - 15 FAN_$bus * 4 - 64 + 3",
+                "Thresholds": [
+                    {
+                        "Direction": "less than",
+                        "Hysteresis": 0.969,
+                        "Label": "in1",
+                        "Name": "lower critical",
+                        "Severity": 1,
+                        "Value": 48.45
+                    },
+                    {
+                        "Direction": "greater than",
+                        "Hysteresis": 1.067,
+                        "Label": "in1",
+                        "Name": "upper critical",
+                        "Severity": 1,
+                        "Value": 53.35
+                    },
+                    {
+                        "Direction": "greater than",
+                        "Hysteresis": 0.14,
+                        "Label": "curr1",
+                        "Name": "upper critical",
+                        "Severity": 1,
+                        "Value": 7.0
+                    }
+                ],
+                "Type": "INA238",
+                "curr1_Name": "FCB_$bus - 15 FAN $bus * 4 - 64 + 3 CURR_A",
+                "in1_Name": "FCB_$bus - 15 FAN $bus * 4 - 64 + 3 VOLT_V"
+            },
+            {
+                "Address": "0x45",
+                "Bus": "$bus",
+                "Labels": [
+                    "in1",
+                    "curr1"
+                ],
+                "Name": "FCB_$bus - 15 FAN_$bus * 4 - 64 + 4",
+                "Thresholds": [
+                    {
+                        "Direction": "less than",
+                        "Hysteresis": 0.969,
+                        "Label": "in1",
+                        "Name": "lower critical",
+                        "Severity": 1,
+                        "Value": 48.45
+                    },
+                    {
+                        "Direction": "greater than",
+                        "Hysteresis": 1.067,
+                        "Label": "in1",
+                        "Name": "upper critical",
+                        "Severity": 1,
+                        "Value": 53.35
+                    },
+                    {
+                        "Direction": "greater than",
+                        "Hysteresis": 0.14,
+                        "Label": "curr1",
+                        "Name": "upper critical",
+                        "Severity": 1,
+                        "Value": 7.0
+                    }
+                ],
+                "Type": "INA238",
+                "curr1_Name": "FCB_$bus - 15 FAN $bus * 4 - 64 + 4 CURR_A",
+                "in1_Name": "FCB_$bus - 15 FAN $bus * 4 - 64 + 4 VOLT_V"
+            },
+            {
+                "Address": "0x49",
+                "Bus": "$bus",
+                "Labels": [
+                    "temp1"
+                ],
+                "Name": "FCB_$bus - 15 T_SENSE",
+                "Type": "INA238",
+                "temp1_Name": "FCB_$bus - 15 T_SENSE_TEMP_C"
+            },
+            {
+                "Address": "0x4b",
+                "Bus": "$bus",
+                "Name": "FCB_$bus - 15 TEMP_C",
+                "Thresholds": [
+                    {
+                        "Direction": "greater than",
+                        "Hysteresis": 1.6,
+                        "Name": "upper critical",
+                        "Severity": 1,
+                        "Value": 80
+                    },
+                    {
+                        "Direction": "less than",
+                        "Hysteresis": 0.0,
+                        "Name": "lower critical",
+                        "Severity": 1,
+                        "Value": 0
+                    }
+                ],
+                "Type": "TMP75"
+            }
+        ],
+        "Name": "Minerva Fan Board 4",
+        "Probe": [
             "xyz.openbmc_project.FruDevice({'BOARD_PRODUCT_NAME': 'Minerva Fan Board.*', 'PRODUCT_MANUFACTURER': 'Quanta', 'BUS': 19, 'BOARD_INFO_AM4': 'pwr-ti'})",
             "OR",
-            "xyz.openbmc_project.FruDevice({'BOARD_PRODUCT_NAME': 'Minerva Fan Board.*', 'PRODUCT_MANUFACTURER': 'Quanta', 'BUS': 16, 'BOARD_PART_NUMBER': '3XF0MFB0010'})",
-            "OR",
-            "xyz.openbmc_project.FruDevice({'BOARD_PRODUCT_NAME': 'Minerva Fan Board.*', 'PRODUCT_MANUFACTURER': 'Quanta', 'BUS': 17, 'BOARD_PART_NUMBER': '3XF0MFB0010'})",
-            "OR",
-            "xyz.openbmc_project.FruDevice({'BOARD_PRODUCT_NAME': 'Minerva Fan Board.*', 'PRODUCT_MANUFACTURER': 'Quanta', 'BUS': 18, 'BOARD_PART_NUMBER': '3XF0MFB0010'})",
-            "OR",
-            "xyz.openbmc_project.FruDevice({'BOARD_PRODUCT_NAME': 'Minerva Fan Board.*', 'PRODUCT_MANUFACTURER': 'Quanta', 'BUS': 19, 'BOARD_PART_NUMBER': '3XF0MFB0010'})"
+            "xyz.openbmc_project.FruDevice({'BOARD_PRODUCT_NAME': 'Minerva Fan Board DVT', 'PRODUCT_MANUFACTURER': 'Quanta', 'BUS': 19, 'BOARD_PART_NUMBER': '3XF0MFB0010'})"
         ],
         "Type": "Board",
         "xyz.openbmc_project.Inventory.Decorator.Asset": {
@@ -916,15 +2290,473 @@
                 "Type": "TMP75"
             }
         ],
-        "Name": "Minerva Fan Board $bus - 15",
+        "Name": "Minerva Fan Board 5",
         "Probe": [
             "xyz.openbmc_project.FruDevice({'BOARD_PRODUCT_NAME': 'Minerva Fan Board.*', 'PRODUCT_MANUFACTURER': 'Quanta', 'BUS': 20, 'BOARD_INFO_AM4': 'pwr-ti'})",
             "OR",
+            "xyz.openbmc_project.FruDevice({'BOARD_PRODUCT_NAME': 'Minerva Fan Board DVT', 'PRODUCT_MANUFACTURER': 'Quanta', 'BUS': 20, 'BOARD_PART_NUMBER': '3XF0MFB0010'})"
+        ],
+        "Type": "Board",
+        "xyz.openbmc_project.Inventory.Decorator.Asset": {
+            "BuildDate": "$BOARD_MANUFACTURE_DATE",
+            "Manufacturer": "$BOARD_MANUFACTURER",
+            "Model": "$BOARD_PRODUCT_NAME",
+            "PartNumber": "$BOARD_PART_NUMBER",
+            "SerialNumber": "$BOARD_SERIAL_NUMBER",
+            "SparePartNumber": "$BOARD_INFO_AM1"
+        },
+        "xyz.openbmc_project.Inventory.Decorator.AssetTag": {
+            "AssetTag": "$PRODUCT_ASSET_TAG"
+        }
+    },
+    {
+        "Exposes": [
+            {
+                "Address": "0x5e",
+                "Bus": "$bus",
+                "Connector": {
+                    "Name": "FCB_$bus - 15 FAN $bus * 4 - 64 + 1 TACH_IL",
+                    "Pwm": 2,
+                    "PwmName": "FCB_$bus - 15 FAN_PWM",
+                    "Tachs": [
+                        6
+                    ]
+                },
+                "Index": 6,
+                "Name": "FCB_$bus - 15 FAN $bus * 4 - 64 + 1 TACH_IL_SPEED_RPM",
+                "PowerState": "Always",
+                "Thresholds": [
+                    {
+                        "Direction": "greater than",
+                        "Hysteresis": 400.0,
+                        "Name": "upper critical",
+                        "Severity": 1,
+                        "Value": 20000
+                    },
+                    {
+                        "Direction": "less than",
+                        "Hysteresis": 16.0,
+                        "Name": "lower critical",
+                        "Severity": 1,
+                        "Value": 800
+                    }
+                ],
+                "Type": "I2CFan"
+            },
+            {
+                "Address": "0x5e",
+                "Bus": "$bus",
+                "Connector": {
+                    "Name": "FCB_$bus - 15 FAN $bus * 4 - 64 + 1 TACH_OL",
+                    "Pwm": 2,
+                    "PwmName": "FCB_$bus - 15 FAN_PWM",
+                    "Tachs": [
+                        7
+                    ]
+                },
+                "Index": 7,
+                "Name": "FCB_$bus - 15 FAN $bus * 4 - 64 + 1 TACH_OL_SPEED_RPM",
+                "PowerState": "Always",
+                "Thresholds": [
+                    {
+                        "Direction": "greater than",
+                        "Hysteresis": 400.0,
+                        "Name": "upper critical",
+                        "Severity": 1,
+                        "Value": 20000
+                    },
+                    {
+                        "Direction": "less than",
+                        "Hysteresis": 16.0,
+                        "Name": "lower critical",
+                        "Severity": 1,
+                        "Value": 800
+                    }
+                ],
+                "Type": "I2CFan"
+            },
+            {
+                "Address": "0x5e",
+                "Bus": "$bus",
+                "Connector": {
+                    "Name": "FCB_$bus - 15 FAN $bus * 4 - 64 + 2 TACH_IL",
+                    "Pwm": 2,
+                    "PwmName": "FCB_$bus - 15 FAN_PWM",
+                    "Tachs": [
+                        4
+                    ]
+                },
+                "Index": 4,
+                "Name": "FCB_$bus - 15 FAN $bus * 4 - 64 + 2 TACH_IL_SPEED_RPM",
+                "PowerState": "Always",
+                "Thresholds": [
+                    {
+                        "Direction": "greater than",
+                        "Hysteresis": 400.0,
+                        "Name": "upper critical",
+                        "Severity": 1,
+                        "Value": 20000
+                    },
+                    {
+                        "Direction": "less than",
+                        "Hysteresis": 16.0,
+                        "Name": "lower critical",
+                        "Severity": 1,
+                        "Value": 800
+                    }
+                ],
+                "Type": "I2CFan"
+            },
+            {
+                "Address": "0x5e",
+                "Bus": "$bus",
+                "Connector": {
+                    "Name": "FCB_$bus - 15 FAN $bus * 4 - 64 + 2 TACH_OL",
+                    "Pwm": 2,
+                    "PwmName": "FCB_$bus - 15 FAN_PWM",
+                    "Tachs": [
+                        5
+                    ]
+                },
+                "Index": 5,
+                "Name": "FCB_$bus - 15 FAN $bus * 4 - 64 + 2 TACH_OL_SPEED_RPM",
+                "PowerState": "Always",
+                "Thresholds": [
+                    {
+                        "Direction": "greater than",
+                        "Hysteresis": 400.0,
+                        "Name": "upper critical",
+                        "Severity": 1,
+                        "Value": 20000
+                    },
+                    {
+                        "Direction": "less than",
+                        "Hysteresis": 16.0,
+                        "Name": "lower critical",
+                        "Severity": 1,
+                        "Value": 800
+                    }
+                ],
+                "Type": "I2CFan"
+            },
+            {
+                "Address": "0x5e",
+                "Bus": "$bus",
+                "Connector": {
+                    "Name": "FCB_$bus - 15 FAN $bus * 4 - 64 + 3 TACH_IL",
+                    "Pwm": 2,
+                    "PwmName": "FCB_$bus - 15 FAN_PWM",
+                    "Tachs": [
+                        2
+                    ]
+                },
+                "Index": 2,
+                "Name": "FCB_$bus - 15 FAN $bus * 4 - 64 + 3 TACH_IL_SPEED_RPM",
+                "PowerState": "Always",
+                "Thresholds": [
+                    {
+                        "Direction": "greater than",
+                        "Hysteresis": 400.0,
+                        "Name": "upper critical",
+                        "Severity": 1,
+                        "Value": 20000
+                    },
+                    {
+                        "Direction": "less than",
+                        "Hysteresis": 16.0,
+                        "Name": "lower critical",
+                        "Severity": 1,
+                        "Value": 800
+                    }
+                ],
+                "Type": "I2CFan"
+            },
+            {
+                "Address": "0x5e",
+                "Bus": "$bus",
+                "Connector": {
+                    "Name": "FCB_$bus - 15 FAN $bus * 4 - 64 + 3 TACH_OL",
+                    "Pwm": 2,
+                    "PwmName": "FCB_$bus - 15 FAN_PWM",
+                    "Tachs": [
+                        3
+                    ]
+                },
+                "Index": 3,
+                "Name": "FCB_$bus - 15 FAN $bus * 4 - 64 + 3 TACH_OL_SPEED_RPM",
+                "PowerState": "Always",
+                "Thresholds": [
+                    {
+                        "Direction": "greater than",
+                        "Hysteresis": 400.0,
+                        "Name": "upper critical",
+                        "Severity": 1,
+                        "Value": 20000
+                    },
+                    {
+                        "Direction": "less than",
+                        "Hysteresis": 16.0,
+                        "Name": "lower critical",
+                        "Severity": 1,
+                        "Value": 800
+                    }
+                ],
+                "Type": "I2CFan"
+            },
+            {
+                "Address": "0x5e",
+                "Bus": "$bus",
+                "Connector": {
+                    "Name": "FCB_$bus - 15 FAN $bus * 4 - 64 + 4 TACH_IL",
+                    "Pwm": 2,
+                    "PwmName": "FCB_$bus - 15 FAN_PWM",
+                    "Tachs": [
+                        0
+                    ]
+                },
+                "Index": 0,
+                "Name": "FCB_$bus - 15 FAN $bus * 4 - 64 + 4 TACH_IL_SPEED_RPM",
+                "PowerState": "Always",
+                "Thresholds": [
+                    {
+                        "Direction": "greater than",
+                        "Hysteresis": 400.0,
+                        "Name": "upper critical",
+                        "Severity": 1,
+                        "Value": 20000
+                    },
+                    {
+                        "Direction": "less than",
+                        "Hysteresis": 16.0,
+                        "Name": "lower critical",
+                        "Severity": 1,
+                        "Value": 800
+                    }
+                ],
+                "Type": "I2CFan"
+            },
+            {
+                "Address": "0x5e",
+                "Bus": "$bus",
+                "Connector": {
+                    "Name": "FCB_$bus - 15 FAN $bus * 4 - 64 + 4 TACH_OL",
+                    "Pwm": 2,
+                    "PwmName": "FCB_$bus - 15 FAN_PWM",
+                    "Tachs": [
+                        1
+                    ]
+                },
+                "Index": 1,
+                "Name": "FCB_$bus - 15 FAN $bus * 4 - 64 + 4 TACH_OL_SPEED_RPM",
+                "PowerState": "Always",
+                "Thresholds": [
+                    {
+                        "Direction": "greater than",
+                        "Hysteresis": 400.0,
+                        "Name": "upper critical",
+                        "Severity": 1,
+                        "Value": 20000
+                    },
+                    {
+                        "Direction": "less than",
+                        "Hysteresis": 16.0,
+                        "Name": "lower critical",
+                        "Severity": 1,
+                        "Value": 800
+                    }
+                ],
+                "Type": "I2CFan"
+            },
+            {
+                "Address": "0x40",
+                "Bus": "$bus",
+                "Labels": [
+                    "in1",
+                    "curr1"
+                ],
+                "Name": "FCB_$bus - 15 FAN_$bus * 4 - 64 + 1",
+                "Thresholds": [
+                    {
+                        "Direction": "less than",
+                        "Hysteresis": 0.969,
+                        "Label": "in1",
+                        "Name": "lower critical",
+                        "Severity": 1,
+                        "Value": 48.45
+                    },
+                    {
+                        "Direction": "greater than",
+                        "Hysteresis": 1.067,
+                        "Label": "in1",
+                        "Name": "upper critical",
+                        "Severity": 1,
+                        "Value": 53.35
+                    },
+                    {
+                        "Direction": "greater than",
+                        "Hysteresis": 0.14,
+                        "Label": "curr1",
+                        "Name": "upper critical",
+                        "Severity": 1,
+                        "Value": 7.0
+                    }
+                ],
+                "Type": "INA238",
+                "curr1_Name": "FCB_$bus - 15 FAN $bus * 4 - 64 + 1 CURR_A",
+                "in1_Name": "FCB_$bus - 15 FAN $bus * 4 - 64 + 1 VOLT_V"
+            },
+            {
+                "Address": "0x41",
+                "Bus": "$bus",
+                "Labels": [
+                    "in1",
+                    "curr1"
+                ],
+                "Name": "FCB_$bus - 15 FAN_$bus * 4 - 64 + 2",
+                "Thresholds": [
+                    {
+                        "Direction": "less than",
+                        "Hysteresis": 0.969,
+                        "Label": "in1",
+                        "Name": "lower critical",
+                        "Severity": 1,
+                        "Value": 48.45
+                    },
+                    {
+                        "Direction": "greater than",
+                        "Hysteresis": 1.067,
+                        "Label": "in1",
+                        "Name": "upper critical",
+                        "Severity": 1,
+                        "Value": 53.35
+                    },
+                    {
+                        "Direction": "greater than",
+                        "Hysteresis": 0.14,
+                        "Label": "curr1",
+                        "Name": "upper critical",
+                        "Severity": 1,
+                        "Value": 7.0
+                    }
+                ],
+                "Type": "INA238",
+                "curr1_Name": "FCB_$bus - 15 FAN $bus * 4 - 64 + 2 CURR_A",
+                "in1_Name": "FCB_$bus - 15 FAN $bus * 4 - 64 + 2 VOLT_V"
+            },
+            {
+                "Address": "0x44",
+                "Bus": "$bus",
+                "Labels": [
+                    "in1",
+                    "curr1"
+                ],
+                "Name": "FCB_$bus - 15 FAN_$bus * 4 - 64 + 3",
+                "Thresholds": [
+                    {
+                        "Direction": "less than",
+                        "Hysteresis": 0.969,
+                        "Label": "in1",
+                        "Name": "lower critical",
+                        "Severity": 1,
+                        "Value": 48.45
+                    },
+                    {
+                        "Direction": "greater than",
+                        "Hysteresis": 1.067,
+                        "Label": "in1",
+                        "Name": "upper critical",
+                        "Severity": 1,
+                        "Value": 53.35
+                    },
+                    {
+                        "Direction": "greater than",
+                        "Hysteresis": 0.14,
+                        "Label": "curr1",
+                        "Name": "upper critical",
+                        "Severity": 1,
+                        "Value": 7.0
+                    }
+                ],
+                "Type": "INA238",
+                "curr1_Name": "FCB_$bus - 15 FAN $bus * 4 - 64 + 3 CURR_A",
+                "in1_Name": "FCB_$bus - 15 FAN $bus * 4 - 64 + 3 VOLT_V"
+            },
+            {
+                "Address": "0x45",
+                "Bus": "$bus",
+                "Labels": [
+                    "in1",
+                    "curr1"
+                ],
+                "Name": "FCB_$bus - 15 FAN_$bus * 4 - 64 + 4",
+                "Thresholds": [
+                    {
+                        "Direction": "less than",
+                        "Hysteresis": 0.969,
+                        "Label": "in1",
+                        "Name": "lower critical",
+                        "Severity": 1,
+                        "Value": 48.45
+                    },
+                    {
+                        "Direction": "greater than",
+                        "Hysteresis": 1.067,
+                        "Label": "in1",
+                        "Name": "upper critical",
+                        "Severity": 1,
+                        "Value": 53.35
+                    },
+                    {
+                        "Direction": "greater than",
+                        "Hysteresis": 0.14,
+                        "Label": "curr1",
+                        "Name": "upper critical",
+                        "Severity": 1,
+                        "Value": 7.0
+                    }
+                ],
+                "Type": "INA238",
+                "curr1_Name": "FCB_$bus - 15 FAN $bus * 4 - 64 + 4 CURR_A",
+                "in1_Name": "FCB_$bus - 15 FAN $bus * 4 - 64 + 4 VOLT_V"
+            },
+            {
+                "Address": "0x49",
+                "Bus": "$bus",
+                "Labels": [
+                    "temp1"
+                ],
+                "Name": "FCB_$bus - 15 T_SENSE",
+                "Type": "INA238",
+                "temp1_Name": "FCB_$bus - 15 T_SENSE_TEMP_C"
+            },
+            {
+                "Address": "0x4b",
+                "Bus": "$bus",
+                "Name": "FCB_$bus - 15 TEMP_C",
+                "Thresholds": [
+                    {
+                        "Direction": "greater than",
+                        "Hysteresis": 1.6,
+                        "Name": "upper critical",
+                        "Severity": 1,
+                        "Value": 80
+                    },
+                    {
+                        "Direction": "less than",
+                        "Hysteresis": 0.0,
+                        "Name": "lower critical",
+                        "Severity": 1,
+                        "Value": 0
+                    }
+                ],
+                "Type": "TMP75"
+            }
+        ],
+        "Name": "Minerva Fan Board 6",
+        "Probe": [
             "xyz.openbmc_project.FruDevice({'BOARD_PRODUCT_NAME': 'Minerva Fan Board.*', 'PRODUCT_MANUFACTURER': 'Quanta', 'BUS': 21, 'BOARD_INFO_AM4': 'pwr-ti'})",
             "OR",
-            "xyz.openbmc_project.FruDevice({'BOARD_PRODUCT_NAME': 'Minerva Fan Board.*', 'PRODUCT_MANUFACTURER': 'Quanta', 'BUS': 20, 'BOARD_PART_NUMBER': '3XF0MFB0010'})",
-            "OR",
-            "xyz.openbmc_project.FruDevice({'BOARD_PRODUCT_NAME': 'Minerva Fan Board.*', 'PRODUCT_MANUFACTURER': 'Quanta', 'BUS': 21, 'BOARD_PART_NUMBER': '3XF0MFB0010'})"
+            "xyz.openbmc_project.FruDevice({'BOARD_PRODUCT_NAME': 'Minerva Fan Board DVT', 'PRODUCT_MANUFACTURER': 'Quanta', 'BUS': 21, 'BOARD_PART_NUMBER': '3XF0MFB0010'})"
         ],
         "Type": "Board",
         "xyz.openbmc_project.Inventory.Decorator.Asset": {