X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=blobdiff_plain;f=Tools%2FXMLSchema%2FFrameworkDataElements.xsd;h=665c19ae2256e5ac6d21bcacfe70a7d5932861ec;hp=08cbfd939b1da1aef636612183745eda5c9051ac;hb=02b4b59b2bb80e88409bb144463366e0f4e89b5d;hpb=47d0b5817022d27a91426889d3ee92bee0a554be

diff --git a/Tools/XMLSchema/FrameworkDataElements.xsd b/Tools/XMLSchema/FrameworkDataElements.xsd
index 08cbfd939b..665c19ae22 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="FrameworkPlatformDataTypes.xsd"/>
     <xs:include schemaLocation="FrameworkDataAttributes.xsd"/>
     <xs:element name="Abstract">
         <xs:annotation>
@@ -235,7 +236,7 @@
     <xs:element name="E-Mail" type="E-Mail"/>
     <xs:element name="Events">
         <xs:annotation>
-            <xs:documentation xml:lang="en">This is a list of Events</xs:documentation>
+            <xs:documentation xml:lang="en">This is a list of MSA Events</xs:documentation>
         </xs:annotation>
         <xs:complexType>
             <xs:sequence>
@@ -245,7 +246,12 @@
                             <xs:element name="Event">
                                 <xs:complexType>
                                     <xs:sequence>
-                                        <xs:element minOccurs="1" maxOccurs="1" ref="C_Name"/>
+                                        <xs:choice>
+                                            <xs:element minOccurs="0" maxOccurs="1" name="GuidC_Name" type="GuidC_NameType"/>
+                                            <!-- DO NOT USE, removing C_Name in final -->
+                                            <xs:element minOccurs="0" maxOccurs="1" ref="C_Name"/>
+                                        </xs:choice>
+                                        <!-- DO NOT USE, removing Guid and GuidValue from Final -->
                                         <xs:choice minOccurs="0">
                                             <xs:element minOccurs="0" maxOccurs="1" ref="Guid"/>
                                             <xs:element minOccurs="0" maxOccurs="1" ref="GuidValue"/>
@@ -286,7 +292,12 @@
                             <xs:element name="Event">
                                 <xs:complexType>
                                     <xs:sequence>
-                                        <xs:element minOccurs="1" maxOccurs="1" ref="C_Name"/>
+                                        <xs:choice>
+                                            <xs:element minOccurs="0" maxOccurs="1" name="GuidC_Name" type="GuidC_NameType"/>
+                                            <!-- DO NOT USE, removing C_Name in final -->
+                                            <xs:element minOccurs="0" maxOccurs="1" ref="C_Name"/>
+                                        </xs:choice>
+                                        <!-- DO NOT USE, removing Guid and GuidValue from Final -->
                                         <xs:choice minOccurs="0">
                                             <xs:element minOccurs="0" maxOccurs="1" ref="Guid"/>
                                             <xs:element minOccurs="0" maxOccurs="1" ref="GuidValue"/>
@@ -320,8 +331,7 @@
     <xs:element name="ExitBootServicesCallBack" type="C_Name"/>
     <xs:element name="Externs">
         <xs:annotation>
-            <xs:documentation xml:lang="en">This is a child of MSA files, both Library and Module.</xs:documentation>
-            <xs:documentation xml:lang="en">This is a list of Extern statements, right now, only Driver Binding information is provided.</xs:documentation>
+            <xs:documentation xml:lang="en">This is a child of MSA files.</xs:documentation>
         </xs:annotation>
         <xs:complexType>
             <xs:sequence minOccurs="1">
@@ -436,7 +446,7 @@
     </xs:element>
     <xs:element name="Filename">
         <xs:annotation>
-            <xs:documentation xml:lang="en">Describe the valid content of a filename</xs:documentation>
+            <xs:documentation xml:lang="en">Describe the valid content of a filename This should extend PathAndFilename - Variable names not allowed here!</xs:documentation>
         </xs:annotation>
         <xs:complexType>
             <xs:simpleContent>
@@ -472,9 +482,6 @@
         <xs:complexType>
             <xs:sequence minOccurs="1" maxOccurs="unbounded">
                 <xs:element name="Formset">
-                    <xs:annotation>
-                        <xs:documentation xml:lang="en">Describe the valid content of a Formset</xs:documentation>
-                    </xs:annotation>
                     <xs:complexType>
                         <xs:simpleContent>
                             <xs:extension base="C_Name">
@@ -519,6 +526,9 @@
         </xs:complexType>
     </xs:element>
     <xs:element name="GuidDeclarations">
+        <xs:annotation>
+            <xs:documentation xml:lang="en">This is a child of PackageSurfaceArea (SPD) </xs:documentation>
+        </xs:annotation>
         <xs:complexType>
             <xs:sequence>
                 <xs:element minOccurs="1" maxOccurs="unbounded" name="Entry">
@@ -529,9 +539,9 @@
                                 <xs:element minOccurs="0" maxOccurs="1" ref="Guid"/>
                                 <xs:element minOccurs="0" maxOccurs="1" ref="GuidValue"/>
                             </xs:choice>
-                            <xs:element minOccurs="0" maxOccurs="unbounded" name="FeatureFlag" type="C_Name"/>
+                            <xs:element minOccurs="0" maxOccurs="unbounded" ref="HelpText"/>
                         </xs:sequence>
-                        <xs:attribute name="Name" type="xs:normalizedString" use="required"/>
+                        <xs:attributeGroup ref="GuidDeclarationAttributes"/>
                     </xs:complexType>
                 </xs:element>
             </xs:sequence>
@@ -542,16 +552,20 @@
             <xs:sequence minOccurs="1" maxOccurs="unbounded">
                 <xs:element name="GuidEntry">
                     <xs:annotation>
-                        <xs:documentation xml:lang="en">Describe the valid content of a PCD GUID element</xs:documentation>
+                        <xs:documentation xml:lang="en">Describe the valid content of a GUID element in and MSA file.</xs:documentation>
                     </xs:annotation>
                     <xs:complexType>
                         <xs:sequence minOccurs="0" maxOccurs="1">
                             <xs:element minOccurs="1" maxOccurs="1" ref="C_Name"/>
+                            <!-- DO NOT USE removing GuidValue from use -->
                             <xs:element minOccurs="0" maxOccurs="1" ref="GuidValue"/>
+                            <!-- DO NOT USE removing FeatureFlag from use, use FeatureFlag Attribute instead -->
                             <xs:element minOccurs="0" maxOccurs="unbounded" name="FeatureFlag" type="C_Name"/>
                             <!-- DO NOT USE remove ConditionalExpression and use FeatureFlag instead -->
                             <xs:element minOccurs="0" maxOccurs="unbounded" ref="ConditionalExpression"/>
+                            <!-- DO NOT USE, remove DefaultValue from use -->
                             <xs:element minOccurs="0" maxOccurs="1" ref="DefaultValue"/>
+                            <!-- DO NOT USE, remove HelpText from use -->
                             <xs:element minOccurs="0" maxOccurs="1" ref="HelpText"/>
                         </xs:sequence>
                         <xs:attributeGroup ref="GuidAttributes"/>
@@ -586,10 +600,24 @@
         </xs:complexType>
     </xs:element>
     <xs:element name="GuidValue" type="GuidType"/>
-    <xs:element name="HelpText" type="Paragraph">
+    <xs:element name="HelpText" type="Paragraph"/>
+    <xs:element name="HiiPackages">
         <xs:annotation>
-            <xs:documentation xml:lang="en">This section is used to describe how a GUID, PPI or PROTOCOL is to be used within the context of PCDs.</xs:documentation>
+            <xs:documentation xml:lang="en">Describe the list of a HiiPackage elements</xs:documentation>
         </xs:annotation>
+        <xs:complexType>
+            <xs:sequence minOccurs="1" maxOccurs="unbounded">
+                <xs:element name="HiiPackage">
+                    <xs:complexType>
+                        <xs:simpleContent>
+                            <xs:extension base="C_Name">
+                                <xs:attributeGroup ref="HiiPackageAttributes"/>
+                            </xs:extension>
+                        </xs:simpleContent>
+                    </xs:complexType>
+                </xs:element>
+            </xs:sequence>
+        </xs:complexType>
     </xs:element>
     <xs:element name="Hobs">
         <xs:complexType>
@@ -597,8 +625,14 @@
                 <xs:element name="Hob">
                     <xs:complexType>
                         <xs:sequence>
-                            <xs:element minOccurs="0" maxOccurs="1" name="Name" type="xs:normalizedString"/>
+                            <xs:choice>
+                                <!-- Remove Name from use -->
+                                <xs:element minOccurs="0" maxOccurs="1" name="Name" type="xs:normalizedString"/>
+                                <xs:element minOccurs="0" maxOccurs="1" name="GuidC_Name" type="GuidC_NameType"/>
+                            </xs:choice>
+                            <!-- Remove C_Name from use -->
                             <xs:element minOccurs="0" maxOccurs="1" ref="C_Name"/>
+                            <!-- Remove Guid and GuidValue from use -->
                             <xs:choice minOccurs="0">
                                 <xs:element minOccurs="0" maxOccurs="1" ref="Guid"/>
                                 <xs:element minOccurs="0" maxOccurs="1" ref="GuidValue"/>
@@ -632,7 +666,8 @@
     <xs:element name="IncludeHeader">
         <xs:complexType>
             <xs:simpleContent>
-                <xs:extension base="FileNameConvention">
+                <xs:extension base="PathAndFilename">
+                    <!-- Need to use IncludeHeaderAttributes in final -->
                     <xs:attributeGroup ref="IncludeAttributes"/>
                 </xs:extension>
             </xs:simpleContent>
@@ -657,6 +692,23 @@
             </xs:sequence>
         </xs:complexType>
     </xs:element>
+    <xs:element name="IndustryStdIncludes">
+        <xs:complexType>
+            <xs:sequence>
+                <xs:element minOccurs="1" maxOccurs="unbounded" ref="IndustryStdHeader"/>
+            </xs:sequence>
+        </xs:complexType>
+    </xs:element>
+    <xs:element name="IndustryStdHeader">
+        <xs:complexType>
+            <xs:sequence>
+                <xs:element minOccurs="1" maxOccurs="1" name="Header" type="UiNameType"/>
+                <xs:element minOccurs="1" maxOccurs="1" name="IncludeHeader" type="PathAndFilename"/>
+                <xs:element minOccurs="1" maxOccurs="1" ref="HelpText"/>
+            </xs:sequence>
+            <xs:attributeGroup ref="IndustryStdHeaderAttributes"/>
+        </xs:complexType>
+    </xs:element>
     <xs:element name="InstalledDate" type="DateType"/>
     <xs:element name="Libraries">
         <xs:annotation>
@@ -700,27 +752,25 @@
         </xs:annotation>
         <xs:complexType>
             <xs:simpleContent>
-                <xs:extension base="BaseNameConvention">
+                <xs:extension base="xs:NCName">
                     <xs:attributeGroup ref="LibraryClassAttributes"/>
                 </xs:extension>
             </xs:simpleContent>
         </xs:complexType>
     </xs:element>
+    <!-- LAH This is LibraryClassDeclaration FINAL version -->
     <xs:element name="LibraryClassDeclaration">
         <xs:annotation>
             <xs:documentation xml:lang="en">This element defines a class of library, along with the path to the Include Header for this library</xs:documentation>
         </xs:annotation>
         <xs:complexType>
-            <xs:sequence minOccurs="0">
+            <xs:sequence>
                 <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:extension base="xs:NCName">
                                 <xs:attribute name="RecommendedInstanceGuid" type="GuidType" use="optional"/>
+                                <xs:attribute name="RecommendedInstanceVersion" type="xs:decimal" use="optional"/>
                             </xs:extension>
                         </xs:simpleContent>
                     </xs:complexType>
@@ -729,21 +779,19 @@
             </xs:sequence>
         </xs:complexType>
     </xs:element>
+    <!-- LAH This is LibraryClassDeclarations FINAL version -->
     <xs:element name="LibraryClassDeclarations">
-        <xs:annotation>
-            <xs:documentation xml:lang="en">This section defines what Classes of Libraries that this library belongs to. A Library may belong to multiple different library classes.</xs:documentation>
-        </xs:annotation>
-        <xs:complexType mixed="true">
-            <xs:sequence minOccurs="1" maxOccurs="unbounded">
-                <xs:element ref="LibraryClassDeclaration"/>
+        <xs:complexType>
+            <xs:sequence>
+                <xs:element minOccurs="1" maxOccurs="unbounded" ref="LibraryClassDeclaration"/>
             </xs:sequence>
         </xs:complexType>
     </xs:element>
     <xs:element name="LibraryClassDefinitions">
         <xs:annotation>
-            <xs:documentation xml:lang="en">This section defines what Classes of Libraries that this library belongs to. A Library may belong to multiple different library classes.</xs:documentation>
+            <xs:documentation xml:lang="en">This section defines what Classes of Library that this library supports. A Library may belong to multiple different library classes.</xs:documentation>
         </xs:annotation>
-        <xs:complexType mixed="true">
+        <xs:complexType>
             <xs:sequence minOccurs="1" maxOccurs="unbounded">
                 <xs:element ref="LibraryClass"/>
             </xs:sequence>
@@ -846,45 +894,14 @@
             </xs:sequence>
         </xs:complexType>
     </xs:element>
+    <!-- Use in Final -->
     <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="MsaPcdDeclarations">
-        <xs:annotation>
-            <xs:documentation xml:lang="en">Child of Module Surface Area Description (MSA)</xs:documentation>
-        </xs:annotation>
-        <xs:complexType>
-            <xs:sequence minOccurs="1">
-                <xs:element maxOccurs="unbounded" name="PcdEntry">
-                    <xs:annotation>
-                        <xs:documentation xml:lang="en">This is the valid content of the PCD table of a Module. The contents may not be wired at build time, and these only refer to Platform Build values, not modules.</xs:documentation>
-                        <xs:documentation xml:lang="en">This element is valid for PcdInfo.xml and FPD files.</xs:documentation>
-                    </xs:annotation>
-                    <xs:complexType>
-                        <xs:sequence>
-                            <xs:element minOccurs="1" maxOccurs="1" ref="C_Name"/>
-                            <xs:element minOccurs="0" maxOccurs="1" name="DefaultValue" type="DefaultValue"/>
-                            <xs:element minOccurs="0" maxOccurs="1" name="HelpText" type="Paragraph"/>
-                        </xs:sequence>
-                        <!-- MSA file declares a single usage, and must match one of the entries in what the SPD file declares as the set of possible Item Types. -->
-                        <xs:attribute name="PcdItemType" type="PcdItemTypes" use="required"/>
-                    </xs:complexType>
-                </xs:element>
+                <xs:element minOccurs="0" maxOccurs="unbounded" name="Filename" type="PathAndFilename"/>
             </xs:sequence>
         </xs:complexType>
     </xs:element>
@@ -934,17 +951,7 @@
                             <xs:element default="false" minOccurs="0" maxOccurs="1" name="SkuDataArrayEnable" type="xs:boolean"/>
                             <xs:element default="0x00" minOccurs="0" maxOccurs="1" name="MaxSku" type="HexByteDataType"/>
                             <xs:element default="0x00" minOccurs="0" maxOccurs="1" name="SkuId" type="HexByteDataType"/>
-                            <xs:element minOccurs="0" 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="0" maxOccurs="1" name="DatumSize" type="DatumSizeLimitation"/>
                             <xs:element minOccurs="0" maxOccurs="1" name="VariableName" type="xs:normalizedString"/>
                             <xs:element minOccurs="0" maxOccurs="1" name="VariableGuid" type="VariableGuidType"/>
                             <xs:element minOccurs="0" maxOccurs="1" name="DataOffset" type="Hex64BitDataType"/>
@@ -961,7 +968,7 @@
     </xs:element>
     <xs:element name="PackageDependencies">
         <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 (SPD) to track package dependencies for a module</xs:documentation>
         </xs:annotation>
         <xs:complexType>
             <xs:sequence maxOccurs="unbounded">
@@ -972,11 +979,23 @@
     </xs:element>
     <xs:element name="PackageHeaders">
         <xs:annotation>
-            <xs:documentation xml:lang="en">This defines the minimum header file needed to support a given ModuleType.</xs:documentation>
+            <xs:documentation xml:lang="en">This is a child of PackageSurfaceArea (SPD) </xs:documentation>
         </xs:annotation>
         <xs:complexType>
             <xs:sequence>
-                <xs:element minOccurs="1" maxOccurs="unbounded" ref="IncludeHeader"/>
+                <xs:choice>
+                    <!-- DO NOT USE! removing IncludeHeader, use IncludePkgHeader instead. -->
+                    <xs:element minOccurs="0" maxOccurs="unbounded" ref="IncludeHeader"/>
+                    <xs:element minOccurs="0" maxOccurs="unbounded" name="IncludePkgHeader">
+                        <xs:complexType>
+                            <xs:simpleContent>
+                                <xs:extension base="PathAndFilename">
+                                    <xs:attributeGroup ref="PackageHeaderAttributes"/>
+                                </xs:extension>
+                            </xs:simpleContent>
+                        </xs:complexType>
+                    </xs:element>
+                </xs:choice>
             </xs:sequence>
         </xs:complexType>
     </xs:element>
@@ -1020,7 +1039,7 @@
         </xs:annotation>
         <xs:complexType>
             <xs:simpleContent>
-                <xs:extension base="BaseNameConvention">
+                <xs:extension base="UiNameType">
                     <xs:attributeGroup ref="PackageAttributes"/>
                 </xs:extension>
             </xs:simpleContent>
@@ -1205,26 +1224,10 @@
                                 </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 minOccurs="1" maxOccurs="1" name="DatumType" type="PcdDataTypes"/>
+                            <xs:element default="false" minOccurs="1" maxOccurs="1" name="HiiEnable" type="xs:boolean"/>
+                            <xs:element default="false" minOccurs="1" maxOccurs="1" name="VpdEnable" type="xs:boolean"/>
+                            <xs:element default="false" minOccurs="1" maxOccurs="1" name="AlternateNameSpaceEnable" type="xs:boolean"/>
                             <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">
@@ -1253,43 +1256,13 @@
                                     <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 default="0x00" minOccurs="1" maxOccurs="1" name="SkuId" type="HexByteDataType"/>
+                            <xs:element minOccurs="1" maxOccurs="1" name="DatumSize" type="DatumSizeLimitation"/>
+                            <xs:element minOccurs="1" maxOccurs="1" name="VariableGuid" type="VariableGuidType"/>
+                            <xs:element minOccurs="1" maxOccurs="1" name="VariableName" type="xs:normalizedString"/>
                             <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>
-                            </xs:element>
-                            <xs:element minOccurs="0" maxOccurs="1" name="GuidOffset" type="Hex64BitDataType">
-                                <xs:annotation>
-                                    <xs:documentation xml:lang="en">FIELD IS NOT USED! REMOVE in FINAL!</xs:documentation>
-                                </xs:annotation>
-                            </xs:element>
+                            <xs:element minOccurs="1" maxOccurs="1" name="DataOffset" type="Hex64BitDataType"/>
+                            <xs:element minOccurs="0" maxOccurs="1" name="GuidOffset" type="Hex64BitDataType"/>
                             <xs:element minOccurs="1" maxOccurs="1" name="DefaultValue" type="xs:normalizedString"/>
                         </xs:sequence>
                         <xs:attributeGroup ref="PcdAttributes"/>
@@ -1309,10 +1282,88 @@
             </xs:sequence>
         </xs:complexType>
     </xs:element>
-    <xs:element name="PcdDeclarations">
+    <xs:element name="DynamicPcdBuildDefinitions">
         <xs:annotation>
-            <xs:documentation xml:lang="en">Child of Package Surface Area Description (SPD)</xs:documentation>
-            <xs:documentation xml:lang="en">This permits entering information about a package's PCD information</xs:documentation>
+            <xs:documentation xml:lang="en">Child of Framework Platform Description (FPD)</xs:documentation>
+            <xs:documentation xml:lang="en">FPD uses this PCD information for Dynamic PCDs Only</xs:documentation>
+        </xs:annotation>
+        <xs:complexType>
+            <xs:sequence>
+                <xs:element minOccurs="0" maxOccurs="unbounded" name="PcdBuildData">
+                    <xs:complexType>
+                        <xs:sequence>
+                            <xs:element minOccurs="1" maxOccurs="1" ref="C_Name"/>
+                            <xs:element minOccurs="1" maxOccurs="1" name="Token" type="TokenDataType"/>
+                            <xs:element minOccurs="0" maxOccurs="1" name="TokenSpaceGuid" type="GuidType"/>
+                            <xs:element minOccurs="1" maxOccurs="1" name="DatumType" type="PcdDataTypes"/>
+                            <xs:element minOccurs="0" maxOccurs="1" name="MaxDatumSize" type="DatumSizeLimitation"/>
+                            <xs:element minOccurs="1" maxOccurs="unbounded" name="SkuInfo">
+                                <xs:complexType>
+                                    <xs:sequence>
+                                        <xs:element minOccurs="1" maxOccurs="1" name="SkuId" type="xs:nonNegativeInteger"/>
+                                        <xs:choice>
+                                            <xs:group minOccurs="0" maxOccurs="1" ref="HiiEnable"/>
+                                            <xs:group minOccurs="0" maxOccurs="1" ref="VpdEnable"/>
+                                            <xs:group minOccurs="0" maxOccurs="1" ref="DefaultGroup"/>
+                                        </xs:choice>
+                                    </xs:sequence>
+                                </xs:complexType>
+                            </xs:element>
+                        </xs:sequence>
+                        <xs:attributeGroup ref="PcdAttributes"/>
+                    </xs:complexType>
+                </xs:element>
+            </xs:sequence>
+        </xs:complexType>
+    </xs:element>
+    <xs:element name="PcdBuildDefinition">
+        <xs:annotation>
+            <xs:documentation xml:lang="en">Child of FPD ModuleSA element for FIXED_AT_BUILD, PATCHABLE_IN_MODULE, and FEATURE_FLAG PCDS Only!</xs:documentation>
+        </xs:annotation>
+        <xs:complexType>
+            <xs:sequence minOccurs="1">
+                <xs:element maxOccurs="unbounded" name="PcdData">
+                    <xs:complexType>
+                        <xs:sequence>
+                            <xs:element minOccurs="1" maxOccurs="1" ref="C_Name"/>
+                            <xs:element minOccurs="1" maxOccurs="1" name="Token" type="TokenDataType"/>
+                            <xs:element minOccurs="0" maxOccurs="1" name="TokenSpaceGuid" type="GuidType"/>
+                            <xs:element minOccurs="1" maxOccurs="1" name="DatumType" type="PcdDataTypes"/>
+                            <xs:element minOccurs="0" maxOccurs="1" name="MaxDatumSize" type="DatumSizeLimitation"/>                            
+                            <xs:element minOccurs="0" maxOccurs="1" name="Value" type="xs:normalizedString"/>
+                        </xs:sequence>
+                        <xs:attributeGroup ref="PcdBuildDefinitionAttributes"/>
+                    </xs:complexType>
+                </xs:element>
+            </xs:sequence>
+        </xs:complexType>
+    </xs:element>
+    <xs:group name="DefaultGroup">
+        <xs:sequence>
+            <xs:element minOccurs="1" maxOccurs="1" name="Value" type="xs:normalizedString"/>
+        </xs:sequence>
+    </xs:group>
+    <xs:group name="HiiEnable">
+        <xs:annotation>
+            <xs:documentation xml:lang="en">If HiiEnable group is specified, then HiiEnable is default true</xs:documentation>
+        </xs:annotation>
+        <xs:sequence>
+            <xs:element minOccurs="0" maxOccurs="1" name="VariableName" type="VariableNameDataType"/>
+            <xs:element minOccurs="0" maxOccurs="1" name="VariableGuid" type="VariableGuidType"/>
+            <xs:element minOccurs="0" maxOccurs="1" name="VariableOffset" type="Hex64BitDataType"/>
+        </xs:sequence>
+    </xs:group>
+    <xs:group name="VpdEnable">
+        <xs:annotation>
+            <xs:documentation xml:lang="en">If VpdEnable group is specified, then VpdEnable is default true</xs:documentation>
+        </xs:annotation>
+        <xs:sequence>
+            <xs:element minOccurs="0" maxOccurs="1" name="VpdOffset" type="Hex64BitDataType"/>
+        </xs:sequence>
+    </xs:group>
+    <xs:element name="PcdCoded">
+        <xs:annotation>
+            <xs:documentation xml:lang="en">Child of Module Surface Area Description (MSA)</xs:documentation>
         </xs:annotation>
         <xs:complexType>
             <xs:sequence minOccurs="1">
@@ -1320,19 +1371,40 @@
                     <xs:annotation>
                         <xs:documentation xml:lang="en">This is the valid content of the PCD table of a Module. The contents may not be wired at build time, and these only refer to Platform Build values, not modules.</xs:documentation>
                         <xs:documentation xml:lang="en">This element is valid for PcdInfo.xml and FPD files.</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="1" maxOccurs="1" name="Token" type="Token"/>
+                            <xs:element minOccurs="0" maxOccurs="1" name="DefaultValue" type="DefaultValue"/>
+                            <xs:element minOccurs="0" maxOccurs="1" ref="HelpText"/>
+                        </xs:sequence>
+                        <!-- MSA file declares a single usage, and must match one of the entries in what the SPD file declares as the set of possible Item Types. -->
+                        <xs:attribute name="PcdItemType" type="PcdItemTypes" use="required"/>
+                    </xs:complexType>
+                </xs:element>
+            </xs:sequence>
+        </xs:complexType>
+    </xs:element>
+    <!-- LAH This is PcdDeclarations FINAL version -->
+    <xs:element name="PcdDeclarations">
+        <xs:annotation>
+            <xs:documentation xml:lang="en">Child of Package Surface Area Description (SPD)</xs:documentation>
+            <xs:documentation xml:lang="en">This section is for entering information about a package's PCDs</xs:documentation>
+        </xs:annotation>
+        <xs:complexType>
+            <xs:sequence minOccurs="1">
+                <xs:element maxOccurs="unbounded" name="PcdEntry">
+                    <xs:complexType>
+                        <xs:sequence>
+                            <xs:element minOccurs="1" maxOccurs="1" ref="C_Name"/>
+                            <xs:element minOccurs="1" maxOccurs="1" name="Token" type="TokenDataType"/>
                             <xs:element minOccurs="1" maxOccurs="1" name="TokenSpaceGuid" type="GuidType"/>
                             <xs:element minOccurs="1" maxOccurs="1" name="DatumType" type="PcdDataTypes"/>
                             <xs:element minOccurs="1" maxOccurs="1" name="ValidUsage" type="PcdListType"/>
                             <xs:element minOccurs="0" maxOccurs="1" name="DefaultValue" type="DefaultValue"/>
-                            <xs:element minOccurs="1" maxOccurs="1" name="HelpText" type="Paragraph"/>
+                            <xs:element minOccurs="1" maxOccurs="1" ref="HelpText"/>
                         </xs:sequence>
-                        <xs:attributeGroup ref="PcdAttributes"/>
+                        <xs:attributeGroup ref="PcdDeclarationAttributes"/>
                     </xs:complexType>
                 </xs:element>
             </xs:sequence>
@@ -1419,6 +1491,9 @@
         </xs:complexType>
     </xs:element>
     <xs:element name="PpiDeclarations">
+        <xs:annotation>
+            <xs:documentation xml:lang="en">This is a child of PackageSurfaceArea (SPD) </xs:documentation>
+        </xs:annotation>
         <xs:complexType>
             <xs:sequence>
                 <xs:element minOccurs="1" maxOccurs="unbounded" name="Entry">
@@ -1426,12 +1501,13 @@
                         <xs:sequence>
                             <xs:element minOccurs="1" maxOccurs="1" ref="C_Name"/>
                             <xs:choice>
+                                <!-- DO NOT USE removing Guid in final, use GuidValue instead -->
                                 <xs:element minOccurs="0" maxOccurs="1" ref="Guid"/>
                                 <xs:element minOccurs="0" maxOccurs="1" ref="GuidValue"/>
                             </xs:choice>
-                            <xs:element minOccurs="0" maxOccurs="unbounded" name="FeatureFlag" type="xs:normalizedString"/>
+                            <xs:element minOccurs="0" maxOccurs="1" ref="HelpText"/>
                         </xs:sequence>
-                        <xs:attribute name="Name" type="xs:normalizedString" use="required"/>
+                        <xs:attributeGroup ref="PpiDeclarationAttributes"/>
                     </xs:complexType>
                 </xs:element>
             </xs:sequence>
@@ -1491,16 +1567,22 @@
         </xs:complexType>
     </xs:element>
     <xs:element name="ProtocolDeclarations">
+        <xs:annotation>
+            <xs:documentation xml:lang="en">This is a child of PackageSurfaceArea (SPD) </xs:documentation>
+        </xs:annotation>
         <xs:complexType>
             <xs:sequence>
                 <xs:element minOccurs="1" maxOccurs="unbounded" name="Entry">
                     <xs:complexType>
                         <xs:sequence>
                             <xs:element minOccurs="1" maxOccurs="1" ref="C_Name"/>
-                            <xs:element minOccurs="1" maxOccurs="1" ref="Guid"/>
-                            <xs:element minOccurs="0" maxOccurs="unbounded" name="FeatureFlag" type="C_Name"/>
+                            <xs:choice>
+                                <xs:element minOccurs="0" maxOccurs="1" ref="Guid"/>
+                                <xs:element minOccurs="0" maxOccurs="1" ref="GuidValue"/>
+                            </xs:choice>
+                            <xs:element minOccurs="0" maxOccurs="1" ref="HelpText"/>
                         </xs:sequence>
-                        <xs:attribute name="Name" type="xs:normalizedString" use="required"/>
+                        <xs:attributeGroup ref="ProtocolDeclarationAttributes"/>
                     </xs:complexType>
                 </xs:element>
             </xs:sequence>
@@ -1622,6 +1704,21 @@
             </xs:sequence>
         </xs:complexType>
     </xs:element>
+    <xs:element name="SkuInfo">
+        <xs:complexType>
+            <xs:sequence minOccurs="1" maxOccurs="unbounded">
+                <xs:element name="UiSkuName">
+                    <xs:complexType>
+                        <xs:simpleContent>
+                            <xs:extension base="UiNameType">
+                                <xs:attribute name="SkuID" type="xs:nonNegativeInteger" use="required"/>
+                            </xs:extension>
+                        </xs:simpleContent>
+                    </xs:complexType>
+                </xs:element>
+            </xs:sequence>
+        </xs:complexType>
+    </xs:element>
     <xs:element name="Specification">
         <xs:annotation>
             <xs:documentation xml:lang="en">This string is used to provide the name and version of the Specification that the component conforms to.</xs:documentation>
@@ -1642,8 +1739,12 @@
             <xs:sequence minOccurs="1" maxOccurs="unbounded">
                 <xs:element name="SystemTable">
                     <xs:complexType>
-                        <xs:sequence>
-                            <xs:element minOccurs="0" maxOccurs="1" name="Entry" type="xs:normalizedString"/>
+                        <xs:sequence minOccurs="1" maxOccurs="unbounded">
+                            <xs:choice>
+                                <xs:element minOccurs="0" maxOccurs="1" name="GuidC_Name" type="GuidC_NameType"/>
+                                <!-- Remove Entry from Use -->
+                                <xs:element minOccurs="0" maxOccurs="1" name="Entry" type="xs:normalizedString"/>
+                            </xs:choice>
                         </xs:sequence>
                         <xs:attributeGroup ref="SystemTableAttributes"/>
                     </xs:complexType>
@@ -1666,9 +1767,19 @@
             </xs:sequence>
         </xs:complexType>
     </xs:element>
+    <xs:element name="UserExtensions">
+        <xs:complexType>
+            <xs:complexContent mixed="true">
+                <xs:extension base="xs:anyType">
+                    <xs:attribute name="UserID" type="xs:NCName" use="required"/>
+                    <xs:attribute name="Identifier" type="xs:integer" use="required"/>
+                </xs:extension>
+            </xs:complexContent>
+        </xs:complexType>
+    </xs:element>
     <xs:element name="Variables">
         <xs:annotation>
-            <xs:documentation xml:lang="en">A list of EFI Variables described by GUID string pair.</xs:documentation>
+            <xs:documentation xml:lang="en">An MSA FILE list of EFI Variables described by string pair.</xs:documentation>
         </xs:annotation>
         <xs:complexType>
             <xs:sequence minOccurs="1" maxOccurs="unbounded">
@@ -1678,11 +1789,21 @@
                     </xs:annotation>
                     <xs:complexType>
                         <xs:sequence>
-                            <xs:element minOccurs="1" maxOccurs="1" name="String" type="xs:normalizedString"/>
+                            <xs:choice>
+                                <!-- DO NOT USE remove String from final -->
+                                <xs:element minOccurs="1" maxOccurs="1" name="String" type="xs:normalizedString"/>
+                                <!-- Make VariableName required -->
+                                <xs:element minOccurs="0" maxOccurs="1" name="VariableName" type="VariableNameDataType"/>
+                            </xs:choice>
                             <xs:choice minOccurs="1">
+                                <!-- DO NOT USE, use GuidC_Name instead -->
                                 <xs:element minOccurs="0" maxOccurs="1" ref="Guid"/>
+                                <!-- DO NOT USE, use GuidC_Name instead -->
                                 <xs:element minOccurs="0" maxOccurs="1" ref="GuidValue"/>
+                                <!-- Make GuidC_Name required -->
+                                <xs:element minOccurs="0" maxOccurs="1" name="GuidC_Name" type="GuidC_NameType"/>
                             </xs:choice>
+                            <!-- DO NOT USE, removiing  ByteOffset, Bit Offset and OffsetBitSize-->
                             <xs:element minOccurs="0" maxOccurs="1" name="ByteOffset" type="HexWordDataType">
                                 <xs:annotation>
                                     <xs:documentation xml:lang="en">This entry represents the Hex Byte Offset {0x0, 0xn} to where the data starts.</xs:documentation>