commit 1f0743c1bcaaa0c03601ec57770fbcec2276efbe
author Feist, James <james.feist@intel.com> Tue Mar 27 08:26:33 2018 -0700
committer Gerrit Code Review <gerrit@fmygit6002.fm.intel.com> Tue Mar 27 08:26:33 2018 -0700
tree acc5eacf8a0c698857dcf1603e35dccb036fcdce
parent 3936e7a5178e996be235c39e5036781ff731c84a
parent 777bf7988bacae7bc0bd5ddc85bb9dd25fb87fc0

Merge "Add another riser support for 2U boards"

configurations/2Ux8 Riser.json

diff --git a/configurations/2Ux8 Riser.json b/configurations/2Ux8 Riser.json
index 572c10f..4b613d1 100644
--- a/configurations/2Ux8 Riser.json
+++ b/configurations/2Ux8 Riser.json
@@ -97,6 +97,6 @@
             }
         ],
         "name": "2Ux8 Riser 2",
-        "probe": "xyz.openbmc_project.FruDevice({'BOARD_PRODUCT_NAME': 'A2UL8RISER2', 'ADDRESS': '0x50'})"
+        "probe": "xyz.openbmc_project.FruDevice({'BOARD_PRODUCT_NAME': 'A2UL8RISER2', 'ADDRESS': '0x51'})"
     }
 ]
\ No newline at end of file

configurations/R2000 Chassis.json

diff --git a/configurations/R2000 Chassis.json b/configurations/R2000 Chassis.json
index 05d191f..b2d4893 100644
--- a/configurations/R2000 Chassis.json
+++ b/configurations/R2000 Chassis.json
@@ -130,7 +130,7 @@
     "probe": [
         "FOUND('WFP Baseboard')",
         "AND",
-        "xyz.openbmc_project.FruDevice({'BOARD_PRODUCT_NAME': 'A2UL16RISER\\d'})",
+        "xyz.openbmc_project.FruDevice({'BOARD_PRODUCT_NAME': 'A2UL\\d+RISER\\d'})",
         "MATCH_ONE"
     ]
 }
\ No newline at end of file