X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=blobdiff_plain;f=Tools%2FXMLSchema%2FFrameworkDataElements.xsd;h=8e00b70ea680fbba7cc95a0898ef68d46bad5824;hp=344111ac31d68111b8d6daac3f2b08ec2d939733;hb=41eec21d72be98d383bf146644d7ccc17b2f88f7;hpb=e4ecc06e5018cc2712c5748494d216b2e5517f97

diff --git a/Tools/XMLSchema/FrameworkDataElements.xsd b/Tools/XMLSchema/FrameworkDataElements.xsd
index 344111ac31..8e00b70ea6 100644
--- a/Tools/XMLSchema/FrameworkDataElements.xsd
+++ b/Tools/XMLSchema/FrameworkDataElements.xsd
@@ -17,19 +17,13 @@
     </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:element name="Abstract" type="Sentence">
         <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>
@@ -45,7 +39,6 @@
                     </xs:simpleType>
                 </xs:element>
             </xs:sequence>
-            <xs:attributeGroup ref="SectionAttributes"/>
         </xs:complexType>
     </xs:element>
     <xs:element name="AntTask">
@@ -102,6 +95,7 @@
                 <xs:element minOccurs="0" maxOccurs="unbounded" ref="Ffs"/>
                 <xs:element minOccurs="0" maxOccurs="1" ref="Sections"/>
                 <xs:element minOccurs="0" maxOccurs="unbounded" ref="Filenames"/>
+                <xs:element ref="Options" minOccurs="0" maxOccurs="1"/>
                 <xs:sequence minOccurs="0">
                     <xs:element minOccurs="0" maxOccurs="unbounded" name="Option">
                         <xs:complexType>
@@ -130,10 +124,56 @@
                         </xs:complexType>
                     </xs:element>
                 </xs:sequence>
+                <xs:element minOccurs="0" maxOccurs="unbounded" ref="UserExtensions"/>                
             </xs:sequence>
             <xs:attribute name="ToolChain" type="ToolChains"/>
         </xs:complexType>
     </xs:element>
+    <xs:element name="Options">
+        <xs:complexType>
+            <xs:sequence>
+                <xs:element minOccurs="1" maxOccurs="unbounded" ref="Option"/>
+            </xs:sequence>
+        </xs:complexType>
+    </xs:element>
+    <xs:element name="Option">
+        <!-- This element is used to store flags from the Tools -->
+        <xs:complexType>
+            <xs:simpleContent>
+                <xs:extension base="xs:normalizedString">
+                    <xs:attributeGroup ref="OptionAttributes"/>
+                </xs:extension>
+            </xs:simpleContent>
+        </xs:complexType>
+    </xs:element>    
+    <xs:element name="ModuleBuildOptions">
+        <xs:complexType>
+            <xs:sequence>
+                <xs:any minOccurs="0" maxOccurs="unbounded" processContents="lax" namespace="##local"/>
+            </xs:sequence>
+        </xs:complexType>
+    </xs:element>
+    <xs:element name="ModuleSaBuildOptions">
+        <xs:complexType>
+            <xs:sequence>
+                <xs:element minOccurs="0" maxOccurs="1" name="FvBinding" type="FfsNameType"/>
+                <!-- The FfsFileNameGuid allows the Platform Integrator to specify a GUID for the FFS File Name GUID -->
+                <xs:element minOccurs="0" maxOccurs="1" name="FfsFileNameGuid" type="GuidType"/>
+                <!-- If binding is specified, you MUST specify the FfsFormatKey -->
+                <xs:element minOccurs="0" maxOccurs="1" name="FfsFormatKey" type="FfsNameType"/>
+                <xs:element minOccurs="0" maxOccurs="1" ref="Options"/>
+            </xs:sequence>
+        </xs:complexType>
+    </xs:element>
+    <xs:element name="ModuleDefinitions">
+        <xs:complexType>
+            <xs:sequence>
+                <xs:element minOccurs="1" maxOccurs="1" name="SupportedArchitectures" type="ArchListType"/>
+                <xs:element minOccurs="1" maxOccurs="1" name="BinaryModule" type="xs:boolean" default="false"/>
+                <xs:element minOccurs="1" maxOccurs="1" name="OutputFileBasename" type="FileNameConvention"/>
+            </xs:sequence>
+        </xs:complexType>
+    </xs:element>    
     <xs:element name="C_Name" type="C_Name">
         <xs:annotation>
             <xs:documentation xml:lang="en">C_Name is valid for all Description Files</xs:documentation>
@@ -175,7 +215,7 @@
                 <xs:element name="DataHubRecord">
                     <xs:complexType>
                         <xs:simpleContent>
-                            <xs:extension base="xs:normalizedString">
+                            <xs:extension base="C_NameType">
                                 <xs:attributeGroup ref="DataHubAttributes"/>
                             </xs:extension>
                         </xs:simpleContent>
@@ -235,7 +275,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 +285,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="C_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 +331,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="C_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,12 +370,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">
                 <xs:element minOccurs="0" maxOccurs="1" name="PcdIsDriver" type="PcdDriverTypes"/>
+                <xs:element minOccurs="0" maxOccurs="unbounded" name="Specification" type="Sentence"/>
                 <xs:element minOccurs="0" maxOccurs="unbounded" name="Extern">
                     <xs:complexType>
                         <xs:choice minOccurs="1">
@@ -365,7 +415,6 @@
                         <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>
@@ -436,11 +485,11 @@
     </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>
-                <xs:extension base="VariableConvention">
+                <xs:extension base="PathAndFilename">
                     <xs:attributeGroup ref="FilenameAttributes"/>
                 </xs:extension>
             </xs:simpleContent>
@@ -472,9 +521,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,19 +565,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" name="C_Name" type="C_NameType"/>
                             <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" name="FeatureFlag" type="C_Name"/>
+                            <xs:element minOccurs="0" maxOccurs="1" name="HelpText" type="Paragraph"/>
                         </xs:sequence>
-                        <xs:attribute name="Name" type="xs:normalizedString" use="required"/>
+                        <xs:attributeGroup ref="GuidDeclarationAttributes"/>
                     </xs:complexType>
                 </xs:element>
             </xs:sequence>
@@ -540,18 +589,34 @@
     <xs:element name="Guids">
         <xs:complexType>
             <xs:sequence minOccurs="1" maxOccurs="unbounded">
+                <xs:element minOccurs="0" maxOccurs="unbounded" name="GuidCName">
+                    <xs:annotation>
+                        <xs:documentation xml:lang="en">Describe the valid content of a GUID element in and MSA file.</xs:documentation>
+                    </xs:annotation>
+                    <xs:complexType>
+                        <xs:simpleContent>
+                            <xs:extension base="C_NameType">
+                                <xs:attributeGroup ref="GuidAttributes"/>
+                            </xs:extension>
+                        </xs:simpleContent>
+                    </xs:complexType>
+                </xs:element>                
                 <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 +651,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_NameType">
+                                <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 +676,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="C_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 +717,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,13 +743,23 @@
             </xs:sequence>
         </xs:complexType>
     </xs:element>
-    <xs:element name="IndustryStdHeaders">
+    <xs:element name="IndustryStdIncludes">
         <xs:complexType>
             <xs:sequence>
-                <xs:element minOccurs="1" maxOccurs="unbounded" ref="IncludeHeader"/>
+                <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="0" maxOccurs="1" name="Header" type="UiNameType"/>
+                <xs:element minOccurs="1" maxOccurs="1" name="IncludeHeader" type="PathAndFilename"/>
+                <xs:element minOccurs="1" maxOccurs="1" name="HelpText" type="Paragraph"/>
+            </xs:sequence>
+            <xs:attributeGroup ref="IndustryStdHeaderAttributes"/>
+        </xs:complexType>
+    </xs:element>
     <xs:element name="InstalledDate" type="DateType"/>
     <xs:element name="Libraries">
         <xs:annotation>
@@ -698,6 +794,11 @@
                     </xs:complexType>
                 </xs:element>
                 <!-- /remove Arch Element -->
+                <xs:element minOccurs="0" maxOccurs="unbounded" name="Instance">
+                    <xs:complexType>
+                        <xs:attributeGroup ref="LibraryAttributes"/>
+                    </xs:complexType>
+                </xs:element>                
             </xs:sequence>
         </xs:complexType>
     </xs:element>
@@ -707,42 +808,50 @@
         </xs:annotation>
         <xs:complexType>
             <xs:simpleContent>
-                <xs:extension base="BaseNameConvention">
+                <xs:extension base="KeywordType">
                     <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>
                 </xs:element>
-                <xs:element minOccurs="1" maxOccurs="1" ref="IncludeHeader"/>
+                <xs:element minOccurs="0" maxOccurs="1" ref="IncludeHeader"/>
+                <xs:element minOccurs="0" maxOccurs="1" name="RecommendedInstanceGuid" type="GuidType"/>
+                <xs:element minOccurs="0" maxOccurs="1" name="RecommendedInstanceVersion" type="xs:decimal"/>
+                <xs:element minOccurs="0" maxOccurs="1" ref="HelpText"/>
             </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:element name="LibraryClass" minOccurs="0" maxOccurs="unbounded">
+                    <xs:complexType>
+                        <xs:sequence>
+                            <xs:element minOccurs="1" maxOccurs="1" name="IncludeHeader" type="PathAndFilename"/>
+                            <xs:element minOccurs="1" maxOccurs="1" name="HelpText" type="Paragraph"/>
+                        </xs:sequence>
+                        <xs:attributeGroup ref="LibraryClassAttributes"/>
+                    </xs:complexType>
+                </xs:element>            
             </xs:sequence>
         </xs:complexType>
     </xs:element>
@@ -750,7 +859,7 @@
         <xs:annotation>
             <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>
@@ -817,6 +926,7 @@
     <xs:element name="ModuleUnloadImage" type="xs:normalizedString"/>
     <xs:element name="MsaFiles">
         <xs:complexType>
+          <xs:choice minOccurs="1" maxOccurs="unbounded">
             <xs:sequence minOccurs="1">
                 <xs:element minOccurs="0" maxOccurs="unbounded" name="MsaFile">
                     <xs:annotation>
@@ -851,47 +961,18 @@
                     </xs:complexType>
                 </xs:element>
             </xs:sequence>
+              <xs:element minOccurs="0" maxOccurs="unbounded" name="Filename" type="PathAndFilename"/>
+          </xs:choice>
         </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: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:element minOccurs="0" maxOccurs="unbounded" name="Filename" type="PathAndFilename"/>
             </xs:sequence>
         </xs:complexType>
     </xs:element>
@@ -914,6 +995,42 @@
             </xs:simpleContent>
         </xs:complexType>
     </xs:element>
+    <xs:element name="ProcessStep">
+        <xs:complexType>
+            <xs:sequence>
+                <xs:element minOccurs="1" maxOccurs="1" name="ToolName" type="xs:string"/>
+                <xs:element minOccurs="1" maxOccurs="1" name="ToolArgs" type="xs:string"/>
+                <!-- Input patterns  to be processed by the tool above -->
+                <xs:element minOccurs="1" maxOccurs="unbounded" name="InputPattern" type="xs:string"/>
+                <!-- A pattern to match for the output -->
+                <xs:element minOccurs="1" maxOccurs="1" name="OutputPattern" type="xs:string"/>
+            </xs:sequence>
+            <xs:attributeGroup ref="ProcessStepAttributes"/>
+        </xs:complexType>
+    </xs:element>    
+    <xs:element name="FfsFormatDeclarations">
+        <xs:complexType>
+            <xs:sequence>
+                <xs:element minOccurs="1" maxOccurs="unbounded" name="FfsFormatDeclaration">
+                    <!-- Required Attributes are the FfsFormatKeyword and SupModuleList -->
+                    <xs:complexType>
+                        <xs:sequence>
+                            <xs:element minOccurs="1" maxOccurs="unbounded" ref="ProcessStep"/>
+                        </xs:sequence>
+                        <xs:attributeGroup ref="FfsAttributes"/>
+                    </xs:complexType>
+                </xs:element>
+            </xs:sequence>
+        </xs:complexType>
+    </xs:element>
+    <xs:element name="PackageDefinitions">
+        <xs:complexType>
+            <xs:sequence>
+                <xs:element minOccurs="1" maxOccurs="1" name="ReadOnly" type="xs:boolean" default="false"/>
+                <xs:element minOccurs="1" maxOccurs="1" name="RePackage" type="xs:boolean" default="false"/>
+            </xs:sequence>
+        </xs:complexType>
+    </xs:element>    
     <xs:element name="PCDs">
         <!-- PCDs section is going away to be replaced by something else TB Named later -->
         <xs:annotation>
@@ -958,22 +1075,37 @@
     </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">
-                <xs:element minOccurs="1" maxOccurs="unbounded" ref="PackageName"/>
+                <xs:choice>
+                    <xs:element minOccurs="1" maxOccurs="unbounded" ref="Package"/>
+                    <xs:element minOccurs="1" maxOccurs="unbounded" ref="PackageName"/>                    
+                </xs:choice>
             </xs:sequence>
             <xs:attributeGroup ref="PackageNameAttributes"/>
         </xs:complexType>
     </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>
@@ -983,7 +1115,7 @@
         </xs:annotation>
         <xs:complexType>
             <xs:sequence maxOccurs="unbounded">
-                <xs:element minOccurs="1" name="Package">
+                <xs:element minOccurs="0" name="Package">
                     <xs:annotation>
                         <xs:documentation xml:lang="en">This tag is used in the Framework Package Database File to track individual package information. The Path is a relative path to the SPD File.</xs:documentation>
                     </xs:annotation>
@@ -1008,16 +1140,25 @@
                         <xs:attributeGroup ref="PackageAttributes"/>
                     </xs:complexType>
                 </xs:element>
+                <xs:element name="Filename" type="PathAndFilename" minOccurs="0" maxOccurs="unbounded"/>
             </xs:sequence>
         </xs:complexType>
     </xs:element>
+    <xs:element name="Package">
+        <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 (SPD) </xs:documentation>
+        </xs:annotation>
+        <xs:complexType>
+            <xs:attributeGroup ref="PackageAttributes"/>
+        </xs:complexType>
+    </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 (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>
@@ -1271,16 +1412,22 @@
                     <xs:complexType>
                         <xs:sequence>
                             <xs:element minOccurs="1" maxOccurs="1" ref="C_Name"/>
-                            <xs:element minOccurs="1" maxOccurs="1" name="Token" type="HexDoubleWordDataType"/>
+                            <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:group minOccurs="0" maxOccurs="1" ref="SkuGroup"/>
-                            <xs:choice minOccurs="0" maxOccurs="1">
-                                <xs:group minOccurs="0" maxOccurs="1" ref="HiiGroup"/>
-                                <xs:group minOccurs="0" maxOccurs="1" ref="VpdGroup"/>
-                            </xs:choice>
-                            <xs:element minOccurs="1" maxOccurs="1" name="DatumSize" type="DatumSizeLimitation"/>
-                            <xs:element minOccurs="1" maxOccurs="1" name="Value" type="xs:normalizedString"/>
+                            <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>
@@ -1298,53 +1445,42 @@
                     <xs:complexType>
                         <xs:sequence>
                             <xs:element minOccurs="1" maxOccurs="1" ref="C_Name"/>
-                            <xs:element minOccurs="1" maxOccurs="1" name="Token" type="HexDoubleWordDataType"/>
+                            <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:group minOccurs="0" maxOccurs="1" ref="SkuGroup"/>
-                            <xs:choice minOccurs="0" maxOccurs="1">
-                                <xs:group minOccurs="0" maxOccurs="1" ref="HiiGroup"/>
-                                <xs:group minOccurs="0" maxOccurs="1" ref="VpdGroup"/>
-                            </xs:choice>
-                            <xs:element minOccurs="0" maxOccurs="1" name="DatumSize" type="DatumSizeLimitation"/>
+                            <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="PcdAttributes"/>
+                        <xs:attributeGroup ref="PcdBuildDefinitionAttributes"/>
                     </xs:complexType>
                 </xs:element>
             </xs:sequence>
         </xs:complexType>
     </xs:element>
-    <xs:group name="HiiGroup">
+    <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 HiiGroup is specified, then HiiEnable is default true</xs:documentation>
+            <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="xs:normalizedString"/>
+            <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:element minOccurs="0" maxOccurs="1" name="HiiDefaultValue" type="xs:normalizedString"/>
         </xs:sequence>
     </xs:group>
-    <xs:group name="VpdGroup">
+    <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:group name="SkuGroup">
-        <xs:sequence>
-            <xs:element default="0x00" minOccurs="0" maxOccurs="1" name="SkuSet" type="SkuListType"/>
-            <xs:element default="0x00" minOccurs="0" maxOccurs="1" name="SkuList" type="SkuListType"/>
-            <xs:element default="false" minOccurs="0" maxOccurs="1" name="SkuDataArrayEnable" type="xs:boolean"/>
-            <xs:element minOccurs="0" maxOccurs="unbounded" name="SkuData">
-                <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:sequence>
-    </xs:group>
     <xs:element name="PcdCoded">
         <xs:annotation>
             <xs:documentation xml:lang="en">Child of Module Surface Area Description (MSA)</xs:documentation>
@@ -1360,7 +1496,7 @@
                         <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: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"/>
@@ -1369,30 +1505,26 @@
             </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 permits entering information about a package's PCD information</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: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="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>
@@ -1479,19 +1611,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" name="C_Name" type="C_NameType"/>
                             <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" name="HelpText" type="Paragraph"/>
                         </xs:sequence>
-                        <xs:attribute name="Name" type="xs:normalizedString" use="required"/>
+                        <xs:attributeGroup ref="PpiDeclarationAttributes"/>
                     </xs:complexType>
                 </xs:element>
             </xs:sequence>
@@ -1506,7 +1642,7 @@
                 <xs:element minOccurs="0" maxOccurs="unbounded" name="Ppi">
                     <xs:complexType>
                         <xs:simpleContent>
-                            <xs:extension base="C_Name">
+                            <xs:extension base="C_NameType">
                                 <xs:attributeGroup ref="PpiAttributes"/>
                             </xs:extension>
                         </xs:simpleContent>
@@ -1515,7 +1651,7 @@
                 <xs:element minOccurs="0" maxOccurs="unbounded" name="PpiNotify">
                     <xs:complexType>
                         <xs:simpleContent>
-                            <xs:extension base="C_Name">
+                            <xs:extension base="C_NameType">
                                 <xs:attributeGroup ref="PpiNotifyAttributes"/>
                             </xs:extension>
                         </xs:simpleContent>
@@ -1551,16 +1687,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:element minOccurs="1" maxOccurs="1" name="C_Name" type="C_NameType"/>
+                            <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" name="HelpText" type="Paragraph"/>
                         </xs:sequence>
-                        <xs:attribute name="Name" type="xs:normalizedString" use="required"/>
+                        <xs:attributeGroup ref="ProtocolDeclarationAttributes"/>
                     </xs:complexType>
                 </xs:element>
             </xs:sequence>
@@ -1575,7 +1717,7 @@
                 <xs:element minOccurs="0" maxOccurs="unbounded" name="Protocol">
                     <xs:complexType>
                         <xs:simpleContent>
-                            <xs:extension base="C_Name">
+                            <xs:extension base="C_NameType">
                                 <xs:attributeGroup ref="ProtocolAttributes"/>
                             </xs:extension>
                         </xs:simpleContent>
@@ -1584,7 +1726,7 @@
                 <xs:element minOccurs="0" maxOccurs="unbounded" name="ProtocolNotify">
                     <xs:complexType>
                         <xs:simpleContent>
-                            <xs:extension base="C_Name">
+                            <xs:extension base="C_NameType">
                                 <xs:attributeGroup ref="ProtocolNotifyAttributes"/>
                             </xs:extension>
                         </xs:simpleContent>
@@ -1597,7 +1739,7 @@
                             <xs:element minOccurs="0" maxOccurs="unbounded" name="Protocol">
                                 <xs:complexType>
                                     <xs:simpleContent>
-                                        <xs:extension base="C_Name">
+                                        <xs:extension base="C_NameType">
                                             <xs:attributeGroup ref="ProtocolAttributes"/>
                                         </xs:extension>
                                     </xs:simpleContent>
@@ -1606,7 +1748,7 @@
                             <xs:element minOccurs="0" maxOccurs="unbounded" name="ProtocolNotify">
                                 <xs:complexType>
                                     <xs:simpleContent>
-                                        <xs:extension base="C_Name">
+                                        <xs:extension base="C_NameType">
                                             <xs:attributeGroup ref="ProtocolNotifyAttributes"/>
                                         </xs:extension>
                                     </xs:simpleContent>
@@ -1682,6 +1824,21 @@
             </xs:sequence>
         </xs:complexType>
     </xs:element>
+    <xs:element name="SkuInfo">
+        <xs:complexType>
+            <xs:sequence>
+                <xs:element minOccurs="1" maxOccurs="unbounded" 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>
@@ -1702,12 +1859,22 @@
             <xs:sequence minOccurs="1" maxOccurs="unbounded">
                 <xs:element name="SystemTable">
                     <xs:complexType>
-                        <xs:sequence>
+                        <xs:sequence minOccurs="1" maxOccurs="unbounded">
+                            <!-- Remove Entry from Use -->
                             <xs:element minOccurs="0" maxOccurs="1" name="Entry" type="xs:normalizedString"/>
                         </xs:sequence>
                         <xs:attributeGroup ref="SystemTableAttributes"/>
                     </xs:complexType>
                 </xs:element>
+                <xs:element minOccurs="0" maxOccurs="unbounded" name="SystemTableCName">
+                    <xs:complexType>
+                        <xs:simpleContent>
+                            <xs:extension base="C_NameType">
+                                <xs:attributeGroup ref="SystemTableAttributes"/>
+                            </xs:extension>
+                        </xs:simpleContent>
+                    </xs:complexType>
+                </xs:element>                
             </xs:sequence>
         </xs:complexType>
     </xs:element>
@@ -1728,17 +1895,16 @@
     </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:sequence>
+                <xs:any minOccurs="0" maxOccurs="unbounded" processContents="lax" namespace="##local"/>
+            </xs:sequence>
+            <xs:attribute name="UserID" type="xs:NCName" use="required"/>
+            <xs:attribute name="Identifier" type="xs:nonNegativeInteger" use="required"/>
         </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">
@@ -1748,11 +1914,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="C_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>
@@ -1835,4 +2011,14 @@
         </xs:complexType>
     </xs:element>
     <xs:element name="Version" type="xs:normalizedString"/>
+    <xs:element name="FarList">
+        <xs:annotation>
+            <xs:documentation xml:lang="en">This tag is used in the Framework Package Database File to track all DISTRIBUTION packages (FAR files) installed in a workspace. (Database)</xs:documentation>
+        </xs:annotation>
+        <xs:complexType>
+            <xs:sequence>
+                <xs:element minOccurs="1" maxOccurs="unbounded" name="Filename" type="PathAndFilename"/>
+            </xs:sequence>
+        </xs:complexType>
+    </xs:element>    
 </xs:schema>