configurations: yosemite5: add TPM and mb VR firmware configuration

Add firmware configuration for the TPM and motherboard VRs to support
the new firmware updater. The TPM firmware manager was introduced in
[1], support for MPS MP2X6XX VR firmware update was added in [2], and
the PDI for Yosemite5 TPM and motherboard VRs was introduced in [3].

Additionally, move the motherboard CPLD firmware configuration from the
SCM configuration file to the motherboard configuration file for better
organization.

[1] https://gerrit.openbmc.org/c/openbmc/phosphor-bmc-code-mgmt/+/82417
[2] https://gerrit.openbmc.org/c/openbmc/phosphor-bmc-code-mgmt/+/82113
[3] https://gerrit.openbmc.org/c/openbmc/phosphor-dbus-interfaces/+/83529

Change-Id: I0b0f8bfef10eb21221fc9be57db56c4000531408
Signed-off-by: Kevin Tung <kevin.tung.openbmc@gmail.com>
diff --git a/configurations/meta/yv5/yosemite5_mb.json b/configurations/meta/yv5/yosemite5_mb.json
index f245e1b..7ec2e22 100644
--- a/configurations/meta/yv5/yosemite5_mb.json
+++ b/configurations/meta/yv5/yosemite5_mb.json
@@ -529,6 +529,46 @@
             "Type": "LM75A"
         },
         {
+            "Address": "0x40",
+            "Bus": 0,
+            "FirmwareInfo": {
+                "CompatibleHardware": "com.meta.Hardware.Yosemite5.CPLD.LCMXO3D_9400HC_mb",
+                "VendorIANA": 40981
+            },
+            "Name": "Yosemite5_MB_CPLD",
+            "Type": "LatticeLCMXO3D_9400Firmware"
+        },
+        {
+            "Address": "0x4d",
+            "Bus": 11,
+            "FirmwareInfo": {
+                "CompatibleHardware": "com.meta.Hardware.Yosemite5.VR.MP29612A_pvddcr_soc",
+                "VendorIANA": 40981
+            },
+            "Name": "Yosemite5_MB_VR_SOC",
+            "Type": "MP2X6XXFirmware"
+        },
+        {
+            "Address": "0x4e",
+            "Bus": 11,
+            "FirmwareInfo": {
+                "CompatibleHardware": "com.meta.Hardware.Yosemite5.VR.MP29612A_pvddcr_cpu1",
+                "VendorIANA": 40981
+            },
+            "Name": "Yosemite5_MB_VR_CPU1",
+            "Type": "MP2X6XXFirmware"
+        },
+        {
+            "Address": "0x4f",
+            "Bus": 11,
+            "FirmwareInfo": {
+                "CompatibleHardware": "com.meta.Hardware.Yosemite5.VR.MP2869A_pvddcr_cpu0",
+                "VendorIANA": 40981
+            },
+            "Name": "Yosemite5_MB_VR_CPU0",
+            "Type": "MP2X6XXFirmware"
+        },
+        {
             "Address": "0x6a",
             "Bus": 13,
             "Name": "MB_E1S0_TEMP_C",
diff --git a/configurations/meta/yv5/yosemite5_scm.json b/configurations/meta/yv5/yosemite5_scm.json
index 493eb93..df8e4ce 100644
--- a/configurations/meta/yv5/yosemite5_scm.json
+++ b/configurations/meta/yv5/yosemite5_scm.json
@@ -218,16 +218,6 @@
         },
         {
             "Address": "0x40",
-            "Bus": 0,
-            "FirmwareInfo": {
-                "CompatibleHardware": "com.meta.Hardware.Yosemite5.CPLD.LCMXO3D_9400HC_mb",
-                "VendorIANA": 40981
-            },
-            "Name": "Yosemite5_MB_CPLD",
-            "Type": "LatticeLCMXO3D_9400Firmware"
-        },
-        {
-            "Address": "0x40",
             "Bus": 7,
             "FirmwareInfo": {
                 "CompatibleHardware": "com.meta.Hardware.Yosemite5.CPLD.LCMXO3D_9400HC_scm",
@@ -257,6 +247,15 @@
                 }
             ],
             "Type": "TMP75"
+        },
+        {
+            "FirmwareInfo": {
+                "CompatibleHardware": "com.meta.Hardware.Yosemite5.TPM.BMC",
+                "VendorIANA": 40981
+            },
+            "Name": "Yosemite5_TPM",
+            "TPMIndex": 0,
+            "Type": "TPM2Firmware"
         }
     ],
     "Name": "Yosemite5 SCM",