commit 48627a0de853979ab2ca94f6ae8f4f65a4f3483c
author Yang Chen <yang.chen@quantatw.com> Thu Mar 13 21:43:34 2025 +0800
committer Yang Chen <yang.chen@quantatw.com> Tue Mar 18 13:14:20 2025 +0000
tree 10b1a7951d4ca4f7d7f7ecc6199dc5c197274c2e
parent d64855f71747d1eea0b36fc05750fb2a3a9835ab

configurations: ventura: modify fan board probe condition

Change the probe condition from multiple line to one line on the
ventura fan board main/second source to avoid the duplicate probe
problem.

Change-Id: Ifeb1adb4efc11712ee3f251d1f981052183c605d
Signed-off-by: Yang Chen <yang.chen@quantatw.com>

configurations/meta/ventura_fanboard_adc_max.json

diff --git a/configurations/meta/ventura_fanboard_adc_max.json b/configurations/meta/ventura_fanboard_adc_max.json
index ad97d94..2e49899 100644
--- a/configurations/meta/ventura_fanboard_adc_max.json
+++ b/configurations/meta/ventura_fanboard_adc_max.json
@@ -175,11 +175,7 @@
             }
         ],
         "Name": "Ventura Fan Board 0",
-        "Probe": [
-            "xyz.openbmc_project.FruDevice({'BOARD_PRODUCT_NAME': 'Ventura FAN Board', 'BUS': 16})",
-            "AND",
-            "xyz.openbmc_project.FruDevice({'BOARD_INFO_AM4': 'adc-max'})"
-        ],
+        "Probe": "xyz.openbmc_project.FruDevice({'BOARD_PRODUCT_NAME': 'Ventura FAN Board', 'BUS': 16, 'BOARD_INFO_AM4': 'adc-max'})",
         "Type": "Board",
         "xyz.openbmc_project.Inventory.Decorator.Asset": {
             "BuildDate": "$BOARD_MANUFACTURE_DATE",
@@ -372,11 +368,7 @@
             }
         ],
         "Name": "Ventura Fan Board 1",
-        "Probe": [
-            "xyz.openbmc_project.FruDevice({'BOARD_PRODUCT_NAME': 'Ventura FAN Board', 'BUS': 17})",
-            "AND",
-            "xyz.openbmc_project.FruDevice({'BOARD_INFO_AM4': 'adc-max'})"
-        ],
+        "Probe": "xyz.openbmc_project.FruDevice({'BOARD_PRODUCT_NAME': 'Ventura FAN Board', 'BUS': 17, 'BOARD_INFO_AM4': 'adc-max'})",
         "Type": "Board",
         "xyz.openbmc_project.Inventory.Decorator.Asset": {
             "BuildDate": "$BOARD_MANUFACTURE_DATE",

configurations/meta/ventura_fanboard_adc_tic.json

diff --git a/configurations/meta/ventura_fanboard_adc_tic.json b/configurations/meta/ventura_fanboard_adc_tic.json
index 515ac04..c19ef96 100644
--- a/configurations/meta/ventura_fanboard_adc_tic.json
+++ b/configurations/meta/ventura_fanboard_adc_tic.json
@@ -175,11 +175,7 @@
             }
         ],
         "Name": "Ventura Fan Board 0",
-        "Probe": [
-            "xyz.openbmc_project.FruDevice({'BOARD_PRODUCT_NAME': 'Ventura FAN Board', 'BUS': 16})",
-            "AND",
-            "xyz.openbmc_project.FruDevice({'BOARD_INFO_AM4': 'adc-tic'})"
-        ],
+        "Probe": "xyz.openbmc_project.FruDevice({'BOARD_PRODUCT_NAME': 'Ventura FAN Board', 'BUS': 16, 'BOARD_INFO_AM4': 'adc-tic'})",
         "Type": "Board",
         "xyz.openbmc_project.Inventory.Decorator.Asset": {
             "BuildDate": "$BOARD_MANUFACTURE_DATE",
@@ -372,11 +368,7 @@
             }
         ],
         "Name": "Ventura Fan Board 1",
-        "Probe": [
-            "xyz.openbmc_project.FruDevice({'BOARD_PRODUCT_NAME': 'Ventura FAN Board', 'BUS': 17})",
-            "AND",
-            "xyz.openbmc_project.FruDevice({'BOARD_INFO_AM4': 'adc-tic'})"
-        ],
+        "Probe": "xyz.openbmc_project.FruDevice({'BOARD_PRODUCT_NAME': 'Ventura FAN Board', 'BUS': 17, 'BOARD_INFO_AM4': 'adc-tic'})",
         "Type": "Board",
         "xyz.openbmc_project.Inventory.Decorator.Asset": {
             "BuildDate": "$BOARD_MANUFACTURE_DATE",