X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=blobdiff_plain;f=Tools%2FXMLSchema%2FFrameworkDataElements.xsd;h=67fd6a893d191d14dc34dd6b6729b9ec605a0284;hp=e5b5dc1ee7e362fcd8a4771138bb7fa85b282638;hb=0675decb4f05fb9b8bc7ef60ba85dd3d2836160c;hpb=0df1e610850bf1d0f5192f952a9bf5c360de3146

diff --git a/Tools/XMLSchema/FrameworkDataElements.xsd b/Tools/XMLSchema/FrameworkDataElements.xsd
index e5b5dc1ee7..67fd6a893d 100644
--- a/Tools/XMLSchema/FrameworkDataElements.xsd
+++ b/Tools/XMLSchema/FrameworkDataElements.xsd
@@ -17,6 +17,7 @@
     </xs:annotation>
     <xs:include schemaLocation="NamingConvention.xsd"/>
     <xs:include schemaLocation="FrameworkDataTypes.xsd"/>
+    <xs:include schemaLocation="FrameworkDataAttributes.xsd"/>
     <xs:element name="Abstract">
         <xs:annotation>
             <xs:documentation xml:lang="en">Abstract is valid for all Description Files</xs:documentation>
@@ -25,7 +26,7 @@
         <xs:complexType>
             <xs:simpleContent>
                 <xs:extension base="Sentence">
-                    <xs:attribute name="URL" type="xs:anyURI"/>
+                    <xs:attribute name="URL" type="xs:anyURI" use="optional"/>
                 </xs:extension>
             </xs:simpleContent>
         </xs:complexType>
@@ -172,6 +173,7 @@
     <xs:element name="Constructor" type="C_Name"/>
     <xs:element name="Copyright" type="Sentence"/>
     <xs:element name="Created" type="DateType"/>
+    <xs:element name="CreatedDate" type="DateType"/>
     <xs:element name="CreatedBy" type="UserName"/>
     <xs:element name="DataHubs">
         <xs:annotation>
@@ -320,8 +322,9 @@
             <xs:documentation xml:lang="en">This is a list of Extern statements, right now, only Driver Binding information is provided.</xs:documentation>
         </xs:annotation>
         <xs:complexType>
-            <xs:sequence minOccurs="1" maxOccurs="unbounded">
-                <xs:element name="Extern">
+            <xs:sequence minOccurs="1">
+                <xs:element minOccurs="0" maxOccurs="1" name="PcdIsDriver" type="PcdDriverTypes"/>
+                <xs:element minOccurs="0" maxOccurs="unbounded" name="Extern">
                     <xs:complexType>
                         <xs:choice minOccurs="1">
                             <xs:sequence minOccurs="0" maxOccurs="1">
@@ -626,6 +629,7 @@
         <xs:complexType>
             <xs:sequence minOccurs="1" maxOccurs="unbounded">
                 <xs:element minOccurs="0" maxOccurs="unbounded" ref="PackageName"/>
+                <!-- remove Arch element, start using the Arch attribute for the PackageName element above. -->
                 <xs:element minOccurs="0" maxOccurs="unbounded" name="Arch">
                     <xs:complexType>
                         <xs:sequence minOccurs="1">
@@ -640,19 +644,20 @@
     <xs:element name="InstalledDate" type="DateType"/>
     <xs:element name="Libraries">
         <xs:annotation>
-            <xs:documentation xml:lang="en">Different Instances of Libraries</xs:documentation>
+            <xs:documentation xml:lang="en">Different (Module)  Instances of Libraries used ONLY in FPD Files.</xs:documentation>
         </xs:annotation>
         <xs:complexType>
             <xs:sequence minOccurs="1">
                 <xs:element minOccurs="0" maxOccurs="unbounded" name="Library">
                     <xs:complexType>
                         <xs:simpleContent>
-                            <xs:extension base="BaseNameConvention">
+                            <xs:extension base="xs:NCName">
                                 <xs:attributeGroup ref="LibraryAttributes"/>
                             </xs:extension>
                         </xs:simpleContent>
                     </xs:complexType>
                 </xs:element>
+                <!-- remove Arch Element HERE, start using the Arch attribute in Library element above. -->
                 <xs:element minOccurs="0" maxOccurs="unbounded" name="Arch">
                     <xs:complexType>
                         <xs:choice minOccurs="1" maxOccurs="unbounded">
@@ -669,17 +674,20 @@
                         <xs:attribute name="ArchType" type="SupportedArchitectures"/>
                     </xs:complexType>
                 </xs:element>
+                <!-- /remove Arch Element -->
             </xs:sequence>
         </xs:complexType>
     </xs:element>
     <xs:element name="LibraryClass">
         <xs:annotation>
-            <xs:documentation xml:lang="en">Define in the MSA and/or SPD, what class of library is being produced by a library module - for components, it can also specify what class of library is consumed.</xs:documentation>
+            <xs:documentation xml:lang="en">Used in MSA files. This defines what class of library is being supported = produced (library module) or consumed by a module.</xs:documentation>
         </xs:annotation>
         <xs:complexType>
             <xs:simpleContent>
                 <xs:extension base="BaseNameConvention">
-                    <xs:attribute name="Usage" type="LibraryUsage" use="optional"/>
+                    <xs:attribute name="Usage" type="LibraryUsage" use="required"/>
+                    <xs:attribute name="RecommendedInstance" type="xs:NCName" use="optional"/>
+                    <xs:attribute name="RecommendedInstanceGuid" type="GuidType" use="optional"/>
                 </xs:extension>
             </xs:simpleContent>
         </xs:complexType>
@@ -690,7 +698,19 @@
         </xs:annotation>
         <xs:complexType>
             <xs:sequence minOccurs="0">
-                <xs:element minOccurs="1" maxOccurs="1" ref="LibraryClass"/>
+                <xs:element minOccurs="1" maxOccurs="1" name="LibraryClass">
+                    <xs:annotation>
+                        <xs:documentation xml:lang="en">Used in MSA and SPD files. This defines what class of library is being supported = produced (library module) or consumed by a module.</xs:documentation>
+                    </xs:annotation>
+                    <xs:complexType>
+                        <xs:simpleContent>
+                            <xs:extension base="BaseNameConvention">
+                                <xs:attribute name="RecommendedInstance" type="xs:NCName" use="optional"/>
+                                <xs:attribute name="RecommendedInstanceGuid" type="GuidType" use="optional"/>
+                            </xs:extension>
+                        </xs:simpleContent>
+                    </xs:complexType>
+                </xs:element>
                 <xs:element minOccurs="1" maxOccurs="1" ref="IncludeHeader"/>
             </xs:sequence>
         </xs:complexType>
@@ -719,7 +739,7 @@
         <xs:complexType>
             <xs:simpleContent>
                 <xs:extension base="Paragraph">
-                    <xs:attribute name="URL" type="xs:anyURI"/>
+                    <xs:attribute name="URL" type="xs:anyURI" use="optional"/>
                 </xs:extension>
             </xs:simpleContent>
         </xs:complexType>
@@ -759,7 +779,7 @@
         </xs:annotation>
         <xs:complexType>
             <xs:simpleContent>
-                <xs:extension base="BaseNameConvention">
+                <xs:extension base="xs:NCName">
                     <xs:attributeGroup ref="ModuleNameAttributes"/>
                 </xs:extension>
             </xs:simpleContent>
@@ -776,7 +796,7 @@
             <xs:sequence minOccurs="1">
                 <xs:element minOccurs="0" maxOccurs="unbounded" name="MsaFile">
                     <xs:annotation>
-                        <xs:documentation xml:lang="en">Describe the valid content of a Surface Area Package Description (SPD) file</xs:documentation>
+                        <xs:documentation xml:lang="en">Surface Area Package Description (SPD) list of Module Surface Area files</xs:documentation>
                     </xs:annotation>
                     <xs:complexType>
                         <xs:sequence minOccurs="0" maxOccurs="1">
@@ -808,6 +828,24 @@
             </xs:sequence>
         </xs:complexType>
     </xs:element>
+    <xs:element name="MsaFileList">
+        <xs:annotation>
+            <xs:documentation xml:lang="en">Surface Area Package Description (SPD) list of Module Surface Area files</xs:documentation>
+        </xs:annotation>
+        <xs:complexType>
+            <xs:sequence>
+                <xs:element minOccurs="0" maxOccurs="unbounded" name="Filename">
+                    <xs:complexType>
+                        <xs:simpleContent>
+                            <xs:extension base="xs:anyURI">
+                                <xs:attributeGroup ref="ModuleNameSaAttributes"/>
+                            </xs:extension>
+                        </xs:simpleContent>
+                    </xs:complexType>
+                </xs:element>
+            </xs:sequence>
+        </xs:complexType>
+    </xs:element>
     <xs:element name="OutputDirectory">
         <xs:annotation>
             <xs:documentation xml:lang="en">Define where we want our output to go. The Attribute, IntermediateDirectories, default MODULE, says that intermediate files will be local to the module, versus a unified directory structure.</xs:documentation>
@@ -844,6 +882,7 @@
                         <xs:sequence>
                             <xs:element minOccurs="1" maxOccurs="1" ref="C_Name"/>
                             <xs:element minOccurs="1" maxOccurs="1" name="Token" type="HexDoubleWordDataType"/>
+                            <xs:element minOccurs="0" maxOccurs="1" name="TokenSpaceGuid" type="GuidType"/>
                             <xs:element minOccurs="1" maxOccurs="1" name="DatumType" type="PcdDataTypes"/>
                             <xs:element default="false" minOccurs="0" maxOccurs="1" name="HiiEnable" type="xs:boolean"/>
                             <xs:element default="false" minOccurs="0" maxOccurs="1" name="VpdEnable" type="xs:boolean"/>
@@ -871,6 +910,7 @@
                             <xs:element minOccurs="0" maxOccurs="1" ref="HelpText"/>
                         </xs:sequence>
                         <xs:attributeGroup ref="PcdAttributes"/>
+                        <xs:attribute name="PcdIsDriver" use="optional"/>
                     </xs:complexType>
                 </xs:element>
             </xs:sequence>
@@ -899,7 +939,7 @@
     </xs:element>
     <xs:element name="PackageList">
         <xs:annotation>
-            <xs:documentation xml:lang="en">This tag is used in the Framework Package Database File to track all packages installed in a workspace.</xs:documentation>
+            <xs:documentation xml:lang="en">This tag is used in the Framework Package Database File to track all packages installed in a workspace. (Database)</xs:documentation>
         </xs:annotation>
         <xs:complexType>
             <xs:sequence maxOccurs="unbounded">
@@ -910,8 +950,15 @@
                     <xs:complexType>
                         <xs:sequence maxOccurs="unbounded">
                             <xs:element minOccurs="0" maxOccurs="1" ref="PackageName"/>
-                            <xs:element minOccurs="1" maxOccurs="1" ref="Guid"/>
-                            <xs:element minOccurs="1" maxOccurs="1" ref="Version"/>
+                            <xs:choice minOccurs="1">
+                                <xs:element minOccurs="0" maxOccurs="1" ref="Guid"/>
+                                <!-- DO NOT USE Guid should be removed, use PackageGuid instead -->
+                                <xs:element minOccurs="0" maxOccurs="1" name="PackageGuid" type="GuidType"/>
+                            </xs:choice>
+                            <xs:choice minOccurs="1">
+                                <xs:element minOccurs="0" maxOccurs="1" ref="Version"/>
+                                <xs:element minOccurs="0" maxOccurs="1" name="PackageVersion" type="VersionDataType"/>
+                            </xs:choice>
                             <xs:element minOccurs="1" maxOccurs="1" ref="Path"/>
                             <xs:element minOccurs="1" maxOccurs="1" ref="InstalledDate"/>
                         </xs:sequence>
@@ -923,7 +970,7 @@
     </xs:element>
     <xs:element name="PackageName">
         <xs:annotation>
-            <xs:documentation xml:lang="en">This tag is used in the Package Surface Area Description File to track package dependencies for a module</xs:documentation>
+            <xs:documentation xml:lang="en">This tag is used in the Package Surface Area Description File to track package dependencies for a module (SPD) </xs:documentation>
         </xs:annotation>
         <xs:complexType>
             <xs:simpleContent>
@@ -976,6 +1023,7 @@
                                     </xs:simpleContent>
                                 </xs:complexType>
                             </xs:element>
+                            <xs:element minOccurs="0" maxOccurs="1" name="TokenSpaceGuid" type="GuidType"/>
                             <xs:element minOccurs="1" maxOccurs="1" name="DatumType" type="PcdDataTypes">
                                 <xs:annotation>
                                     <xs:documentation xml:lang="en">This specifies the size of the Pcd Datum. It is either 8, 16, 32 or 64 bits for values, 1 bit for BOOLEAN and variable length for elements defined as VOID*</xs:documentation>
@@ -1064,128 +1112,130 @@
                             <xs:element minOccurs="1" maxOccurs="1" name="DefaultValue" type="xs:normalizedString"/>
                         </xs:sequence>
                         <xs:attributeGroup ref="PcdAttributes"/>
-                        <xs:attribute name="PcdIsDriver" use="optional">
-                           <xs:simpleType>
-                             <xs:annotation>
-                               <xs:documentation xml:lang="en">This is an enumerated data type that will be used for DYNAMIC_EX, PEIM or DXE only</xs:documentation>
-                             </xs:annotation>
-                             <xs:restriction base="UCNameType">
-                               <xs:enumeration value="PEI_PCD_DRIVER"/>
-                               <xs:enumeration value="DXE_PCD_DRIVER"/>
-                             </xs:restriction>
-                           </xs:simpleType>
-                         </xs:attribute>
+                        <xs:attribute name="PcdIsDriver">
+                            <xs:simpleType>
+                                <xs:annotation>
+                                    <xs:documentation xml:lang="en">This is an enumerated data type that will be used for DYNAMIC_EX, PEIM or DXE only</xs:documentation>
+                                </xs:annotation>
+                                <xs:restriction base="UCNameType">
+                                    <xs:enumeration value="PEI_PCD_DRIVER"/>
+                                    <xs:enumeration value="DXE_PCD_DRIVER"/>
+                                </xs:restriction>
+                            </xs:simpleType>
+                        </xs:attribute>
                     </xs:complexType>
                 </xs:element>
             </xs:choice>
         </xs:complexType>
-    </xs:element> <!-- PcdBuildDeclarations -->
-  <xs:element name="PcdDynamicBuildDeclarations">
-    <xs:annotation>
-      <xs:documentation xml:lang="en">Child of Framework Platform Description (FPD)</xs:documentation>
-        <xs:documentation xml:lang="en">We permit the FPD to use an external XML file for PCD information or else the information must be contained within the XML data element, PcdBuildData.</xs:documentation>
-      </xs:annotation>
-      <xs:complexType>
-        <xs:sequence>
-          <xs:element minOccurs="0" maxOccurs="unbounded" name="PcdBuildData">
-            <xs:annotation>
-              <xs:documentation xml:lang="en">Child of PcdBuildDeclarations</xs:documentation>
-              <xs:documentation xml:lang="en">This is date element is used in the platform build description file and contains valid data for a Platform Build</xs:documentation>
-              <xs:documentation xml:lang="en">There is ONE required Attribute, ItemType</xs:documentation>
-            </xs:annotation>
-            <xs:complexType>
-              <xs:sequence>
-                <xs:element minOccurs="1" maxOccurs="1" ref="C_Name"/>
-                <xs:element minOccurs="0" maxOccurs="1" name="TokenSpaceGuid" type="GuidType"/>
-                <xs:element minOccurs="1" maxOccurs="1" name="Token">
-                  <xs:annotation>
-                    <xs:documentation xml:lang="en">This as a unique identifier defined for either this name space.</xs:documentation>
-                    <xs:documentation xml:lang="en">The Target Attribute may be used to define a Target name space, such as PCI.</xs:documentation>
-                  </xs:annotation>
-                  <xs:complexType>
-                    <xs:simpleContent>
-                      <xs:extension base="HexDoubleWordDataType">
-                        <xs:attribute name="Target" type="C_Name" use="optional"/>
-                      </xs:extension>
-                    </xs:simpleContent>
-                  </xs:complexType>
-                </xs:element>
-                <xs:element minOccurs="1" maxOccurs="1" name="DatumType" type="PcdDataTypes">
-                  <xs:annotation>
-                    <xs:documentation xml:lang="en">This specifies the size of the Pcd Datum. It is either 8, 16, 32 or 64 bits for values, 1 bit for BOOLEAN and variable length for elements defined as VOID*</xs:documentation>
-                  </xs:annotation>
-                </xs:element>
-                <xs:element default="false" minOccurs="1" maxOccurs="1" name="HiiEnable" type="xs:boolean">
-                  <xs:annotation>
-                    <xs:documentation xml:lang="en">This Bit means that the Variable data is associated with HII</xs:documentation>
-                  </xs:annotation>
-                </xs:element>
-                <xs:element default="false" minOccurs="1" maxOccurs="1" name="VpdEnable" type="xs:boolean">
-                  <xs:annotation>
-                    <xs:documentation xml:lang="en">This bit enables the Vital Product Data area within flash for maintaining PCD information</xs:documentation>
-                  </xs:annotation>
-                </xs:element>
-                <xs:element default="false" minOccurs="1" maxOccurs="1" name="AlternateNameSpaceEnable" type="xs:boolean">
-                  <xs:annotation>
-                    <xs:documentation>This is only applicable to ItemType DYNAMIC_EX</xs:documentation>
-                  </xs:annotation>
-                </xs:element>
-                <xs:element default="false" minOccurs="1" maxOccurs="1" name="SkuEnable" type="xs:boolean"/>
-                  <xs:element default="false" minOccurs="1" maxOccurs="1" name="SkuDataArrayEnable" type="xs:boolean"/>
-                    <xs:choice minOccurs="0">
-                      <xs:element minOccurs="0" maxOccurs="1" name="SkuDataArray">
-                        <xs:annotation>
-                          <xs:documentation xml:lang="en">This element is a list of two entries per line, the first should be an integer, while the second entry should be a string value</xs:documentation>
-                        </xs:annotation>
-                        <xs:simpleType>
-                          <xs:list itemType="xs:normalizedString"/>
-                        </xs:simpleType>
-                     </xs:element>
-                     <xs:element minOccurs="0" maxOccurs="unbounded" name="SkuData">
-                       <xs:annotation>
-                         <xs:documentation xml:lang="en">This section is for a list of SkuData Elements, ID and Value</xs:documentation>
-                       </xs:annotation>
-                       <xs:complexType>
-                         <xs:sequence minOccurs="1">
-                           <xs:element name="Id" type="xs:int"/>
-                           <xs:element name="Value" type="xs:normalizedString"/>
-                         </xs:sequence>
-                       </xs:complexType>
-                     </xs:element>
-                   </xs:choice>
-                   <xs:element default="0x00" minOccurs="1" maxOccurs="1" name="MaxSku" type="HexByteDataType">
-                     <xs:annotation>
-                       <xs:documentation xml:lang="en">This value comes from a production line database, and has nothing to do with the number of SkuData IDs that have been defined.</xs:documentation>
-                     </xs:annotation>
-                   </xs:element>
-                   <xs:element default="0x00" minOccurs="1" maxOccurs="1" name="SkuId" type="HexByteDataType">
-                     <xs:annotation>
-                       <xs:documentation xml:lang="en">This is the specific Sku ID for this build.</xs:documentation>
-                     </xs:annotation>
-                   </xs:element>
-                   <xs:element minOccurs="1" maxOccurs="1" name="DatumSize">
-                     <xs:annotation>
-                       <xs:documentation xml:lang="en">Max Number of Bytes of the data.</xs:documentation>
-                     </xs:annotation>
-                     <xs:simpleType>
-                       <xs:restriction base="xs:int">
-                         <xs:minInclusive value="1"/>
-                         <xs:maxInclusive value="16777215"/>
-                       </xs:restriction>
-                     </xs:simpleType>
-                   </xs:element>
-                   <xs:element minOccurs="1" maxOccurs="1" name="VariableGuid" type="VariableGuidType">
-                     <xs:annotation>
-                       <xs:documentation xml:lang="en">This is the Variable's GUID if and only if HII is enabled.</xs:documentation>
-                     </xs:annotation>
-                   </xs:element>
-                   <xs:element minOccurs="1" maxOccurs="1" name="VariableName" type="xs:normalizedString">
-                     <xs:annotation>
-                       <xs:documentation xml:lang="en">This is the C Name for the Variable, and is valid if and only HII is enabled.</xs:documentation>
-                     </xs:annotation>
-                   </xs:element>
-                   <xs:element minOccurs="0" maxOccurs="1" name="VariableValueDefault" type="xs:normalizedString"/>
-                   <xs:element minOccurs="1" maxOccurs="1" name="DataOffset" type="Hex64BitDataType">
+    </xs:element>
+    <!-- PcdBuildDeclarations -->
+    <xs:element name="PcdDynamicBuildDeclarations">
+        <xs:annotation>
+            <xs:documentation xml:lang="en">Child of Framework Platform Description (FPD)</xs:documentation>
+            <xs:documentation xml:lang="en">We permit the FPD to use an external XML file for PCD information or else the information must be contained within the XML data element, PcdBuildData.</xs:documentation>
+        </xs:annotation>
+        <xs:complexType>
+            <xs:sequence>
+                <xs:element minOccurs="0" maxOccurs="unbounded" name="PcdBuildData">
+                    <xs:annotation>
+                        <xs:documentation xml:lang="en">Child of PcdBuildDeclarations</xs:documentation>
+                        <xs:documentation xml:lang="en">This is date element is used in the platform build description file and contains valid data for a Platform Build</xs:documentation>
+                        <xs:documentation xml:lang="en">There is ONE required Attribute, ItemType</xs:documentation>
+                    </xs:annotation>
+                    <xs:complexType>
+                        <xs:sequence>
+                            <xs:element minOccurs="1" maxOccurs="1" ref="C_Name"/>
+                            <xs:element minOccurs="0" maxOccurs="1" name="TokenSpaceGuid" type="GuidType"/>
+                            <xs:element minOccurs="1" maxOccurs="1" name="Token">
+                                <xs:annotation>
+                                    <xs:documentation xml:lang="en">This as a unique identifier defined for either this name space.</xs:documentation>
+                                    <xs:documentation xml:lang="en">The Target Attribute may be used to define a Target name space, such as PCI.</xs:documentation>
+                                </xs:annotation>
+                                <xs:complexType>
+                                    <xs:simpleContent>
+                                        <xs:extension base="HexDoubleWordDataType">
+                                            <xs:attribute name="Target" type="C_Name" use="optional"/>
+                                        </xs:extension>
+                                    </xs:simpleContent>
+                                </xs:complexType>
+                            </xs:element>
+                            <xs:element minOccurs="0" maxOccurs="1" name="TokenSpaceGuid" type="GuidType"/>
+                            <xs:element minOccurs="1" maxOccurs="1" name="DatumType" type="PcdDataTypes">
+                                <xs:annotation>
+                                    <xs:documentation xml:lang="en">This specifies the size of the Pcd Datum. It is either 8, 16, 32 or 64 bits for values, 1 bit for BOOLEAN and variable length for elements defined as VOID*</xs:documentation>
+                                </xs:annotation>
+                            </xs:element>
+                            <xs:element default="false" minOccurs="1" maxOccurs="1" name="HiiEnable" type="xs:boolean">
+                                <xs:annotation>
+                                    <xs:documentation xml:lang="en">This Bit means that the Variable data is associated with HII</xs:documentation>
+                                </xs:annotation>
+                            </xs:element>
+                            <xs:element default="false" minOccurs="1" maxOccurs="1" name="VpdEnable" type="xs:boolean">
+                                <xs:annotation>
+                                    <xs:documentation xml:lang="en">This bit enables the Vital Product Data area within flash for maintaining PCD information</xs:documentation>
+                                </xs:annotation>
+                            </xs:element>
+                            <xs:element default="false" minOccurs="1" maxOccurs="1" name="AlternateNameSpaceEnable" type="xs:boolean">
+                                <xs:annotation>
+                                    <xs:documentation>This is only applicable to ItemType DYNAMIC_EX</xs:documentation>
+                                </xs:annotation>
+                            </xs:element>
+                            <xs:element default="false" minOccurs="1" maxOccurs="1" name="SkuEnable" type="xs:boolean"/>
+                            <xs:element default="false" minOccurs="1" maxOccurs="1" name="SkuDataArrayEnable" type="xs:boolean"/>
+                            <xs:choice minOccurs="0">
+                                <xs:element minOccurs="0" maxOccurs="1" name="SkuDataArray">
+                                    <xs:annotation>
+                                        <xs:documentation xml:lang="en">This element is a list of two entries per line, the first should be an integer, while the second entry should be a string value</xs:documentation>
+                                    </xs:annotation>
+                                    <xs:simpleType>
+                                        <xs:list itemType="xs:normalizedString"/>
+                                    </xs:simpleType>
+                                </xs:element>
+                                <xs:element minOccurs="0" maxOccurs="unbounded" name="SkuData">
+                                    <xs:annotation>
+                                        <xs:documentation xml:lang="en">This section is for a list of SkuData Elements, ID and Value</xs:documentation>
+                                    </xs:annotation>
+                                    <xs:complexType>
+                                        <xs:sequence minOccurs="1">
+                                            <xs:element name="Id" type="xs:int"/>
+                                            <xs:element name="Value" type="xs:normalizedString"/>
+                                        </xs:sequence>
+                                    </xs:complexType>
+                                </xs:element>
+                            </xs:choice>
+                            <xs:element default="0x00" minOccurs="1" maxOccurs="1" name="MaxSku" type="HexByteDataType">
+                                <xs:annotation>
+                                    <xs:documentation xml:lang="en">This value comes from a production line database, and has nothing to do with the number of SkuData IDs that have been defined.</xs:documentation>
+                                </xs:annotation>
+                            </xs:element>
+                            <xs:element default="0x00" minOccurs="1" maxOccurs="1" name="SkuId" type="HexByteDataType">
+                                <xs:annotation>
+                                    <xs:documentation xml:lang="en">This is the specific Sku ID for this build.</xs:documentation>
+                                </xs:annotation>
+                            </xs:element>
+                            <xs:element minOccurs="1" maxOccurs="1" name="DatumSize">
+                                <xs:annotation>
+                                    <xs:documentation xml:lang="en">Max Number of Bytes of the data.</xs:documentation>
+                                </xs:annotation>
+                                <xs:simpleType>
+                                    <xs:restriction base="xs:int">
+                                        <xs:minInclusive value="1"/>
+                                        <xs:maxInclusive value="16777215"/>
+                                    </xs:restriction>
+                                </xs:simpleType>
+                            </xs:element>
+                            <xs:element minOccurs="1" maxOccurs="1" name="VariableGuid" type="VariableGuidType">
+                                <xs:annotation>
+                                    <xs:documentation xml:lang="en">This is the Variable's GUID if and only if HII is enabled.</xs:documentation>
+                                </xs:annotation>
+                            </xs:element>
+                            <xs:element minOccurs="1" maxOccurs="1" name="VariableName" type="xs:normalizedString">
+                                <xs:annotation>
+                                    <xs:documentation xml:lang="en">This is the C Name for the Variable, and is valid if and only HII is enabled.</xs:documentation>
+                                </xs:annotation>
+                            </xs:element>
+                            <xs:element minOccurs="0" maxOccurs="1" name="VariableValueDefault" type="xs:normalizedString"/>
+                            <xs:element minOccurs="1" maxOccurs="1" name="DataOffset" type="Hex64BitDataType">
                                 <xs:annotation>
                                     <xs:documentation xml:lang="en">If HII is enabled, This is the offset into the variable data entry, If Vpd is enabled, then it's the Offset into the VPD area of the image defined by platform manufacturer, if neither HII nor Vpd are enabled, it's the offset into the PCD Data Area. HII and VPD can never be enabled at the same time (as of the date of this document.)</xs:documentation>
                                 </xs:annotation>
@@ -1198,22 +1248,23 @@
                             <xs:element minOccurs="1" maxOccurs="1" name="DefaultValue" type="xs:normalizedString"/>
                         </xs:sequence>
                         <xs:attributeGroup ref="PcdAttributes"/>
-                        <xs:attribute name="PcdIsDriver" use="optional">
-                           <xs:simpleType>
-                             <xs:annotation>
-                               <xs:documentation xml:lang="en">This is an enumerated data type that will be used for DYNAMIC_EX, PEIM or DXE only</xs:documentation>
-                             </xs:annotation>
-                             <xs:restriction base="UCNameType">
-                               <xs:enumeration value="PEI_PCD_DRIVER"/>
-                               <xs:enumeration value="DXE_PCD_DRIVER"/>
-                             </xs:restriction>
-                           </xs:simpleType>
-                         </xs:attribute>
+                        <xs:attribute name="PcdIsDriver">
+                            <xs:simpleType>
+                                <xs:annotation>
+                                    <xs:documentation xml:lang="en">This is an enumerated data type that will be used for DYNAMIC_EX, PEIM or DXE only</xs:documentation>
+                                </xs:annotation>
+                                <xs:restriction base="UCNameType">
+                                    <xs:enumeration value="PEI_PCD_DRIVER"/>
+                                    <xs:enumeration value="DXE_PCD_DRIVER"/>
+                                </xs:restriction>
+                            </xs:simpleType>
+                        </xs:attribute>
                     </xs:complexType>
                 </xs:element>
             </xs:sequence>
         </xs:complexType>
-    </xs:element> <!-- PcdDynamicBuildDeclarations -->
+    </xs:element>
+    <!-- PcdDynamicBuildDeclarations -->
     <xs:element name="PcdDefinitions">
         <xs:annotation>
             <xs:documentation xml:lang="en">Child of Package Surface Area Description (SPD)</xs:documentation>
@@ -1231,6 +1282,7 @@
                         <xs:sequence>
                             <xs:element minOccurs="1" maxOccurs="1" ref="C_Name"/>
                             <xs:element minOccurs="1" maxOccurs="1" name="Token" type="Token"/>
+                            <xs:element minOccurs="0" maxOccurs="1" name="TokenSpaceGuid" type="GuidType"/>
                             <xs:element minOccurs="1" maxOccurs="1" name="DatumType" type="PcdDataTypes"/>
                             <xs:element default="false" minOccurs="0" maxOccurs="1" name="HiiEnable" type="xs:boolean"/>
                             <xs:element default="false" minOccurs="0" maxOccurs="1" name="VpdEnable" type="xs:boolean"/>
@@ -1281,7 +1333,9 @@
                     </xs:complexType>
                 </xs:element>
                 <xs:element minOccurs="0" maxOccurs="1" ref="Path"/>
+                <!--
                 <xs:element minOccurs="0" maxOccurs="1" ref="File"/>
+                    -->
                 <xs:element minOccurs="0" maxOccurs="1" ref="InstalledDate"/>
                 <xs:element minOccurs="0" maxOccurs="1" ref="ModifiedDate"/>
                 <xs:element minOccurs="0" maxOccurs="1" name="AlternatePcdFile" type="FileNameConvention"/>
@@ -1518,6 +1572,7 @@
         </xs:complexType>
     </xs:element>
     <xs:element name="Updated" type="DateType"/>
+    <xs:element name="UpdatedDate" type="DateType"/>
     <xs:element name="URL" type="xs:anyURI"/>
     <xs:element name="URI" type="xs:anyURI"/>
     <xs:element name="UserDefinedAntTasks">