configurations: catalina_pdb: refine probe conditions
Both `BOARD_PRODUCT_NAME` and `BOARD_INFO_AM4` are sourced from the same
PDB FRU device.
Combining the two detection conditions reduces probe complexity and
prevents potential detection issues that the "AND" condition could
introduce.
Signed-off-by: Potin Lai <potin.lai@quantatw.com>
Change-Id: Ibd995ed2464e931e11174dd822086f8f89f8ff63
diff --git a/configurations/meta/catalina_pdb_hsc_ltc_fsc_max_vr_delta_gndsen_ina_p12vsen_ina_p12vfan_mps.json b/configurations/meta/catalina_pdb_hsc_ltc_fsc_max_vr_delta_gndsen_ina_p12vsen_ina_p12vfan_mps.json
index 2b06a0c..b0f6216 100644
--- a/configurations/meta/catalina_pdb_hsc_ltc_fsc_max_vr_delta_gndsen_ina_p12vsen_ina_p12vfan_mps.json
+++ b/configurations/meta/catalina_pdb_hsc_ltc_fsc_max_vr_delta_gndsen_ina_p12vsen_ina_p12vfan_mps.json
@@ -1208,11 +1208,7 @@
}
],
"Name": "Catalina PDB",
- "Probe": [
- "xyz.openbmc_project.FruDevice({'BOARD_PRODUCT_NAME': 'Catalina PDB '})",
- "AND",
- "xyz.openbmc_project.FruDevice({'BOARD_INFO_AM4': 'hsc-ltc fsc-max vr-delta gndsen-ina p12vsen-ina p12vfan-mps'})"
- ],
+ "Probe": "xyz.openbmc_project.FruDevice({'BOARD_PRODUCT_NAME': 'Catalina PDB ', 'BOARD_INFO_AM4': 'hsc-ltc fsc-max vr-delta gndsen-ina p12vsen-ina p12vfan-mps'})",
"Type": "Board",
"xyz.openbmc_project.Inventory.Decorator.Asset": {
"BuildDate": "$BOARD_MANUFACTURE_DATE",
diff --git a/configurations/meta/catalina_pdb_hsc_ltc_fsc_max_vr_raa_gndsen_ina_p12vsen_ina_p12vfan_mps.json b/configurations/meta/catalina_pdb_hsc_ltc_fsc_max_vr_raa_gndsen_ina_p12vsen_ina_p12vfan_mps.json
index d4ccfbd..75d0fc5 100644
--- a/configurations/meta/catalina_pdb_hsc_ltc_fsc_max_vr_raa_gndsen_ina_p12vsen_ina_p12vfan_mps.json
+++ b/configurations/meta/catalina_pdb_hsc_ltc_fsc_max_vr_raa_gndsen_ina_p12vsen_ina_p12vfan_mps.json
@@ -1118,11 +1118,7 @@
}
],
"Name": "Catalina PDB",
- "Probe": [
- "xyz.openbmc_project.FruDevice({'BOARD_PRODUCT_NAME': 'Catalina PDB '})",
- "AND",
- "xyz.openbmc_project.FruDevice({'BOARD_INFO_AM4': 'hsc-ltc fsc-max vr-raa gndsen-ina p12vsen-ina p12vfan-mps'})"
- ],
+ "Probe": "xyz.openbmc_project.FruDevice({'BOARD_PRODUCT_NAME': 'Catalina PDB ', 'BOARD_INFO_AM4': 'hsc-ltc fsc-max vr-raa gndsen-ina p12vsen-ina p12vfan-mps'})",
"Type": "Board",
"xyz.openbmc_project.Inventory.Decorator.Asset": {
"BuildDate": "$BOARD_MANUFACTURE_DATE",
diff --git a/configurations/meta/catalina_pdb_hsc_xdp_fsc_nct_vr_raa_gndsen_max_p12vsen_isl_p12vfan_rtt.json b/configurations/meta/catalina_pdb_hsc_xdp_fsc_nct_vr_raa_gndsen_max_p12vsen_isl_p12vfan_rtt.json
index 551add4..77dd554 100644
--- a/configurations/meta/catalina_pdb_hsc_xdp_fsc_nct_vr_raa_gndsen_max_p12vsen_isl_p12vfan_rtt.json
+++ b/configurations/meta/catalina_pdb_hsc_xdp_fsc_nct_vr_raa_gndsen_max_p12vsen_isl_p12vfan_rtt.json
@@ -1118,11 +1118,7 @@
}
],
"Name": "Catalina PDB",
- "Probe": [
- "xyz.openbmc_project.FruDevice({'BOARD_PRODUCT_NAME': 'Catalina PDB '})",
- "AND",
- "xyz.openbmc_project.FruDevice({'BOARD_INFO_AM4': 'hsc-xdp fsc-nct vr-raa gndsen-max p12vsen-isl p12vfan-rtt'})"
- ],
+ "Probe": "xyz.openbmc_project.FruDevice({'BOARD_PRODUCT_NAME': 'Catalina PDB ', 'BOARD_INFO_AM4': 'hsc-xdp fsc-nct vr-raa gndsen-max p12vsen-isl p12vfan-rtt'})",
"Type": "Board",
"xyz.openbmc_project.Inventory.Decorator.Asset": {
"BuildDate": "$BOARD_MANUFACTURE_DATE",