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

diff --git a/Tools/XMLSchema/FrameworkDataElements.xsd b/Tools/XMLSchema/FrameworkDataElements.xsd
index 1d34b49e13..665c19ae22 100644
--- a/Tools/XMLSchema/FrameworkDataElements.xsd
+++ b/Tools/XMLSchema/FrameworkDataElements.xsd
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" xmlns="http://www.TianoCore.org/2006/Edk2.0" targetNamespace="http://www.TianoCore.org/2006/Edk2.0">
-  <!--
+    <!--
     Filename: FrameworkDataElements.xsd
     
     Copyright (c) 2006, Intel Corp.
@@ -12,41 +12,42 @@
     WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     
   -->
-  <xs:annotation>
-    <xs:documentation xml:lang="en"> This schema defines EFI and Framework Data Elements </xs:documentation>
-  </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>
-      <xs:documentation xml:lang="en">This section is required. This is a single sentence to describe the module and will be used in sample files as the abstract data in the header comment section.</xs:documentation>
+        <xs:documentation xml:lang="en"> This schema defines EFI and Framework Data Elements </xs:documentation>
     </xs:annotation>
-      <xs:complexType>
-        <xs:simpleContent>
-          <xs:extension base="Sentence">
-            <xs:attribute name="URL" type="xs:anyURI" use="optional"/>
-          </xs:extension>
-        </xs:simpleContent>
-      </xs:complexType>
-  </xs:element>
-  <xs:element name="AntCmd">
-    <xs:annotation>
-      <xs:documentation xml:lang="en">This is a sub-element of AntTask</xs:documentation>
-      <xs:documentation xml:lang="en">This is an ant command that will be inserted into a biuld sequence. Since ant commands are valid XML statements, special care must be taken to use the correct tokens for reserved words and escape quote characters.</xs:documentation>
-    </xs:annotation>
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element minOccurs="0" name="Id" type="xs:int"/>
-          <xs:element name="ExecutionOrder">
-            <xs:simpleType>
-              <xs:list itemType="xs:normalizedString"/>
-            </xs:simpleType>
-          </xs:element>
-        </xs:sequence>
-        <xs:attributeGroup ref="SectionAttributes"/>
-      </xs:complexType>
+    <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>
+            <xs:documentation xml:lang="en">Abstract is valid for all Description Files</xs:documentation>
+            <xs:documentation xml:lang="en">This section is required. This is a single sentence to describe the module and will be used in sample files as the abstract data in the header comment section.</xs:documentation>
+        </xs:annotation>
+        <xs:complexType>
+            <xs:simpleContent>
+                <xs:extension base="Sentence">
+                    <xs:attribute name="URL" type="xs:anyURI" use="optional"/>
+                </xs:extension>
+            </xs:simpleContent>
+        </xs:complexType>
+    </xs:element>
+    <xs:element name="AntCmd">
+        <xs:annotation>
+            <xs:documentation xml:lang="en">This is a sub-element of AntTask</xs:documentation>
+            <xs:documentation xml:lang="en">This is an ant command that will be inserted into a biuld sequence. Since ant commands are valid XML statements, special care must be taken to use the correct tokens for reserved words and escape quote characters.</xs:documentation>
+        </xs:annotation>
+        <xs:complexType>
+            <xs:sequence>
+                <xs:element minOccurs="0" name="Id" type="xs:int"/>
+                <xs:element name="ExecutionOrder">
+                    <xs:simpleType>
+                        <xs:list itemType="xs:normalizedString"/>
+                    </xs:simpleType>
+                </xs:element>
+            </xs:sequence>
+            <xs:attributeGroup ref="SectionAttributes"/>
+        </xs:complexType>
     </xs:element>
     <xs:element name="AntTask">
         <xs:annotation>
@@ -112,6 +113,7 @@
                             </xs:simpleContent>
                         </xs:complexType>
                     </xs:element>
+                    <!-- Arch element should be removed - use Arch attributes to the above instead. -->
                     <xs:element minOccurs="0" maxOccurs="unbounded" name="Arch">
                         <xs:complexType>
                             <xs:sequence minOccurs="1">
@@ -148,18 +150,8 @@
             <xs:documentation xml:lang="en">Describe the valid Framework Component Type</xs:documentation>
         </xs:annotation>
     </xs:element>
-    <xs:element name="Condition">
-        <xs:annotation>
-            <xs:documentation xml:lang="en">A conditional expression that must be evaluated to determine whether a feature is implemented or not. The expression must be either numeric, string or boolean.</xs:documentation>
-        </xs:annotation>
-        <xs:complexType mixed="true">
-            <xs:sequence minOccurs="0" maxOccurs="1">
-                <xs:element minOccurs="0" maxOccurs="1" name="Condition" type="xs:normalizedString"/>
-            </xs:sequence>
-            <xs:attribute name="ConditionalTarget" type="ConditionalTarget" use="optional"/>
-        </xs:complexType>
-    </xs:element>
     <xs:element name="ConditionalExpression">
+        <!-- DO NOT USE remove and use FeatureFlag instead -->
         <xs:annotation>
             <xs:documentation xml:lang="en">A conditional expression that must be evaluated to determine whether a feature is implemented or not. The expression must be either numeric, string or boolean.</xs:documentation>
         </xs:annotation>
@@ -190,6 +182,7 @@
                         </xs:simpleContent>
                     </xs:complexType>
                 </xs:element>
+                <!-- Remove Arch and use Arch Attribute for DataHubRecord instead. -->
                 <xs:element minOccurs="0" maxOccurs="unbounded" name="Arch">
                     <xs:complexType>
                         <xs:sequence>
@@ -243,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>
@@ -253,12 +246,21 @@
                             <xs:element name="Event">
                                 <xs:complexType>
                                     <xs:sequence>
-                                        <xs:element minOccurs="1" maxOccurs="1" ref="C_Name"/>
-                                        <xs:element minOccurs="0" maxOccurs="1" ref="Guid"/>
+                                        <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"/>
+                                        </xs:choice>
                                     </xs:sequence>
                                     <xs:attributeGroup ref="EventAttributes"/>
                                 </xs:complexType>
                             </xs:element>
+                            <!-- Remove Arch Section and use Arch Attribute instead in Event. -->
                             <xs:element minOccurs="0" maxOccurs="unbounded" name="Arch">
                                 <xs:complexType>
                                     <xs:sequence>
@@ -266,7 +268,10 @@
                                             <xs:complexType>
                                                 <xs:sequence>
                                                     <xs:element minOccurs="1" maxOccurs="1" ref="C_Name"/>
-                                                    <xs:element minOccurs="0" maxOccurs="1" ref="Guid"/>
+                                                    <xs:choice minOccurs="0">
+                                                        <xs:element minOccurs="0" maxOccurs="1" ref="Guid"/>
+                                                        <xs:element minOccurs="0" maxOccurs="1" ref="GuidValue"/>
+                                                    </xs:choice>
                                                 </xs:sequence>
                                                 <xs:attributeGroup ref="EventAttributes"/>
                                             </xs:complexType>
@@ -287,12 +292,21 @@
                             <xs:element name="Event">
                                 <xs:complexType>
                                     <xs:sequence>
-                                        <xs:element minOccurs="1" maxOccurs="1" ref="C_Name"/>
-                                        <xs:element minOccurs="0" maxOccurs="1" ref="Guid"/>
+                                        <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"/>
+                                        </xs:choice>
                                     </xs:sequence>
                                     <xs:attributeGroup ref="EventAttributes"/>
                                 </xs:complexType>
                             </xs:element>
+                            <!-- Remove Arch and use Arch attribute in Event above -->
                             <xs:element minOccurs="0" maxOccurs="unbounded" name="Arch">
                                 <xs:complexType>
                                     <xs:sequence>
@@ -300,7 +314,6 @@
                                             <xs:complexType>
                                                 <xs:sequence>
                                                     <xs:element minOccurs="1" maxOccurs="1" ref="C_Name"/>
-                                                    <xs:element minOccurs="0" maxOccurs="1" ref="Guid"/>
                                                 </xs:sequence>
                                                 <xs:attributeGroup ref="EventAttributes"/>
                                             </xs:complexType>
@@ -318,12 +331,12 @@
     <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" 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">
@@ -362,6 +375,8 @@
                         <xs:attributeGroup ref="ExternAttributes"/>
                     </xs:complexType>
                 </xs:element>
+                <xs:element minOccurs="0" maxOccurs="unbounded" ref="Specification"/>
+                <!-- Remove Arch and use Arch Attribute in above. -->
                 <xs:element minOccurs="0" maxOccurs="unbounded" name="Arch">
                     <xs:complexType>
                         <xs:sequence>
@@ -431,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>
@@ -448,6 +463,7 @@
         <xs:complexType>
             <xs:sequence minOccurs="1">
                 <xs:element minOccurs="0" maxOccurs="unbounded" ref="Filename"/>
+                <!-- DO NOT USE Arch remove it element and use Arch Attribute to Filename instead -->
                 <xs:element minOccurs="0" maxOccurs="unbounded" name="Arch">
                     <xs:complexType>
                         <xs:sequence minOccurs="1">
@@ -466,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">
@@ -477,6 +490,7 @@
                         </xs:simpleContent>
                     </xs:complexType>
                 </xs:element>
+                <!-- DO NOT USE! removing Arch element, use Arch attribute in Formset instead. -->
                 <xs:element minOccurs="0" maxOccurs="unbounded" name="Arch">
                     <xs:complexType>
                         <xs:sequence>
@@ -512,16 +526,22 @@
         </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">
                     <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 minOccurs="1">
+                                <xs:element minOccurs="0" maxOccurs="1" ref="Guid"/>
+                                <xs:element minOccurs="0" maxOccurs="1" ref="GuidValue"/>
+                            </xs:choice>
+                            <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>
@@ -532,20 +552,26 @@
             <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"/>
                     </xs:complexType>
                 </xs:element>
+                <!-- DO NOT USE Arch, Arch should be removed and the attribute Arch should be used in the above. -->
                 <xs:element minOccurs="0" maxOccurs="unbounded" name="Arch">
                     <xs:complexType>
                         <xs:sequence>
@@ -558,6 +584,7 @@
                                         <xs:element minOccurs="1" maxOccurs="1" ref="C_Name"/>
                                         <xs:element minOccurs="0" maxOccurs="1" ref="GuidValue"/>
                                         <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"/>
                                         <xs:element minOccurs="0" maxOccurs="1" ref="DefaultValue"/>
                                         <xs:element minOccurs="0" maxOccurs="1" ref="HelpText"/>
@@ -573,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>
@@ -584,13 +625,23 @@
                 <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"/>
-                            <xs:element minOccurs="0" maxOccurs="1" ref="Guid"/>
+                            <!-- 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"/>
+                            </xs:choice>
                         </xs:sequence>
                         <xs:attributeGroup ref="HobAttributes"/>
                     </xs:complexType>
                 </xs:element>
+                <!-- DO NOT USE Arch, use attribute Arch for Hob in above -->
                 <xs:element minOccurs="0" maxOccurs="unbounded" name="Arch">
                     <xs:complexType>
                         <xs:sequence>
@@ -615,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>
@@ -628,6 +680,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">
@@ -639,22 +692,40 @@
             </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>
-            <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">
@@ -671,47 +742,56 @@
                         <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: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:element minOccurs="1" maxOccurs="1" ref="LibraryClass"/>
+            <xs:sequence>
+                <xs:element minOccurs="1" maxOccurs="1" name="LibraryClass">
+                    <xs:complexType>
+                        <xs:simpleContent>
+                            <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>
+                </xs:element>
                 <xs:element minOccurs="1" maxOccurs="1" ref="IncludeHeader"/>
             </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>
@@ -738,7 +818,10 @@
             </xs:annotation>
             <xs:sequence>
                 <xs:element minOccurs="1" maxOccurs="1" ref="ModuleName"/>
-                <xs:element minOccurs="1" maxOccurs="1" ref="Guid"/>
+                <xs:choice minOccurs="1">
+                    <xs:element minOccurs="0" maxOccurs="1" ref="Guid"/>
+                    <xs:element minOccurs="0" maxOccurs="1" ref="GuidValue"/>
+                </xs:choice>
                 <xs:element minOccurs="1" maxOccurs="1" ref="Version"/>
                 <xs:element minOccurs="1" maxOccurs="1" ref="Path"/>
             </xs:sequence>
@@ -761,7 +844,7 @@
         </xs:annotation>
         <xs:complexType>
             <xs:simpleContent>
-                <xs:extension base="BaseNameConvention">
+                <xs:extension base="xs:NCName">
                     <xs:attributeGroup ref="ModuleNameAttributes"/>
                 </xs:extension>
             </xs:simpleContent>
@@ -778,7 +861,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">
@@ -788,6 +871,7 @@
                         <xs:attributeGroup ref="MsaAttributes"/>
                     </xs:complexType>
                 </xs:element>
+                <!-- DO NOT USE Arch element, use attribute Arch in above. -->
                 <xs:element minOccurs="0" maxOccurs="unbounded" name="Arch">
                     <xs:complexType>
                         <xs:sequence minOccurs="1">
@@ -810,6 +894,17 @@
             </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" type="PathAndFilename"/>
+            </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>
@@ -830,6 +925,7 @@
         </xs:complexType>
     </xs:element>
     <xs:element name="PCDs">
+        <!-- PCDs section is going away to be replaced by something else TB Named later -->
         <xs:annotation>
             <xs:documentation xml:lang="en">Child of Module Surface Area documents, MSA and MBD files, Library Modules and Other Modules</xs:documentation>
             <xs:documentation xml:lang="en">One or more PcdData or PcdBuildData Elements Only one type is permitted</xs:documentation>
@@ -846,6 +942,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"/>
@@ -854,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"/>
@@ -873,7 +960,7 @@
                             <xs:element minOccurs="0" maxOccurs="1" ref="HelpText"/>
                         </xs:sequence>
                         <xs:attributeGroup ref="PcdAttributes"/>
-                        <xs:attribute name="PcdIsDriver" use="optional" />
+                        <xs:attribute name="PcdIsDriver" use="optional"/>
                     </xs:complexType>
                 </xs:element>
             </xs:sequence>
@@ -881,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">
@@ -892,17 +979,29 @@
     </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>
     <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">
@@ -913,9 +1012,19 @@
                     <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:element minOccurs="1" maxOccurs="1" ref="Path"/>
+                            <xs:choice minOccurs="0">
+                                <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="0">
+                                <xs:element minOccurs="0" maxOccurs="1" ref="Version"/>
+                                <xs:element minOccurs="0" maxOccurs="1" name="PackageVersion" type="VersionDataType"/>
+                            </xs:choice>
+                            <xs:choice minOccurs="1">
+                                <xs:element minOccurs="0" maxOccurs="1" ref="Path"/>
+                                <xs:element minOccurs="0" maxOccurs="1" ref="Filename"/>
+                            </xs:choice>
                             <xs:element minOccurs="1" maxOccurs="1" ref="InstalledDate"/>
                         </xs:sequence>
                         <xs:attributeGroup ref="PackageAttributes"/>
@@ -926,11 +1035,11 @@
     </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>
-                <xs:extension base="BaseNameConvention">
+                <xs:extension base="UiNameType">
                     <xs:attributeGroup ref="PackageAttributes"/>
                 </xs:extension>
             </xs:simpleContent>
@@ -965,7 +1074,6 @@
                     <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>
@@ -979,6 +1087,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>
@@ -1068,155 +1177,240 @@
                         </xs:sequence>
                         <xs:attributeGroup ref="PcdAttributes"/>
                         <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: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">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: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="GuidOffset" type="Hex64BitDataType">
+                            <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="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">
+                                <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">FIELD IS NOT USED! REMOVE in FINAL!</xs:documentation>
+                                    <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: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: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"/>
                         <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: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>
+    <xs:element name="DynamicPcdBuildDefinitions">
+        <xs:annotation>
+            <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">
+                <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" 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> <!-- PcdDynamicBuildDeclarations -->
+    </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" ref="HelpText"/>
+                        </xs:sequence>
+                        <xs:attributeGroup ref="PcdDeclarationAttributes"/>
+                    </xs:complexType>
+                </xs:element>
+            </xs:sequence>
+        </xs:complexType>
+    </xs:element>
+    <!-- DO NOT USE removing PcdDefinitions, use PcdDeclarations for SPD entries  Use PcdBuildDeclarations for MSA Entires and PcdDynamicBuildDeclarations for FPD Entries -->
     <xs:element name="PcdDefinitions">
         <xs:annotation>
             <xs:documentation xml:lang="en">Child of Package Surface Area Description (SPD)</xs:documentation>
@@ -1234,6 +1428,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"/>
@@ -1283,10 +1478,10 @@
                         </xs:simpleContent>
                     </xs:complexType>
                 </xs:element>
-                <xs:element minOccurs="0" maxOccurs="1" ref="Path"/>
-                <!--
-                <xs:element minOccurs="0" maxOccurs="1" ref="File"/>
-                    -->
+                <xs:choice minOccurs="0">
+                    <xs:element minOccurs="0" maxOccurs="1" ref="Path"/>
+                    <xs:element minOccurs="0" maxOccurs="1" ref="Filename"/>
+                </xs:choice>
                 <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"/>
@@ -1296,16 +1491,23 @@
         </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">
                     <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>
+                                <!-- 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="1" ref="HelpText"/>
                         </xs:sequence>
-                        <xs:attribute name="Name" type="xs:normalizedString" use="required"/>
+                        <xs:attributeGroup ref="PpiDeclarationAttributes"/>
                     </xs:complexType>
                 </xs:element>
             </xs:sequence>
@@ -1335,6 +1537,7 @@
                         </xs:simpleContent>
                     </xs:complexType>
                 </xs:element>
+                <!-- DO NOT USE Arch element, use Arch Attribute in above instead. -->
                 <xs:element minOccurs="0" maxOccurs="unbounded" name="Arch">
                     <xs:complexType>
                         <xs:sequence>
@@ -1364,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>
@@ -1403,6 +1612,7 @@
                         </xs:simpleContent>
                     </xs:complexType>
                 </xs:element>
+                <!-- DO NOT USE! removing Arch element, use Arch attribute of Protocol or ProtocolNotify instead. -->
                 <xs:element minOccurs="0" maxOccurs="unbounded" name="Arch">
                     <xs:complexType>
                         <xs:sequence>
@@ -1482,6 +1692,7 @@
         <xs:complexType>
             <xs:sequence minOccurs="1">
                 <xs:element minOccurs="0" maxOccurs="unbounded" ref="Filename"/>
+                <!-- DO NOT USE! removing Arch element, use Arch Attribute of Filename instead.  -->
                 <xs:element minOccurs="0" maxOccurs="unbounded" name="Arch">
                     <xs:complexType>
                         <xs:sequence minOccurs="1">
@@ -1493,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>
@@ -1513,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>
@@ -1523,6 +1753,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">
@@ -1536,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">
@@ -1548,8 +1789,21 @@
                     </xs:annotation>
                     <xs:complexType>
                         <xs:sequence>
-                            <xs:element minOccurs="1" maxOccurs="1" name="String" type="xs:normalizedString"/>
-                            <xs:element minOccurs="1" maxOccurs="1" ref="Guid"/>
+                            <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>
@@ -1581,6 +1835,7 @@
                         <xs:attributeGroup ref="VariableAttributes"/>
                     </xs:complexType>
                 </xs:element>
+                <!-- DO NOT USE Arch element, use attribute Arch in above. -->
                 <xs:element minOccurs="0" maxOccurs="unbounded" name="Arch">
                     <xs:complexType>
                         <xs:sequence>