Several changes - add <PcdIsDriver> optional element to <Externs> Changed FlashDeviceInfo Attributes to use the correct one.

Added comments (and wrapped some elements in <xs:choice> for new elements) and minor tweaks.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@363 6f19259b-4bc3-4df7-8a09-765794883524

4 files changed, 278 insertions, 224 deletions

diff --git a/Tools/XMLSchema/FrameworkDataElements.xsd b/Tools/XMLSchema/FrameworkDataElements.xsd
index 1d34b49e13..52e5c1cc07 100644
--- a/Tools/XMLSchema/FrameworkDataElements.xsd
+++ b/Tools/XMLSchema/FrameworkDataElements.xsd
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" xmlns="http://www.TianoCore.org/2006/Edk2.0" targetNamespace="http://www.TianoCore.org/2006/Edk2.0">

-  <!--

+    <!--

     Filename: FrameworkDataElements.xsd

     

     Copyright (c) 2006, Intel Corp.

@@ -12,41 +12,41 @@
     WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.

     

   -->

-  <xs:annotation>

-    <xs:documentation xml:lang="en"> This schema defines EFI and Framework Data Elements </xs:documentation>

-  </xs:annotation>

-  <xs:include schemaLocation="NamingConvention.xsd"/>

-  <xs:include schemaLocation="FrameworkDataTypes.xsd"/>

-  <xs:include schemaLocation="FrameworkDataAttributes.xsd"/>

-  <xs:element name="Abstract">

     <xs:annotation>

-      <xs:documentation xml:lang="en">Abstract is valid for all Description Files</xs:documentation>

-      <xs:documentation xml:lang="en">This section is required. This is a single sentence to describe the module and will be used in sample files as the abstract data in the header comment section.</xs:documentation>

+        <xs:documentation xml:lang="en"> This schema defines EFI and Framework Data Elements </xs:documentation>

     </xs:annotation>

-      <xs:complexType>

-        <xs:simpleContent>

-          <xs:extension base="Sentence">

-            <xs:attribute name="URL" type="xs:anyURI" use="optional"/>

-          </xs:extension>

-        </xs:simpleContent>

-      </xs:complexType>

-  </xs:element>

-  <xs:element name="AntCmd">

-    <xs:annotation>

-      <xs:documentation xml:lang="en">This is a sub-element of AntTask</xs:documentation>

-      <xs:documentation xml:lang="en">This is an ant command that will be inserted into a biuld sequence. Since ant commands are valid XML statements, special care must be taken to use the correct tokens for reserved words and escape quote characters.</xs:documentation>

-    </xs:annotation>

-    <xs:complexType>

-      <xs:sequence>

-        <xs:element minOccurs="0" name="Id" type="xs:int"/>

-          <xs:element name="ExecutionOrder">

-            <xs:simpleType>

-              <xs:list itemType="xs:normalizedString"/>

-            </xs:simpleType>

-          </xs:element>

-        </xs:sequence>

-        <xs:attributeGroup ref="SectionAttributes"/>

-      </xs:complexType>

+    <xs:include schemaLocation="NamingConvention.xsd"/>

+    <xs:include schemaLocation="FrameworkDataTypes.xsd"/>

+    <xs:include schemaLocation="FrameworkDataAttributes.xsd"/>

+    <xs:element name="Abstract">

+        <xs:annotation>

+            <xs:documentation xml:lang="en">Abstract is valid for all Description Files</xs:documentation>

+            <xs:documentation xml:lang="en">This section is required. This is a single sentence to describe the module and will be used in sample files as the abstract data in the header comment section.</xs:documentation>

+        </xs:annotation>

+        <xs:complexType>

+            <xs:simpleContent>

+                <xs:extension base="Sentence">

+                    <xs:attribute name="URL" type="xs:anyURI" use="optional"/>

+                </xs:extension>

+            </xs:simpleContent>

+        </xs:complexType>

+    </xs:element>

+    <xs:element name="AntCmd">

+        <xs:annotation>

+            <xs:documentation xml:lang="en">This is a sub-element of AntTask</xs:documentation>

+            <xs:documentation xml:lang="en">This is an ant command that will be inserted into a biuld sequence. Since ant commands are valid XML statements, special care must be taken to use the correct tokens for reserved words and escape quote characters.</xs:documentation>

+        </xs:annotation>

+        <xs:complexType>

+            <xs:sequence>

+                <xs:element minOccurs="0" name="Id" type="xs:int"/>

+                <xs:element name="ExecutionOrder">

+                    <xs:simpleType>

+                        <xs:list itemType="xs:normalizedString"/>

+                    </xs:simpleType>

+                </xs:element>

+            </xs:sequence>

+            <xs:attributeGroup ref="SectionAttributes"/>

+        </xs:complexType>

     </xs:element>

     <xs:element name="AntTask">

         <xs:annotation>

@@ -322,8 +322,9 @@
             <xs:documentation xml:lang="en">This is a list of Extern statements, right now, only Driver Binding information is provided.</xs:documentation>

         </xs:annotation>

         <xs:complexType>

-            <xs:sequence minOccurs="1" maxOccurs="unbounded">

-                <xs:element name="Extern">

+            <xs:sequence minOccurs="1">

+                <xs:element minOccurs="0" maxOccurs="1" name="PcdIsDriver" type="PcdDriverTypes"/>

+                <xs:element minOccurs="0" maxOccurs="unbounded" name="Extern">

                     <xs:complexType>

                         <xs:choice minOccurs="1">

                             <xs:sequence minOccurs="0" maxOccurs="1">

@@ -873,7 +874,7 @@
                             <xs:element minOccurs="0" maxOccurs="1" ref="HelpText"/>

                         </xs:sequence>

                         <xs:attributeGroup ref="PcdAttributes"/>

-                        <xs:attribute name="PcdIsDriver" use="optional" />

+                        <xs:attribute name="PcdIsDriver" use="optional"/>

                     </xs:complexType>

                 </xs:element>

             </xs:sequence>

@@ -1068,127 +1069,128 @@
                         </xs:sequence>

                         <xs:attributeGroup ref="PcdAttributes"/>

                         <xs:attribute name="PcdIsDriver">

-                           <xs:simpleType>

-                             <xs:annotation>

-                               <xs:documentation xml:lang="en">This is an enumerated data type that will be used for DYNAMIC_EX, PEIM or DXE only</xs:documentation>

-                             </xs:annotation>

-                             <xs:restriction base="UCNameType">

-                               <xs:enumeration value="PEI_PCD_DRIVER"/>

-                               <xs:enumeration value="DXE_PCD_DRIVER"/>

-                             </xs:restriction>

-                           </xs:simpleType>

-                         </xs:attribute>

+                            <xs:simpleType>

+                                <xs:annotation>

+                                    <xs:documentation xml:lang="en">This is an enumerated data type that will be used for DYNAMIC_EX, PEIM or DXE only</xs:documentation>

+                                </xs:annotation>

+                                <xs:restriction base="UCNameType">

+                                    <xs:enumeration value="PEI_PCD_DRIVER"/>

+                                    <xs:enumeration value="DXE_PCD_DRIVER"/>

+                                </xs:restriction>

+                            </xs:simpleType>

+                        </xs:attribute>

                     </xs:complexType>

                 </xs:element>

             </xs:choice>

         </xs:complexType>

-    </xs:element> <!-- PcdBuildDeclarations -->

-  <xs:element name="PcdDynamicBuildDeclarations">

-    <xs:annotation>

-      <xs:documentation xml:lang="en">Child of Framework Platform Description (FPD)</xs:documentation>

-        <xs:documentation xml:lang="en">We permit the FPD to use an external XML file for PCD information or else the information must be contained within the XML data element, PcdBuildData.</xs:documentation>

-      </xs:annotation>

-      <xs:complexType>

-        <xs:sequence>

-          <xs:element minOccurs="0" maxOccurs="unbounded" name="PcdBuildData">

-            <xs:annotation>

-              <xs:documentation xml:lang="en">Child of PcdBuildDeclarations</xs:documentation>

-              <xs:documentation xml:lang="en">This is date element is used in the platform build description file and contains valid data for a Platform Build</xs:documentation>

-              <xs:documentation xml:lang="en">There is ONE required Attribute, ItemType</xs:documentation>

-            </xs:annotation>

-            <xs:complexType>

-              <xs:sequence>

-                <xs:element minOccurs="1" maxOccurs="1" ref="C_Name"/>

-                <xs:element minOccurs="0" maxOccurs="1" name="TokenSpaceGuid" type="GuidType"/>

-                <xs:element minOccurs="1" maxOccurs="1" name="Token">

-                  <xs:annotation>

-                    <xs:documentation xml:lang="en">This as a unique identifier defined for either this name space.</xs:documentation>

-                    <xs:documentation xml:lang="en">The Target Attribute may be used to define a Target name space, such as PCI.</xs:documentation>

-                  </xs:annotation>

-                  <xs:complexType>

-                    <xs:simpleContent>

-                      <xs:extension base="HexDoubleWordDataType">

-                        <xs:attribute name="Target" type="C_Name" use="optional"/>

-                      </xs:extension>

-                    </xs:simpleContent>

-                  </xs:complexType>

-                </xs:element>

-                <xs:element minOccurs="1" maxOccurs="1" name="DatumType" type="PcdDataTypes">

-                  <xs:annotation>

-                    <xs:documentation xml:lang="en">This specifies the size of the Pcd Datum. It is either 8, 16, 32 or 64 bits for values, 1 bit for BOOLEAN and variable length for elements defined as VOID*</xs:documentation>

-                  </xs:annotation>

-                </xs:element>

-                <xs:element default="false" minOccurs="1" maxOccurs="1" name="HiiEnable" type="xs:boolean">

-                  <xs:annotation>

-                    <xs:documentation xml:lang="en">This Bit means that the Variable data is associated with HII</xs:documentation>

-                  </xs:annotation>

-                </xs:element>

-                <xs:element default="false" minOccurs="1" maxOccurs="1" name="VpdEnable" type="xs:boolean">

-                  <xs:annotation>

-                    <xs:documentation xml:lang="en">This bit enables the Vital Product Data area within flash for maintaining PCD information</xs:documentation>

-                  </xs:annotation>

-                </xs:element>

-                <xs:element default="false" minOccurs="1" maxOccurs="1" name="AlternateNameSpaceEnable" type="xs:boolean">

-                  <xs:annotation>

-                    <xs:documentation>This is only applicable to ItemType DYNAMIC_EX</xs:documentation>

-                  </xs:annotation>

-                </xs:element>

-                <xs:element default="false" minOccurs="1" maxOccurs="1" name="SkuEnable" type="xs:boolean"/>

-                  <xs:element default="false" minOccurs="1" maxOccurs="1" name="SkuDataArrayEnable" type="xs:boolean"/>

-                    <xs:choice minOccurs="0">

-                      <xs:element minOccurs="0" maxOccurs="1" name="SkuDataArray">

-                        <xs:annotation>

-                          <xs:documentation xml:lang="en">This element is a list of two entries per line, the first should be an integer, while the second entry should be a string value</xs:documentation>

-                        </xs:annotation>

-                        <xs:simpleType>

-                          <xs:list itemType="xs:normalizedString"/>

-                        </xs:simpleType>

-                     </xs:element>

-                     <xs:element minOccurs="0" maxOccurs="unbounded" name="SkuData">

-                       <xs:annotation>

-                         <xs:documentation xml:lang="en">This section is for a list of SkuData Elements, ID and Value</xs:documentation>

-                       </xs:annotation>

-                       <xs:complexType>

-                         <xs:sequence minOccurs="1">

-                           <xs:element name="Id" type="xs:int"/>

-                           <xs:element name="Value" type="xs:normalizedString"/>

-                         </xs:sequence>

-                       </xs:complexType>

-                     </xs:element>

-                   </xs:choice>

-                   <xs:element default="0x00" minOccurs="1" maxOccurs="1" name="MaxSku" type="HexByteDataType">

-                     <xs:annotation>

-                       <xs:documentation xml:lang="en">This value comes from a production line database, and has nothing to do with the number of SkuData IDs that have been defined.</xs:documentation>

-                     </xs:annotation>

-                   </xs:element>

-                   <xs:element default="0x00" minOccurs="1" maxOccurs="1" name="SkuId" type="HexByteDataType">

-                     <xs:annotation>

-                       <xs:documentation xml:lang="en">This is the specific Sku ID for this build.</xs:documentation>

-                     </xs:annotation>

-                   </xs:element>

-                   <xs:element minOccurs="1" maxOccurs="1" name="DatumSize">

-                     <xs:annotation>

-                       <xs:documentation xml:lang="en">Max Number of Bytes of the data.</xs:documentation>

-                     </xs:annotation>

-                     <xs:simpleType>

-                       <xs:restriction base="xs:int">

-                         <xs:minInclusive value="1"/>

-                         <xs:maxInclusive value="16777215"/>

-                       </xs:restriction>

-                     </xs:simpleType>

-                   </xs:element>

-                   <xs:element minOccurs="1" maxOccurs="1" name="VariableGuid" type="VariableGuidType">

-                     <xs:annotation>

-                       <xs:documentation xml:lang="en">This is the Variable's GUID if and only if HII is enabled.</xs:documentation>

-                     </xs:annotation>

-                   </xs:element>

-                   <xs:element minOccurs="1" maxOccurs="1" name="VariableName" type="xs:normalizedString">

-                     <xs:annotation>

-                       <xs:documentation xml:lang="en">This is the C Name for the Variable, and is valid if and only HII is enabled.</xs:documentation>

-                     </xs:annotation>

-                   </xs:element>

-                   <xs:element minOccurs="0" maxOccurs="1" name="VariableValueDefault" type="xs:normalizedString"/>

-                   <xs:element minOccurs="1" maxOccurs="1" name="DataOffset" type="Hex64BitDataType">

+    </xs:element>

+    <!-- PcdBuildDeclarations -->

+    <xs:element name="PcdDynamicBuildDeclarations">

+        <xs:annotation>

+            <xs:documentation xml:lang="en">Child of Framework Platform Description (FPD)</xs:documentation>

+            <xs:documentation xml:lang="en">We permit the FPD to use an external XML file for PCD information or else the information must be contained within the XML data element, PcdBuildData.</xs:documentation>

+        </xs:annotation>

+        <xs:complexType>

+            <xs:sequence>

+                <xs:element minOccurs="0" maxOccurs="unbounded" name="PcdBuildData">

+                    <xs:annotation>

+                        <xs:documentation xml:lang="en">Child of PcdBuildDeclarations</xs:documentation>

+                        <xs:documentation xml:lang="en">This is date element is used in the platform build description file and contains valid data for a Platform Build</xs:documentation>

+                        <xs:documentation xml:lang="en">There is ONE required Attribute, ItemType</xs:documentation>

+                    </xs:annotation>

+                    <xs:complexType>

+                        <xs:sequence>

+                            <xs:element minOccurs="1" maxOccurs="1" ref="C_Name"/>

+                            <xs:element minOccurs="0" maxOccurs="1" name="TokenSpaceGuid" type="GuidType"/>

+                            <xs:element minOccurs="1" maxOccurs="1" name="Token">

+                                <xs:annotation>

+                                    <xs:documentation xml:lang="en">This as a unique identifier defined for either this name space.</xs:documentation>

+                                    <xs:documentation xml:lang="en">The Target Attribute may be used to define a Target name space, such as PCI.</xs:documentation>

+                                </xs:annotation>

+                                <xs:complexType>

+                                    <xs:simpleContent>

+                                        <xs:extension base="HexDoubleWordDataType">

+                                            <xs:attribute name="Target" type="C_Name" use="optional"/>

+                                        </xs:extension>

+                                    </xs:simpleContent>

+                                </xs:complexType>

+                            </xs:element>

+                            <xs:element minOccurs="1" maxOccurs="1" name="DatumType" type="PcdDataTypes">

+                                <xs:annotation>

+                                    <xs:documentation xml:lang="en">This specifies the size of the Pcd Datum. It is either 8, 16, 32 or 64 bits for values, 1 bit for BOOLEAN and variable length for elements defined as VOID*</xs:documentation>

+                                </xs:annotation>

+                            </xs:element>

+                            <xs:element default="false" minOccurs="1" maxOccurs="1" name="HiiEnable" type="xs:boolean">

+                                <xs:annotation>

+                                    <xs:documentation xml:lang="en">This Bit means that the Variable data is associated with HII</xs:documentation>

+                                </xs:annotation>

+                            </xs:element>

+                            <xs:element default="false" minOccurs="1" maxOccurs="1" name="VpdEnable" type="xs:boolean">

+                                <xs:annotation>

+                                    <xs:documentation xml:lang="en">This bit enables the Vital Product Data area within flash for maintaining PCD information</xs:documentation>

+                                </xs:annotation>

+                            </xs:element>

+                            <xs:element default="false" minOccurs="1" maxOccurs="1" name="AlternateNameSpaceEnable" type="xs:boolean">

+                                <xs:annotation>

+                                    <xs:documentation>This is only applicable to ItemType DYNAMIC_EX</xs:documentation>

+                                </xs:annotation>

+                            </xs:element>

+                            <xs:element default="false" minOccurs="1" maxOccurs="1" name="SkuEnable" type="xs:boolean"/>

+                            <xs:element default="false" minOccurs="1" maxOccurs="1" name="SkuDataArrayEnable" type="xs:boolean"/>

+                            <xs:choice minOccurs="0">

+                                <xs:element minOccurs="0" maxOccurs="1" name="SkuDataArray">

+                                    <xs:annotation>

+                                        <xs:documentation xml:lang="en">This element is a list of two entries per line, the first should be an integer, while the second entry should be a string value</xs:documentation>

+                                    </xs:annotation>

+                                    <xs:simpleType>

+                                        <xs:list itemType="xs:normalizedString"/>

+                                    </xs:simpleType>

+                                </xs:element>

+                                <xs:element minOccurs="0" maxOccurs="unbounded" name="SkuData">

+                                    <xs:annotation>

+                                        <xs:documentation xml:lang="en">This section is for a list of SkuData Elements, ID and Value</xs:documentation>

+                                    </xs:annotation>

+                                    <xs:complexType>

+                                        <xs:sequence minOccurs="1">

+                                            <xs:element name="Id" type="xs:int"/>

+                                            <xs:element name="Value" type="xs:normalizedString"/>

+                                        </xs:sequence>

+                                    </xs:complexType>

+                                </xs:element>

+                            </xs:choice>

+                            <xs:element default="0x00" minOccurs="1" maxOccurs="1" name="MaxSku" type="HexByteDataType">

+                                <xs:annotation>

+                                    <xs:documentation xml:lang="en">This value comes from a production line database, and has nothing to do with the number of SkuData IDs that have been defined.</xs:documentation>

+                                </xs:annotation>

+                            </xs:element>

+                            <xs:element default="0x00" minOccurs="1" maxOccurs="1" name="SkuId" type="HexByteDataType">

+                                <xs:annotation>

+                                    <xs:documentation xml:lang="en">This is the specific Sku ID for this build.</xs:documentation>

+                                </xs:annotation>

+                            </xs:element>

+                            <xs:element minOccurs="1" maxOccurs="1" name="DatumSize">

+                                <xs:annotation>

+                                    <xs:documentation xml:lang="en">Max Number of Bytes of the data.</xs:documentation>

+                                </xs:annotation>

+                                <xs:simpleType>

+                                    <xs:restriction base="xs:int">

+                                        <xs:minInclusive value="1"/>

+                                        <xs:maxInclusive value="16777215"/>

+                                    </xs:restriction>

+                                </xs:simpleType>

+                            </xs:element>

+                            <xs:element minOccurs="1" maxOccurs="1" name="VariableGuid" type="VariableGuidType">

+                                <xs:annotation>

+                                    <xs:documentation xml:lang="en">This is the Variable's GUID if and only if HII is enabled.</xs:documentation>

+                                </xs:annotation>

+                            </xs:element>

+                            <xs:element minOccurs="1" maxOccurs="1" name="VariableName" type="xs:normalizedString">

+                                <xs:annotation>

+                                    <xs:documentation xml:lang="en">This is the C Name for the Variable, and is valid if and only HII is enabled.</xs:documentation>

+                                </xs:annotation>

+                            </xs:element>

+                            <xs:element minOccurs="0" maxOccurs="1" name="VariableValueDefault" type="xs:normalizedString"/>

+                            <xs:element minOccurs="1" maxOccurs="1" name="DataOffset" type="Hex64BitDataType">

                                 <xs: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>

@@ -1202,21 +1204,22 @@
                         </xs:sequence>

                         <xs:attributeGroup ref="PcdAttributes"/>

                         <xs:attribute name="PcdIsDriver">

-                           <xs:simpleType>

-                             <xs:annotation>

-                               <xs:documentation xml:lang="en">This is an enumerated data type that will be used for DYNAMIC_EX, PEIM or DXE only</xs:documentation>

-                             </xs:annotation>

-                             <xs:restriction base="UCNameType">

-                               <xs:enumeration value="PEI_PCD_DRIVER"/>

-                               <xs:enumeration value="DXE_PCD_DRIVER"/>

-                             </xs:restriction>

-                           </xs:simpleType>

-                         </xs:attribute>

+                            <xs:simpleType>

+                                <xs:annotation>

+                                    <xs:documentation xml:lang="en">This is an enumerated data type that will be used for DYNAMIC_EX, PEIM or DXE only</xs:documentation>

+                                </xs:annotation>

+                                <xs:restriction base="UCNameType">

+                                    <xs:enumeration value="PEI_PCD_DRIVER"/>

+                                    <xs:enumeration value="DXE_PCD_DRIVER"/>

+                                </xs:restriction>

+                            </xs:simpleType>

+                        </xs:attribute>

                     </xs:complexType>

                 </xs:element>

             </xs:sequence>

         </xs:complexType>

-    </xs:element> <!-- PcdDynamicBuildDeclarations -->

+    </xs:element>

+    <!-- PcdDynamicBuildDeclarations -->

     <xs:element name="PcdDefinitions">

         <xs:annotation>

             <xs:documentation xml:lang="en">Child of Package Surface Area Description (SPD)</xs:documentation>

@@ -1523,6 +1526,7 @@
         </xs:complexType>

     </xs:element>

     <xs:element name="Updated" type="DateType"/>

+    <xs:element name="UpdatedDate" type="DateType"/>

     <xs:element name="URL" type="xs:anyURI"/>

     <xs:element name="URI" type="xs:anyURI"/>

     <xs:element name="UserDefinedAntTasks">

diff --git a/Tools/XMLSchema/FrameworkDataTypes.xsd b/Tools/XMLSchema/FrameworkDataTypes.xsd
index 38e16395fd..87889e911d 100644
--- a/Tools/XMLSchema/FrameworkDataTypes.xsd
+++ b/Tools/XMLSchema/FrameworkDataTypes.xsd
@@ -655,6 +655,12 @@
             </xs:enumeration>

         </xs:restriction>

     </xs:simpleType>

+    <xs:simpleType name="PcdDriverTypes">

+        <xs:restriction base="NameConvention">

+            <xs:enumeration value="PEI_PCD_DRIVER"/>

+            <xs:enumeration value="DXE_PCD_DRIVER"/>

+        </xs:restriction>

+    </xs:simpleType>

     <xs:simpleType name="PcdDataTypes">

         <xs:restriction base="xs:normalizedString">

             <xs:enumeration value="UINT8"/>

diff --git a/Tools/XMLSchema/FrameworkHeaders.xsd b/Tools/XMLSchema/FrameworkHeaders.xsd
index 7b1f955684..aeae77b144 100644
--- a/Tools/XMLSchema/FrameworkHeaders.xsd
+++ b/Tools/XMLSchema/FrameworkHeaders.xsd
@@ -20,25 +20,40 @@
         <xs:complexType>

             <xs:sequence>

                 <xs:element minOccurs="1" maxOccurs="1" ref="DatabaseName"/>

-                <xs:element minOccurs="0" maxOccurs="1" ref="Guid"/>

-                <xs:element minOccurs="0" maxOccurs="1" ref="GuidValue"/>

+                <xs:choice minOccurs="1" maxOccurs="1">

+                    <xs:element minOccurs="0" maxOccurs="1" ref="Guid"/>

+                    <!-- Guid needs to be removed -->

+                    <xs:element minOccurs="0" maxOccurs="1" ref="GuidValue"/>

+                    <!-- GuidValue needs to be required -->

+                </xs:choice>

                 <xs:element minOccurs="1" maxOccurs="1" ref="Version"/>

+                <!-- Version is the version of this file -->

                 <xs:element minOccurs="0" maxOccurs="1" ref="Path"/>

+                <!-- Path needs to be removed -->

                 <xs:choice minOccurs="1" maxOccurs="1">

-                  <xs:element minOccurs="0" maxOccurs="1" ref="Created"/>

-                  <xs:element minOccurs="0" maxOccurs="1" ref="CreatedDate"/>

+                    <xs:element minOccurs="0" maxOccurs="1" ref="Created"/>

+                    <!-- Created needs to be removed -->

+                    <xs:element minOccurs="0" maxOccurs="1" ref="CreatedDate"/>

+                    <!-- CreatedDate needs to be required -->

+                </xs:choice>

+                <xs:choice minOccurs="0">

+                    <xs:element minOccurs="0" maxOccurs="1" ref="Updated"/>

+                    <!-- Updated needs to be removed -->

+                    <xs:element minOccurs="0" maxOccurs="1" ref="UpdatedDate"/>

                 </xs:choice>

-                <xs:element minOccurs="0" maxOccurs="1" ref="Updated"/>

                 <xs:element minOccurs="1" maxOccurs="1" ref="Abstract"/>

                 <xs:element minOccurs="1" maxOccurs="1" ref="Description"/>

                 <xs:element minOccurs="1" maxOccurs="1" ref="Copyright"/>

                 <xs:element minOccurs="1" maxOccurs="1" ref="License"/>

+                <xs:element minOccurs="0" maxOccurs="1" ref="Specification"/>

+                <!-- Specificatoin needs to be required - FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00090000 -->

             </xs:sequence>

         </xs:complexType>

     </xs:element>

     <xs:element name="MbdHeader">

+        <!-- MbdHeader needs to be removed -->

         <xs:annotation>

-            <xs:documentation xml:lang="en">This is the header for the Component Module Build Description (MBD) file. NOTE: The GUID may be different from the GUID in the MSA file, as the Guid is updated every time the file is changed, as the Guid may change if the contents of the file are changed.</xs:documentation>

+            <xs:documentation xml:lang="en">DO NOT USE! This is the header for the Component Module Build Description (MBD) file. NOTE: The GUID may be different from the GUID in the MSA file, as the Guid is updated every time the file is changed, as the Guid may change if the contents of the file are changed.</xs:documentation>

         </xs:annotation>

         <xs:complexType>

             <xs:sequence>

@@ -49,19 +64,20 @@
                 <xs:element minOccurs="1" maxOccurs="1" ref="Copyright"/>

                 <xs:element minOccurs="1" maxOccurs="1" ref="License"/>

                 <xs:choice minOccurs="1" maxOccurs="1">

-                  <xs:element minOccurs="0" maxOccurs="1" ref="Created"/>

-                  <xs:element minOccurs="0" maxOccurs="1" ref="CreatedDate"/>

+                    <xs:element minOccurs="0" maxOccurs="1" ref="Created"/>

+                    <xs:element minOccurs="0" maxOccurs="1" ref="CreatedDate"/>

                 </xs:choice>

                 <xs:choice minOccurs="1" maxOccurs="1">

-                  <xs:element minOccurs="0" maxOccurs="1" ref="Modified"/>

-                  <xs:element minOccurs="0" maxOccurs="1" ref="ModifiedDate"/>

+                    <xs:element minOccurs="0" maxOccurs="1" ref="Modified"/>

+                    <xs:element minOccurs="0" maxOccurs="1" ref="ModifiedDate"/>

                 </xs:choice>

             </xs:sequence>

         </xs:complexType>

     </xs:element>

     <xs:element name="MbdLibHeader">

+        <!-- MbdLibHeader needs to be removed -->

         <xs:annotation>

-            <xs:documentation xml:lang="en">This is the header for the Library Module Build Description (MBD) file. NOTE: The Guid may be different from the Guid in the MSA file, as the Guid may change when the contents of the file are changed..</xs:documentation>

+            <xs:documentation xml:lang="en">DO NOT USE! This is the header for the Library Module Build Description (MBD) file. NOTE: The Guid may be different from the Guid in the MSA file, as the Guid may change when the contents of the file are changed..</xs:documentation>

         </xs:annotation>

         <xs:complexType>

             <xs:sequence>

@@ -72,12 +88,12 @@
                 <xs:element minOccurs="1" maxOccurs="1" ref="Copyright"/>

                 <xs:element minOccurs="1" maxOccurs="1" ref="License"/>

                 <xs:choice minOccurs="1" maxOccurs="1">

-                  <xs:element minOccurs="0" maxOccurs="1" ref="Created"/>

-                  <xs:element minOccurs="0" maxOccurs="1" ref="CreatedDate"/>

+                    <xs:element minOccurs="0" maxOccurs="1" ref="Created"/>

+                    <xs:element minOccurs="0" maxOccurs="1" ref="CreatedDate"/>

                 </xs:choice>

                 <xs:choice minOccurs="1" maxOccurs="1">

-                  <xs:element minOccurs="0" maxOccurs="1" ref="Modified"/>

-                  <xs:element minOccurs="0" maxOccurs="1" ref="ModifiedDate"/>

+                    <xs:element minOccurs="0" maxOccurs="1" ref="Modified"/>

+                    <xs:element minOccurs="0" maxOccurs="1" ref="ModifiedDate"/>

                 </xs:choice>

             </xs:sequence>

         </xs:complexType>

@@ -91,25 +107,37 @@
                 <xs:element minOccurs="1" maxOccurs="1" ref="BaseName"/>

                 <xs:element minOccurs="1" maxOccurs="1" ref="ModuleType"/>

                 <xs:element minOccurs="1" maxOccurs="1" ref="ComponentType"/>

-                <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="Guid"/>

+                    <!-- Guid needs to be removed -->

+                    <xs:element minOccurs="0" maxOccurs="1" ref="GuidValue"/>

+                    <!-- GuidValue needs to be required -->

+                </xs:choice>

                 <xs:element minOccurs="1" maxOccurs="1" ref="Version"/>

                 <xs:element minOccurs="1" maxOccurs="1" ref="Abstract"/>

                 <xs:element minOccurs="1" maxOccurs="1" ref="Description"/>

                 <xs:element minOccurs="1" maxOccurs="1" ref="Copyright"/>

                 <xs:element minOccurs="1" maxOccurs="1" ref="License"/>

                 <xs:choice minOccurs="1" maxOccurs="1">

-                  <xs:element minOccurs="0" maxOccurs="1" ref="Created"/>

-                  <xs:element minOccurs="0" maxOccurs="1" ref="CreatedDate"/>

+                    <xs:element minOccurs="0" maxOccurs="1" ref="Created"/>

+                    <!-- Created needs to be removed -->

+                    <xs:element minOccurs="0" maxOccurs="1" ref="CreatedDate"/>

+                    <!-- CreatedDate needs to be required -->

+                </xs:choice>

+                <xs:choice>

+                    <xs:element minOccurs="0" maxOccurs="1" ref="Updated"/>

+                    <!-- Updated needs to be removed -->

+                    <xs:element minOccurs="0" maxOccurs="1" ref="ModifiedDate"/>

                 </xs:choice>

-                <xs:element minOccurs="0" maxOccurs="1" ref="Updated"/>

                 <xs:element minOccurs="0" maxOccurs="1" ref="Specification"/>

+                <!-- Specification needs to be required - FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00090000 -->

             </xs:sequence>

         </xs:complexType>

     </xs:element>

     <xs:element name="MsaLibHeader">

+        <!-- MsaLibHeader needs to be removed -->

         <xs:annotation>

-            <xs:documentation xml:lang="en">This is the Library Module Surface Area Description Header - a replacement for INF files. The Guid may change when the contents of the file are changed.</xs:documentation>

+            <xs:documentation xml:lang="en">DO NOT USE! This is the Library Module Surface Area Description Header - a replacement for INF files. The Guid may change when the contents of the file are changed.</xs:documentation>

         </xs:annotation>

         <xs:complexType>

             <xs:sequence>

@@ -123,8 +151,8 @@
                 <xs:element minOccurs="1" maxOccurs="1" ref="Copyright"/>

                 <xs:element minOccurs="1" maxOccurs="1" ref="License"/>

                 <xs:choice minOccurs="1" maxOccurs="1">

-                  <xs:element minOccurs="0" maxOccurs="1" ref="Created"/>

-                  <xs:element minOccurs="0" maxOccurs="1" ref="CreatedDate"/>

+                    <xs:element minOccurs="0" maxOccurs="1" ref="Created"/>

+                    <xs:element minOccurs="0" maxOccurs="1" ref="CreatedDate"/>

                 </xs:choice>

                 <xs:element minOccurs="0" maxOccurs="1" ref="Updated"/>

                 <xs:element minOccurs="0" maxOccurs="1" ref="Specification"/>

@@ -143,12 +171,14 @@
                     </xs:annotation>

                 </xs:element>

                 <xs:choice>

-                  <xs:element minOccurs="0" maxOccurs="1" ref="Guid">

-                    <xs:annotation>

-                      <xs:documentation xml:lang="en">DO NOT USE! removing from XMLSchema</xs:documentation>

-                    </xs:annotation>

-                  </xs:element>

-                  <xs:element minOccurs="0" maxOccurs="1" ref="GuidValue"/>

+                    <xs:element minOccurs="0" maxOccurs="1" ref="Guid">

+                        <!-- Guid needs to be removed -->

+                        <xs:annotation>

+                            <xs:documentation xml:lang="en">DO NOT USE! removing from XMLSchema</xs:documentation>

+                        </xs:annotation>

+                    </xs:element>

+                    <xs:element minOccurs="0" maxOccurs="1" ref="GuidValue"/>

+                    <!-- GuidValue needs to be required -->

                 </xs:choice>

                 <xs:element minOccurs="0" maxOccurs="1" ref="Version"/>

                 <xs:element minOccurs="1" maxOccurs="1" ref="Abstract"/>

@@ -156,40 +186,48 @@
                 <xs:element minOccurs="0" maxOccurs="1" ref="Copyright"/>

                 <xs:element minOccurs="0" maxOccurs="1" ref="License"/>

                 <xs:choice minOccurs="1" maxOccurs="1">

-                  <xs:element minOccurs="0" maxOccurs="1" ref="Created">

-                    <xs:annotation>

-                      <xs:documentation xml:lang="en">DO NOT USE! removing from XMLSchema</xs:documentation>

-                    </xs:annotation>

-                  </xs:element>

-                  <xs:element minOccurs="0" maxOccurs="1" ref="CreatedDate"/>

+                    <xs:element minOccurs="0" maxOccurs="1" ref="Created">

+                        <!-- Created needs to be removed -->

+                        <xs:annotation>

+                            <xs:documentation xml:lang="en">DO NOT USE! removing from XMLSchema</xs:documentation>

+                        </xs:annotation>

+                    </xs:element>

+                    <xs:element minOccurs="0" maxOccurs="1" ref="CreatedDate"/>

+                    <!-- CreatedDate needs to be required -->

                 </xs:choice>

                 <xs:element minOccurs="0" maxOccurs="1" ref="CreatedBy">

-                   <xs:annotation>

-                       <xs:documentation xml:lang="en">DO NOT USE! removing from XMLSchema</xs:documentation>

-                   </xs:annotation>

-                </xs:element>

-                <xs:choice>

-                  <xs:element minOccurs="0" maxOccurs="1" ref="Updated">

+                    <!-- CreatedBy needs to be removed -->

                     <xs:annotation>

-                       <xs:documentation xml:lang="en">DO NOT USE! removing from XMLSchema</xs:documentation>

+                        <xs:documentation xml:lang="en">DO NOT USE! removing from XMLSchema</xs:documentation>

                     </xs:annotation>

-                  </xs:element>

-                  <xs:element minOccurs="0" maxOccurs="1" ref="ModifiedDate"/>

+                </xs:element>

+                <xs:choice>

+                    <xs:element minOccurs="0" maxOccurs="1" ref="Updated">

+                        <!-- Updated needs to be removed -->

+                        <xs:annotation>

+                            <xs:documentation xml:lang="en">DO NOT USE! removing from XMLSchema</xs:documentation>

+                        </xs:annotation>

+                    </xs:element>

+                    <xs:element minOccurs="0" maxOccurs="1" ref="ModifiedDate"/>

                 </xs:choice>

                 <xs:element minOccurs="0" maxOccurs="1" ref="PackageType">

-                  <xs:annotation>

-                    <xs:documentation xml:lang="en">DO NOT USE! removing from XMLSchema</xs:documentation>

-                  </xs:annotation>

+                    <!-- PackageType needs to be removed -->

+                    <xs:annotation>

+                        <xs:documentation xml:lang="en">DO NOT USE! removing from XMLSchema</xs:documentation>

+                    </xs:annotation>

                 </xs:element>

                 <xs:element minOccurs="0" maxOccurs="1" name="BuildTarget">

-                  <xs:simpleType>

-                    <xs:restriction base="xs:NCName">

-                      <xs:enumeration value="DEBUG"/>

-                      <xs:enumeration value="RELEASE"/>

-                      <xs:enumeration value="BOTH"/>

-                    </xs:restriction>

-                  </xs:simpleType>

+                    <!-- BuildTarget needs to be required -->

+                    <xs:simpleType>

+                        <xs:restriction base="xs:NCName">

+                            <xs:enumeration value="DEBUG"/>

+                            <xs:enumeration value="RELEASE"/>

+                            <xs:enumeration value="BOTH"/>

+                        </xs:restriction>

+                    </xs:simpleType>

                 </xs:element>

+                <xs:element minOccurs="0" maxOccurs="unbounded" ref="Specification"/>

+                <!-- Specification needs to be required - FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00090000 -->

             </xs:sequence>

         </xs:complexType>

     </xs:element>

@@ -200,16 +238,20 @@
         <xs:complexType>

             <xs:sequence>

                 <xs:element minOccurs="1" maxOccurs="1" ref="PackageName"/>

-                <xs:element minOccurs="0" maxOccurs="1" ref="Guid"/>

-                <xs:element minOccurs="0" maxOccurs="1" ref="GuidValue"/>

+                <xs:choice minOccurs="1" maxOccurs="1">

+                    <xs:element minOccurs="0" maxOccurs="1" ref="Guid"/>

+                    <!-- Guid needs to be removed -->

+                    <xs:element minOccurs="0" maxOccurs="1" ref="GuidValue"/>

+                </xs:choice>

                 <xs:element minOccurs="1" maxOccurs="1" ref="Version"/>

                 <xs:element minOccurs="1" maxOccurs="1" ref="Abstract"/>

                 <xs:element minOccurs="1" maxOccurs="1" ref="Description"/>

                 <xs:element minOccurs="1" maxOccurs="1" ref="Copyright"/>

                 <xs:element minOccurs="1" maxOccurs="1" ref="License"/>

                 <xs:choice minOccurs="1" maxOccurs="1">

-                  <xs:element minOccurs="0" maxOccurs="1" ref="Created"/>

-                  <xs:element minOccurs="0" maxOccurs="1" ref="CreatedDate"/>

+                    <xs:element minOccurs="0" maxOccurs="1" ref="Created"/>

+                    <!-- Created needs to be removed -->

+                    <xs:element minOccurs="0" maxOccurs="1" ref="CreatedDate"/>

                 </xs:choice>

                 <xs:element minOccurs="0" maxOccurs="1" ref="E-Mail"/>

                 <xs:element minOccurs="0" maxOccurs="1" ref="Updated"/>

@@ -218,7 +260,9 @@
                 <xs:element minOccurs="0" maxOccurs="1" ref="ReadOnly"/>

                 <xs:element minOccurs="0" maxOccurs="1" ref="RePackage"/>

                 <xs:element minOccurs="0" maxOccurs="unbounded" ref="Specification"/>

+                <!-- Specification needs to be required - FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00090000 -->

                 <xs:element minOccurs="0" maxOccurs="1" ref="OutputDirectory"/>

+                <!-- OutputDirectory needs to be removed -->

             </xs:sequence>

         </xs:complexType>

     </xs:element>

diff --git a/Tools/XMLSchema/FrameworkPlatformDataElements.xsd b/Tools/XMLSchema/FrameworkPlatformDataElements.xsd
index 348dd0deac..188ea9015c 100644
--- a/Tools/XMLSchema/FrameworkPlatformDataElements.xsd
+++ b/Tools/XMLSchema/FrameworkPlatformDataElements.xsd
@@ -153,7 +153,7 @@
                     </xs:complexType>

                 </xs:element>

             </xs:sequence>

-            <xs:attributeGroup ref="BlockAttributes"/>

+            <xs:attributeGroup ref="FlashDeviceInfoAttributes"/>

         </xs:complexType>

     </xs:element>

     <xs:element name="FlashDeviceOverrideImage">