X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=Tools%2FXMLSchema%2FFrameworkDataElements.xsd;h=d43cd96bbd4cbb1c7f03ed4c3592f7c2c88421ce;hb=b1d9f2a3cb7835d73851ab7ff37d920e3c702c35;hp=c6bf6b2d0982e3858b5c6469b22bbb1c86e99dcd;hpb=9d617132f64786ba20a0f9f8b3959e9cce2b846d;p=mirror_edk2.git

diff --git a/Tools/XMLSchema/FrameworkDataElements.xsd b/Tools/XMLSchema/FrameworkDataElements.xsd
index c6bf6b2d09..d43cd96bbd 100644
--- a/Tools/XMLSchema/FrameworkDataElements.xsd
+++ b/Tools/XMLSchema/FrameworkDataElements.xsd
@@ -19,18 +19,11 @@
     <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>
@@ -46,7 +39,6 @@
                     </xs:simpleType>
                 </xs:element>
             </xs:sequence>
-            <xs:attributeGroup ref="SectionAttributes"/>
         </xs:complexType>
     </xs:element>
     <xs:element name="AntTask">
@@ -84,6 +76,9 @@
             <xs:sequence minOccurs="1" maxOccurs="unbounded">
                 <xs:element name="BootMode">
                     <xs:complexType>
+                        <xs:sequence minOccurs="0">
+                            <xs:element name="HelpText" type="Paragraph"/>
+                        </xs:sequence>
                         <xs:attributeGroup ref="BootModeAttributes"/>
                     </xs:complexType>
                 </xs:element>
@@ -103,6 +98,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>
@@ -131,10 +127,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>
@@ -174,12 +216,12 @@
         <xs:complexType>
             <xs:sequence minOccurs="1" maxOccurs="unbounded">
                 <xs:element name="DataHubRecord">
-                    <xs:complexType>
-                        <xs:simpleContent>
-                            <xs:extension base="xs:normalizedString">
-                                <xs:attributeGroup ref="DataHubAttributes"/>
-                            </xs:extension>
-                        </xs:simpleContent>
+                    <xs:complexType mixed="true">
+                        <xs:sequence>
+                            <xs:element minOccurs="0" maxOccurs="1" name="DataHubCName" type="C_NameType"/>
+                            <xs:element minOccurs="0" maxOccurs="1" name="HelpText" type="Paragraph"/>
+                        </xs:sequence>
+                        <xs:attributeGroup ref="DataHubAttributes"/>
                     </xs:complexType>
                 </xs:element>
                 <!-- Remove Arch and use Arch Attribute for DataHubRecord instead. -->
@@ -243,11 +285,20 @@
                 <xs:element minOccurs="0" maxOccurs="1" name="CreateEvents">
                     <xs:complexType>
                         <xs:sequence minOccurs="1" maxOccurs="unbounded">
-                            <xs:element name="Event">
+                            <xs:element minOccurs="0" maxOccurs="unbounded" name="EventTypes">
+                                <xs:complexType>
+                                    <xs:sequence>
+                                        <xs:element minOccurs="1" maxOccurs="1" name="EventType" type="EventTypes"/>
+                                        <xs:element minOccurs="0" maxOccurs="1" name="HelpText" type="Paragraph"/>
+                                    </xs:sequence>
+                                    <xs:attributeGroup ref="EventAttributes"/>
+                                </xs:complexType>
+                            </xs:element>                            
+                            <xs:element minOccurs="0" name="Event">
                                 <xs:complexType>
                                     <xs:sequence>
                                         <xs:choice>
-                                            <xs:element minOccurs="0" maxOccurs="1" name="GuidC_Name" type="GuidC_NameType"/>
+                                            <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>
@@ -289,11 +340,20 @@
                     </xs:annotation>
                     <xs:complexType>
                         <xs:sequence minOccurs="1" maxOccurs="unbounded">
-                            <xs:element name="Event">
+                            <xs:element minOccurs="0" maxOccurs="unbounded" name="EventTypes">
+                                <xs:complexType>
+                                    <xs:sequence>
+                                        <xs:element minOccurs="1" maxOccurs="1" name="EventType" type="EventTypes"/>
+                                        <xs:element minOccurs="0" maxOccurs="1" name="HelpText" type="Paragraph"/>
+                                    </xs:sequence>
+                                    <xs:attributeGroup ref="EventAttributes"/>
+                                </xs:complexType>
+                            </xs:element>                            
+                            <xs:element minOccurs="0" name="Event">
                                 <xs:complexType>
                                     <xs:sequence>
                                         <xs:choice>
-                                            <xs:element minOccurs="0" maxOccurs="1" name="GuidC_Name" type="GuidC_NameType"/>
+                                            <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>
@@ -336,6 +396,7 @@
         <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">
@@ -375,7 +436,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>
@@ -450,7 +510,7 @@
         </xs:annotation>
         <xs:complexType>
             <xs:simpleContent>
-                <xs:extension base="VariableConvention">
+                <xs:extension base="PathAndFilename">
                     <xs:attributeGroup ref="FilenameAttributes"/>
                 </xs:extension>
             </xs:simpleContent>
@@ -534,12 +594,12 @@
                 <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" ref="HelpText"/>
+                            <xs:element minOccurs="0" maxOccurs="1" name="HelpText" type="Paragraph"/>
                         </xs:sequence>
                         <xs:attributeGroup ref="GuidDeclarationAttributes"/>
                     </xs:complexType>
@@ -550,7 +610,19 @@
     <xs:element name="Guids">
         <xs:complexType>
             <xs:sequence minOccurs="1" maxOccurs="unbounded">
-                <xs:element name="GuidEntry">
+                <xs:element minOccurs="0" maxOccurs="unbounded" name="GuidCNames">
+                    <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:sequence>
+                            <xs:element minOccurs="1" maxOccurs="1" name="GuidCName" type="C_NameType"/>
+                            <xs:element minOccurs="0" maxOccurs="1" name="HelpText" type="Paragraph"/>
+                        </xs:sequence>
+                        <xs:attributeGroup ref="GuidAttributes"/>
+                    </xs:complexType>
+                </xs:element>
+                <xs:element minOccurs="0" name="GuidEntry">
                     <xs:annotation>
                         <xs:documentation xml:lang="en">Describe the valid content of a GUID element in and MSA file.</xs:documentation>
                     </xs:annotation>
@@ -608,12 +680,12 @@
         <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 mixed="true">
+                        <xs:sequence>
+                            <xs:element minOccurs="0" maxOccurs="1" name="HiiCName" type="C_NameType"/>
+                            <xs:element minOccurs="0" maxOccurs="1" name="HelpText" type="Paragraph"/>
+                        </xs:sequence>
+                        <xs:attributeGroup ref="HiiPackageAttributes"/>
                     </xs:complexType>
                 </xs:element>
             </xs:sequence>
@@ -622,13 +694,22 @@
     <xs:element name="Hobs">
         <xs:complexType>
             <xs:sequence minOccurs="1" maxOccurs="unbounded">
-                <xs:element name="Hob">
+                <xs:element minOccurs="0" maxOccurs="unbounded" name="HobTypes">
+                    <xs:complexType>
+                        <xs:sequence>
+                            <xs:element minOccurs="1" maxOccurs="1" name="HobType" type="HobTypes"/>
+                            <xs:element minOccurs="0" maxOccurs="1" name="HelpText" type="Paragraph"/>
+                        </xs:sequence>
+                        <xs:attributeGroup ref="HobAttributes"/>
+                    </xs:complexType>
+                </xs:element>                
+                <xs:element minOccurs="0" name="Hob">
                     <xs:complexType>
                         <xs:sequence>
                             <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: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"/>
@@ -702,9 +783,9 @@
     <xs:element name="IndustryStdHeader">
         <xs:complexType>
             <xs:sequence>
-                <xs:element minOccurs="1" maxOccurs="1" name="Header" type="UiNameType"/>
+                <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" ref="HelpText"/>
+                <xs:element minOccurs="1" maxOccurs="1" name="HelpText" type="Paragraph"/>
             </xs:sequence>
             <xs:attributeGroup ref="IndustryStdHeaderAttributes"/>
         </xs:complexType>
@@ -743,6 +824,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>
@@ -750,12 +836,12 @@
         <xs:annotation>
             <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="xs:NCName">
-                    <xs:attributeGroup ref="LibraryClassAttributes"/>
-                </xs:extension>
-            </xs:simpleContent>
+        <xs:complexType mixed="true">
+            <xs:sequence>
+                <xs:element minOccurs="0" maxOccurs="1" name="Keyword" type="KeywordType"/>
+                <xs:element minOccurs="0" maxOccurs="1" name="HelpText" type="Paragraph"/>
+            </xs:sequence>            
+            <xs:attributeGroup ref="LibraryClassAttributes"/>
         </xs:complexType>
     </xs:element>
     <!-- LAH This is LibraryClassDeclaration FINAL version -->
@@ -775,7 +861,10 @@
                         </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>
@@ -784,6 +873,15 @@
         <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>
@@ -792,8 +890,8 @@
             <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>
-            <xs:sequence minOccurs="1" maxOccurs="unbounded">
-                <xs:element ref="LibraryClass"/>
+            <xs:sequence>
+                <xs:element ref="LibraryClass" minOccurs="1" maxOccurs="unbounded"/>
             </xs:sequence>
         </xs:complexType>
     </xs:element>
@@ -893,7 +991,7 @@
                     </xs:complexType>
                 </xs:element>
             </xs:sequence>
-            <xs:element minOccurs="1" maxOccurs="unbounded" ref="Filename"/>
+              <xs:element minOccurs="0" maxOccurs="unbounded" name="Filename" type="PathAndFilename"/>
           </xs:choice>
         </xs:complexType>
     </xs:element>
@@ -927,6 +1025,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>
@@ -975,7 +1109,10 @@
         </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>
@@ -1008,7 +1145,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>
@@ -1033,9 +1170,18 @@
                         <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>
@@ -1061,230 +1207,6 @@
             </xs:simpleContent>
         </xs:complexType>
     </xs:element>
-    <xs:element name="PcdBuildDeclarations">
-        <xs:annotation>
-            <xs:documentation xml:lang="en">NEW: Will become a child of ModuleSA in the FPD</xs:documentation>
-        </xs:annotation>
-        <xs:complexType>
-            <xs:choice minOccurs="1">
-                <xs:element minOccurs="0" maxOccurs="1" ref="Filename"/>
-                <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="1" maxOccurs="1" name="Token">
-                                <xs:annotation>
-                                    <xs:documentation xml:lang="en">This as a unique identifier defined for either this name space.</xs:documentation>
-                                    <xs:documentation xml:lang="en">The Target Attribute may be used to define a Target name space, such as PCI.</xs:documentation>
-                                </xs:annotation>
-                                <xs:complexType>
-                                    <xs:simpleContent>
-                                        <xs:extension base="HexDoubleWordDataType">
-                                            <xs:attribute name="Target" type="C_Name" use="optional"/>
-                                        </xs:extension>
-                                    </xs:simpleContent>
-                                </xs:complexType>
-                            </xs:element>
-                            <xs:element minOccurs="0" maxOccurs="1" name="TokenSpaceGuid" type="GuidType"/>
-                            <xs:element minOccurs="1" maxOccurs="1" name="DatumType" type="PcdDataTypes">
-                                <xs:annotation>
-                                    <xs:documentation xml:lang="en">This specifies the size of the Pcd Datum. It is either 8, 16, 32 or 64 bits for values, 1 bit for BOOLEAN and variable length for elements defined as VOID*</xs:documentation>
-                                </xs:annotation>
-                            </xs:element>
-                            <xs:element default="false" minOccurs="1" maxOccurs="1" name="HiiEnable" type="xs:boolean">
-                                <xs:annotation>
-                                    <xs:documentation xml:lang="en">This Bit means that the Variable data is associated with HII</xs:documentation>
-                                </xs:annotation>
-                            </xs:element>
-                            <xs:element default="false" minOccurs="1" maxOccurs="1" name="VpdEnable" type="xs:boolean">
-                                <xs:annotation>
-                                    <xs:documentation xml:lang="en">This bit enables the Vital Product Data area within flash for maintaining PCD information</xs:documentation>
-                                </xs:annotation>
-                            </xs:element>
-                            <xs:element default="false" minOccurs="1" maxOccurs="1" name="AlternateNameSpaceEnable" type="xs:boolean">
-                                <xs:annotation>
-                                    <xs:documentation>This is only applicable to ItemType DYNAMIC_EX</xs:documentation>
-                                </xs:annotation>
-                            </xs:element>
-                            <xs:element default="false" minOccurs="1" maxOccurs="1" name="SkuEnable" type="xs:boolean"/>
-                            <xs:element default="false" minOccurs="1" maxOccurs="1" name="SkuDataArrayEnable" type="xs:boolean"/>
-                            <xs:choice minOccurs="0">
-                                <xs:element minOccurs="0" maxOccurs="1" name="SkuDataArray">
-                                    <xs:annotation>
-                                        <xs:documentation xml:lang="en">This element is a list of two entries per line, the first should be an integer, while the second entry should be a string value</xs:documentation>
-                                    </xs:annotation>
-                                    <xs:simpleType>
-                                        <xs:list itemType="xs:normalizedString"/>
-                                    </xs:simpleType>
-                                </xs:element>
-                                <xs:element minOccurs="0" maxOccurs="unbounded" name="SkuData">
-                                    <xs:annotation>
-                                        <xs:documentation xml:lang="en">This section is for a list of SkuData Elements, ID and Value</xs:documentation>
-                                    </xs:annotation>
-                                    <xs:complexType>
-                                        <xs:sequence minOccurs="1">
-                                            <xs:element name="Id" type="xs:int"/>
-                                            <xs:element name="Value" type="xs:normalizedString"/>
-                                        </xs:sequence>
-                                    </xs:complexType>
-                                </xs:element>
-                            </xs:choice>
-                            <xs:element default="0x00" minOccurs="1" maxOccurs="1" name="MaxSku" type="HexByteDataType">
-                                <xs:annotation>
-                                    <xs:documentation xml:lang="en">This value comes from a production line database, and has nothing to do with the number of SkuData IDs that have been defined.</xs:documentation>
-                                </xs:annotation>
-                            </xs:element>
-                            <xs:element default="0x00" minOccurs="1" maxOccurs="1" name="SkuId" type="HexByteDataType">
-                                <xs:annotation>
-                                    <xs:documentation xml:lang="en">This is the specific Sku ID for this build.</xs:documentation>
-                                </xs:annotation>
-                            </xs:element>
-                            <xs:element minOccurs="1" maxOccurs="1" name="DatumSize">
-                                <xs:annotation>
-                                    <xs:documentation xml:lang="en">Max Number of Bytes of the data.</xs:documentation>
-                                </xs:annotation>
-                                <xs:simpleType>
-                                    <xs:restriction base="xs:int">
-                                        <xs:minInclusive value="1"/>
-                                        <xs:maxInclusive value="16777215"/>
-                                    </xs:restriction>
-                                </xs:simpleType>
-                            </xs:element>
-                            <xs:element minOccurs="1" maxOccurs="1" name="VariableGuid" type="VariableGuidType">
-                                <xs:annotation>
-                                    <xs:documentation xml:lang="en">This is the Variable's GUID if and only if HII is enabled.</xs:documentation>
-                                </xs:annotation>
-                            </xs:element>
-                            <xs:element minOccurs="1" maxOccurs="1" name="VariableName" type="xs:normalizedString">
-                                <xs:annotation>
-                                    <xs:documentation xml:lang="en">This is the C Name for the Variable, and is valid if and only HII is enabled.</xs:documentation>
-                                </xs:annotation>
-                            </xs:element>
-                            <xs:element minOccurs="0" maxOccurs="1" name="VariableValueDefault" type="xs:normalizedString"/>
-                            <xs:element minOccurs="1" maxOccurs="1" name="DataOffset" type="Hex64BitDataType">
-                                <xs:annotation>
-                                    <xs:documentation xml:lang="en">If HII is enabled, This is the offset into the variable data entry, If Vpd is enabled, then it's the Offset into the VPD area of the image defined by platform manufacturer, if neither HII nor Vpd are enabled, it's the offset into the PCD Data Area. HII and VPD can never be enabled at the same time (as of the date of this document.)</xs:documentation>
-                                </xs:annotation>
-                            </xs:element>
-                            <xs:element minOccurs="0" maxOccurs="1" name="GuidOffset" type="Hex64BitDataType">
-                                <xs:annotation>
-                                    <xs:documentation xml:lang="en">FIELD IS NOT USED! REMOVE in FINAL!</xs:documentation>
-                                </xs:annotation>
-                            </xs:element>
-                            <xs:element minOccurs="1" maxOccurs="1" name="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: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="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">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: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>
@@ -1292,10 +1214,10 @@
         </xs:annotation>
         <xs:complexType>
             <xs:sequence>
-                <xs:element minOccurs="0" maxOccurs="unbounded" name="PcdBuildData">
+                <xs:element minOccurs="1" maxOccurs="unbounded" name="PcdBuildData">
                     <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: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"/>
@@ -1313,7 +1235,7 @@
                                 </xs:complexType>
                             </xs:element>
                         </xs:sequence>
-                        <xs:attributeGroup ref="PcdAttributes"/>
+                        <xs:attributeGroup ref="DynamicBuildPcdAttributes"/>
                     </xs:complexType>
                 </xs:element>
             </xs:sequence>
@@ -1324,16 +1246,17 @@
             <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:sequence>
+                <xs:element minOccurs="1" maxOccurs="unbounded" name="PcdData">
                     <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: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="TokenSpaceGuid" type="GuidType"/>
                             <xs:element minOccurs="1" maxOccurs="1" name="DatumType" type="PcdDataTypes"/>
+                            <!-- MaxDatumSize is only required if the DatumType is VOID* -->
                             <xs:element minOccurs="0" maxOccurs="1" name="MaxDatumSize" type="DatumSizeLimitation"/>                            
-                            <xs:element minOccurs="0" maxOccurs="1" name="Value" type="xs:normalizedString"/>
+                            <xs:element minOccurs="0" maxOccurs="1" name="Value" type="DefaultValueType"/>
                         </xs:sequence>
                         <xs:attributeGroup ref="PcdBuildDefinitionAttributes"/>
                     </xs:complexType>
@@ -1343,7 +1266,7 @@
     </xs:element>
     <xs:group name="DefaultGroup">
         <xs:sequence>
-            <xs:element minOccurs="1" maxOccurs="1" name="Value" type="xs:normalizedString"/>
+            <xs:element minOccurs="1" maxOccurs="1" name="Value" type="DefaultValueType"/>
         </xs:sequence>
     </xs:group>
     <xs:group name="HiiEnable">
@@ -1351,10 +1274,10 @@
             <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:element minOccurs="0" maxOccurs="1" name="HiiDefaultValue" type="xs:normalizedString"/>
+            <xs:element minOccurs="1" maxOccurs="1" name="VariableName" type="VariableNameDataType"/>
+            <xs:element minOccurs="0" maxOccurs="1" name="VariableGuid" type="C_NameType"/>
+            <xs:element minOccurs="1" maxOccurs="1" name="VariableOffset" type="Hex64BitDataType"/>
+            <xs:element minOccurs="1" maxOccurs="1" name="HiiDefaultValue" type="DefaultValueType"/>
         </xs:sequence>
     </xs:group>
     <xs:group name="VpdEnable">
@@ -1362,7 +1285,7 @@
             <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:element minOccurs="1" maxOccurs="1" name="VpdOffset" type="Hex64BitDataType"/>
         </xs:sequence>
     </xs:group>
     <xs:element name="PcdCoded">
@@ -1370,20 +1293,20 @@
             <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:sequence>
+                <xs:element minOccurs="1" 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:element minOccurs="1" maxOccurs="1" name="C_Name" type="C_NameType"/>
+                            <xs:element minOccurs="0" maxOccurs="1" name="DefaultValue" type="DefaultValueType"/>
+                            <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:attributeGroup ref="PcdCodedAttributes"/>
                     </xs:complexType>
                 </xs:element>
             </xs:sequence>
@@ -1400,13 +1323,13 @@
                 <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="C_Name" type="C_NameType"/>
                             <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:element minOccurs="0" maxOccurs="1" name="DefaultValue" type="DefaultValueType"/>
+                            <xs:element minOccurs="1" maxOccurs="1" name="HelpText" type="Paragraph"/>
                         </xs:sequence>
                         <xs:attributeGroup ref="PcdDeclarationAttributes"/>
                     </xs:complexType>
@@ -1456,7 +1379,7 @@
                             <xs:element minOccurs="0" maxOccurs="1" name="VariableGuid" type="VariableGuidType"/>
                             <xs:element minOccurs="0" maxOccurs="1" name="DataOffset" type="Hex64BitDataType"/>
                             <xs:element default="0" minOccurs="0" maxOccurs="1" name="GuidOffset" type="Hex64BitDataType"/>
-                            <xs:element minOccurs="0" maxOccurs="1" name="DefaultValue" type="DefaultValue"/>
+                            <xs:element minOccurs="0" maxOccurs="1" name="DefaultValue" type="DefaultValueType"/>
                         </xs:sequence>
                         <xs:attributeGroup ref="PcdAttributes"/>
                     </xs:complexType>
@@ -1503,13 +1426,13 @@
                 <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="1" ref="HelpText"/>
+                            <xs:element minOccurs="0" maxOccurs="1" name="HelpText" type="Paragraph"/>
                         </xs:sequence>
                         <xs:attributeGroup ref="PpiDeclarationAttributes"/>
                     </xs:complexType>
@@ -1524,21 +1447,21 @@
         <xs:complexType>
             <xs:sequence minOccurs="1">
                 <xs:element minOccurs="0" maxOccurs="unbounded" name="Ppi">
-                    <xs:complexType>
-                        <xs:simpleContent>
-                            <xs:extension base="C_Name">
-                                <xs:attributeGroup ref="PpiAttributes"/>
-                            </xs:extension>
-                        </xs:simpleContent>
+                    <xs:complexType mixed="true">
+                        <xs:sequence>
+                            <xs:element minOccurs="0" maxOccurs="1" name="PpiCName" type="C_NameType"/>
+                            <xs:element minOccurs="0" maxOccurs="1" name="HelpText" type="Paragraph"/>
+                        </xs:sequence>
+                        <xs:attributeGroup ref="PpiAttributes"/>
                     </xs:complexType>
                 </xs:element>
                 <xs:element minOccurs="0" maxOccurs="unbounded" name="PpiNotify">
-                    <xs:complexType>
-                        <xs:simpleContent>
-                            <xs:extension base="C_Name">
-                                <xs:attributeGroup ref="PpiNotifyAttributes"/>
-                            </xs:extension>
-                        </xs:simpleContent>
+                    <xs:complexType mixed="true">
+                        <xs:sequence>
+                            <xs:element minOccurs="0" maxOccurs="1" name="PpiNotifyCName" type="C_NameType"/>
+                            <xs:element minOccurs="0" maxOccurs="1" name="HelpText" type="Paragraph"/>
+                        </xs:sequence>
+                        <xs:attributeGroup ref="PpiNotifyAttributes"/>
                     </xs:complexType>
                 </xs:element>
                 <!-- DO NOT USE Arch element, use Arch Attribute in above instead. -->
@@ -1579,12 +1502,12 @@
                 <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>
                                 <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:element minOccurs="0" maxOccurs="1" name="HelpText" type="Paragraph"/>
                         </xs:sequence>
                         <xs:attributeGroup ref="ProtocolDeclarationAttributes"/>
                     </xs:complexType>
@@ -1599,21 +1522,21 @@
         <xs:complexType>
             <xs:sequence minOccurs="1" maxOccurs="unbounded">
                 <xs:element minOccurs="0" maxOccurs="unbounded" name="Protocol">
-                    <xs:complexType>
-                        <xs:simpleContent>
-                            <xs:extension base="C_Name">
-                                <xs:attributeGroup ref="ProtocolAttributes"/>
-                            </xs:extension>
-                        </xs:simpleContent>
+                    <xs:complexType mixed="true">
+                        <xs:sequence>
+                            <xs:element minOccurs="0" maxOccurs="1" name="ProtocolCName" type="C_NameType"/>
+                            <xs:element minOccurs="0" maxOccurs="1" name="HelpText" type="Paragraph"/>
+                        </xs:sequence>
+                        <xs:attributeGroup ref="ProtocolAttributes"/>
                     </xs:complexType>
                 </xs:element>
                 <xs:element minOccurs="0" maxOccurs="unbounded" name="ProtocolNotify">
-                    <xs:complexType>
-                        <xs:simpleContent>
-                            <xs:extension base="C_Name">
-                                <xs:attributeGroup ref="ProtocolNotifyAttributes"/>
-                            </xs:extension>
-                        </xs:simpleContent>
+                    <xs:complexType mixed="true">
+                        <xs:sequence>
+                            <xs:element minOccurs="0" maxOccurs="1" name="ProtocolNotifyCName" type="C_NameType"/>
+                            <xs:element minOccurs="0" maxOccurs="1" name="HelpText" type="Paragraph"/>
+                        </xs:sequence>
+                        <xs:attributeGroup ref="ProtocolNotifyAttributes"/>
                     </xs:complexType>
                 </xs:element>
                 <!-- DO NOT USE! removing Arch element, use Arch attribute of Protocol or ProtocolNotify instead. -->
@@ -1623,7 +1546,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>
@@ -1632,7 +1555,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>
@@ -1710,8 +1633,8 @@
     </xs:element>
     <xs:element name="SkuInfo">
         <xs:complexType>
-            <xs:sequence minOccurs="1" maxOccurs="unbounded">
-                <xs:element name="UiSkuName">
+            <xs:sequence>
+                <xs:element minOccurs="1" maxOccurs="unbounded" name="UiSkuName">
                     <xs:complexType>
                         <xs:simpleContent>
                             <xs:extension base="UiNameType">
@@ -1744,11 +1667,17 @@
                 <xs:element name="SystemTable">
                     <xs:complexType>
                         <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>
+                            <!-- 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="SystemTableCNames">
+                    <xs:complexType>
+                        <xs:sequence>
+                            <xs:element minOccurs="1" maxOccurs="1" name="SystemTableCName" type="C_NameType"/>
+                            <xs:element minOccurs="0" maxOccurs="1" name="HelpText" type="Paragraph"/>
                         </xs:sequence>
                         <xs:attributeGroup ref="SystemTableAttributes"/>
                     </xs:complexType>
@@ -1773,12 +1702,11 @@
     </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">
@@ -1805,8 +1733,9 @@
                                 <!-- 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:element minOccurs="0" maxOccurs="1" name="GuidC_Name" type="C_NameType"/>
                             </xs:choice>
+                            <xs:element minOccurs="0" maxOccurs="1" name="HelpText" type="Paragraph"/>                            
                             <!-- DO NOT USE, removiing  ByteOffset, Bit Offset and OffsetBitSize-->
                             <xs:element minOccurs="0" maxOccurs="1" name="ByteOffset" type="HexWordDataType">
                                 <xs:annotation>
@@ -1890,4 +1819,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>