2 files changed, 24 insertions, 3 deletions
diff --git a/src/usr/targeting/common/xmltohb/attribute_types.xml b/src/usr/targeting/common/xmltohb/attribute_types.xml
index cf03952ea..2d04775d7 100644
--- a/src/usr/targeting/common/xmltohb/attribute_types.xml
+++ b/src/usr/targeting/common/xmltohb/attribute_types.xml
@@ -32084,6 +32084,7 @@ Measured in GB</description>
     <simpleType>
         <uint8_t>
         </uint8_t>
+        <array>2</array>
     </simpleType>
     <persistency>volatile-zeroed</persistency>
     <readable/>
@@ -32095,6 +32096,25 @@ Measured in GB</description>
 </attribute>
 
 <attribute>
+    <id>MSS_MVPD_FWMS</id>
+    <description>
+        Mark store records from MPVD Lx keyword
+    </description>
+    <simpleType>
+        <uint32_t>
+        </uint32_t>
+        <array>2,8</array>
+    </simpleType>
+    <persistency>volatile-zeroed</persistency>
+    <readable/>
+    <writeable/>
+    <hwpfToHbAttrMap>
+        <id>ATTR_MSS_MVPD_FWMS</id>
+        <macro>DIRECT</macro>
+    </hwpfToHbAttrMap>
+</attribute>
+
+<attribute>
     <id>MSS_VCCD_OVERRIDE</id>
     <description>
         Whether or not to override VCCD. Defaults to no.
@@ -32256,6 +32276,7 @@ Measured in GB</description>
     </hwpfToHbAttrMap>
 </attribute>
 
+<!-- @fixme RTC:166754 Remove old attribute -->
 <attribute>
     <id>DO_MSS_VCCD_OVERRIDE</id>
     <description>
@@ -32293,6 +32314,7 @@ Measured in GB</description>
     </hwpfToHbAttrMap>
 </attribute>
 
+<!-- @fixme RTC:166754 Remove old attribute -->
 <attribute>
     <id>DO_MSS_VREG_COARSE</id>
     <description>
diff --git a/src/usr/targeting/common/xmltohb/target_types.xml b/src/usr/targeting/common/xmltohb/target_types.xml
index 2a2fd82d7..413fc5be1 100755
--- a/src/usr/targeting/common/xmltohb/target_types.xml
+++ b/src/usr/targeting/common/xmltohb/target_types.xml
@@ -884,7 +884,6 @@
     <attribute><id>IVRM_STABILIZATION_DELAY_NS</id></attribute>
     <attribute><id>SYSTEM_RESCLK_ENABLE</id></attribute>
     <attribute><id>MSS_MRW_REFRESH_RATE_REQUEST</id></attribute>
-    <attribute><id>MSS_VREF_DAC_NIBBLE</id></attribute>
     <attribute><id>MSS_VCCD_OVERRIDE</id></attribute>
     <attribute><id>RAW_MTM</id></attribute>
     <attribute><id>MSS_MEM_PORT_POS_OF_FAIL_THROTTLE</id></attribute>
@@ -1279,9 +1278,7 @@
     <attribute><id>SECUREBOOT_PROTECT_DECONFIGURED_TPM</id></attribute>
     <!-- START memory workaround for DD1.02 -->
     <attribute><id>DO_MSS_WR_VREF</id></attribute>
-    <attribute><id>DO_MSS_VCCD_OVERRIDE</id></attribute>
     <attribute><id>DO_MSS_VREF_DAC</id></attribute>
-    <attribute><id>DO_MSS_VREG_COARSE</id></attribute>
     <attribute><id>DO_MSS_TRAINING_BAD_BITS</id></attribute>
     <!-- END memory workaround for DD1.02 -->
 
@@ -1820,6 +1817,8 @@
     <attribute><id>EFF_DRAM_RTT_NOM</id></attribute>
     <attribute><id>EFF_DRAM_RTT_WR</id></attribute>
     <attribute><id>EFF_DRAM_RTT_PARK</id></attribute>
+    <attribute><id>MSS_VREF_DAC_NIBBLE</id></attribute>
+    <attribute><id>MSS_MVPD_FWMS</id></attribute>
 </targetType>
 
 <targetType>