Intermediate Check-in This is not the final version of the XML Transition Schema...

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

diff --git a/Tools/XMLSchema/FrameworkDataAttributes.xsd b/Tools/XMLSchema/FrameworkDataAttributes.xsd
index 4ed390e4b7a963127fabb8bff2d547235d5a40ed..eb82e73da68046f0a0890d112380a38a08298651 100644 (file)
--- a/Tools/XMLSchema/FrameworkDataAttributes.xsd
+++ b/Tools/XMLSchema/FrameworkDataAttributes.xsd
@@ -23,7 +23,7 @@
     </xs:attributeGroup>\r
     <xs:attributeGroup name="BootModeAttributes">\r
         <xs:attribute name="Arch" type="SupportedArchitectures" use="optional"/>\r
-        <xs:attribute name="ArchType" type="ArchList" use="optional"/>\r
+        <xs:attribute name="ArchType" type="ArchListType" use="optional"/>\r
         <xs:attribute name="BootModeName" type="BootModeNames" use="required"/>\r
         <xs:attribute name="FeatureFlag" type="xs:normalizedString" use="optional"/>\r
         <xs:attribute name="Guid" type="GuidType" use="optional"/>\r
@@ -38,7 +38,7 @@
     </xs:attributeGroup>\r
     <xs:attributeGroup name="DataHubAttributes">\r
         <xs:attribute name="Arch" type="SupportedArchitectures" use="optional"/>\r
-        <xs:attribute name="ArchType" type="ArchList" use="optional"/>\r
+        <xs:attribute name="ArchType" type="ArchListType" use="optional"/>\r
         <xs:attribute default="true" name="EnableFeature" type="xs:boolean" use="optional"/>\r
         <xs:attribute name="FeatureFlag" type="xs:normalizedString" use="optional"/>\r
         <xs:attribute name="Guid" type="GuidType" use="optional"/>\r
@@ -51,7 +51,7 @@
     </xs:attributeGroup>\r
     <xs:attributeGroup name="EventAttributes">\r
         <xs:attribute name="Arch" type="SupportedArchitectures" use="optional"/>\r
-        <xs:attribute name="ArchType" type="ArchList" use="optional"/>\r
+        <xs:attribute name="ArchType" type="ArchListType" use="optional"/>\r
         <xs:attribute name="EventGroup" type="EventTypes" use="optional"/>\r
         <xs:attribute default="true" name="EnableFeature" type="xs:boolean" use="optional"/>\r
         <xs:attribute name="FeatureFlag" type="xs:normalizedString" use="optional"/>\r
@@ -62,7 +62,7 @@
     </xs:attributeGroup>\r
     <xs:attributeGroup name="ExternAttributes">\r
         <xs:attribute name="Arch" type="SupportedArchitectures" use="optional"/>\r
-        <xs:attribute name="ArchType" type="ArchList" use="optional"/>\r
+        <xs:attribute name="ArchType" type="ArchListType" use="optional"/>\r
         <xs:attribute default="true" name="EnableFeature" type="xs:boolean" use="optional"/>\r
         <xs:attribute name="FeatureFlag" type="xs:normalizedString" use="optional"/>\r
         <xs:attribute name="Guid" type="GuidType" use="optional"/>\r
@@ -72,7 +72,7 @@
     </xs:attributeGroup>\r
     <xs:attributeGroup name="FilenameAttributes">\r
         <xs:attribute name="Arch" type="SupportedArchitectures" use="optional"/>\r
-        <xs:attribute name="ArchType" type="ArchList" use="optional"/>\r
+        <xs:attribute name="ArchType" type="ArchListType" use="optional"/>\r
         <xs:attribute default="true" name="EnableFeature" type="xs:boolean" use="optional"/>\r
         <!-- LAH Does a Filename need to have FeatureFlag Attribute? -->\r
         <xs:attribute name="FeatureFlag" type="xs:normalizedString" use="optional"/>\r
@@ -86,7 +86,7 @@
     </xs:attributeGroup>\r
     <xs:attributeGroup name="FormsetAttributes">\r
         <xs:attribute name="Arch" type="SupportedArchitectures" use="optional"/>\r
-        <xs:attribute name="ArchType" type="ArchList" use="optional"/>\r
+        <xs:attribute name="ArchType" type="ArchListType" use="optional"/>\r
         <xs:attribute default="true" name="EnableFeature" type="xs:boolean" use="optional"/>\r
         <xs:attribute name="FeatureFlag" type="xs:normalizedString" use="optional"/>\r
         <xs:attribute name="Guid" type="GuidType" use="optional"/>\r
@@ -96,7 +96,7 @@
     </xs:attributeGroup>\r
     <xs:attributeGroup name="GuidAttributes">\r
         <xs:attribute name="Arch" type="SupportedArchitectures" use="optional"/>\r
-        <xs:attribute name="ArchType" type="ArchList" use="optional"/>\r
+        <xs:attribute name="ArchType" type="ArchListType" use="optional"/>\r
         <xs:attribute default="true" name="EnableFeature" type="xs:boolean" use="optional"/>\r
         <xs:attribute name="FeatureFlag" type="xs:normalizedString" use="optional"/>\r
         <xs:attribute name="Usage" type="GuidUsage" use="optional"/>\r
@@ -105,7 +105,7 @@
     </xs:attributeGroup>\r
     <xs:attributeGroup name="HobAttributes">\r
         <xs:attribute name="Arch" type="SupportedArchitectures" use="optional"/>\r
-        <xs:attribute name="ArchType" type="ArchList" use="optional"/>\r
+        <xs:attribute name="ArchType" type="ArchListType" use="optional"/>\r
         <xs:attribute default="true" name="EnableFeature" type="xs:boolean" use="optional"/>\r
         <xs:attribute name="FeatureFlag" type="xs:normalizedString" use="optional"/>\r
         <xs:attribute name="Guid" type="GuidType" use="optional"/>\r
@@ -115,9 +115,10 @@
         <!-- DO NOT USE remove OverrideID from use -->\r
         <xs:attribute name="OverrideID" type="xs:int" use="optional"/>\r
     </xs:attributeGroup>\r
+    <!-- DO NOT USE remove IncludeAttributes from use -->\r
     <xs:attributeGroup name="IncludeAttributes">\r
         <xs:attribute name="Arch" type="SupportedArchitectures" use="optional"/>\r
-        <xs:attribute name="ArchType" type="ArchList" use="optional"/>\r
+        <xs:attribute name="ArchType" type="ArchListType" use="optional"/>\r
         <xs:attribute name="Class" type="BaseNameConvention" use="optional"/>\r
         <xs:attribute default="true" name="EnableFeature" type="xs:boolean" use="optional"/>\r
         <!-- LAH Does a Include need to have FeatureFlag Attribute? -->\r
@@ -129,10 +130,20 @@
         <!-- DO NOT USE remove OverrideID from use -->\r
         <xs:attribute name="OverrideID" type="xs:int" use="optional"/>\r
     </xs:attributeGroup>\r
+    <xs:attributeGroup name="IncludeHeaderAttributes">\r
+        <xs:attribute name="SupArchList" type="ArchListType" use="optional"/>\r
+        <xs:attribute name="FeatureFlag" type="xs:normalizedString" use="optional"/>\r
+        <xs:attribute name="ModuleTypeList" type="ModuleTypeList" use="optional"/>\r
+    </xs:attributeGroup>\r
+    <xs:attributeGroup name="IndustryStdHeaderAttributes">\r
+        <xs:attribute name="SupArchList" type="ArchListType" use="optional"/>\r
+        <xs:attribute name="FeatureFlag" type="xs:normalizedString" use="optional"/>\r
+        <xs:attribute name="ModuleTypeList" type="ModuleTypeList" use="optional"/>\r
+    </xs:attributeGroup>\r
     <xs:attributeGroup name="LibraryAttributes">\r
         <!-- LibraryAttributes is used for Libraries -> Library elements in FPD files -->\r
         <xs:attribute name="Arch" type="SupportedArchitectures" use="optional"/>\r
-        <xs:attribute name="ArchType" type="ArchList" use="optional"/>\r
+        <xs:attribute name="ArchType" type="ArchListType" use="optional"/>\r
         <xs:attribute default="true" name="EnableFeature" type="xs:boolean" use="optional"/>\r
         <!-- LAH Does a LibraryInstance need to have FeatureFlag Attribute? -->\r
         <xs:attribute name="FeatureFlag" type="xs:normalizedString" use="optional"/>\r
@@ -159,7 +170,7 @@
     </xs:attributeGroup>\r
     <xs:attributeGroup name="LibraryClassAttributes">\r
         <xs:attribute name="Arch" type="SupportedArchitectures" use="optional"/>\r
-        <xs:attribute name="ArchType" type="ArchList" use="optional"/>\r
+        <xs:attribute name="ArchType" type="ArchListType" use="optional"/>\r
         <xs:attribute name="FeatureFlag" type="xs:normalizedString" use="optional"/>\r
         <xs:attribute name="RecommendedInstance" type="xs:NCName" use="optional"/>\r
         <xs:attribute name="RecommendedInstanceGuid" type="GuidType" use="optional"/>\r
@@ -184,7 +195,7 @@
     </xs:attributeGroup>\r
     <xs:attributeGroup name="MsaAttributes">\r
         <xs:attribute name="Arch" type="SupportedArchitectures" use="optional"/>\r
-        <xs:attribute name="ArchType" type="ArchList" use="optional"/>\r
+        <xs:attribute name="ArchType" type="ArchListType" use="optional"/>\r
         <xs:attribute name="BuildSequence" type="xs:int" use="optional"/>\r
         <xs:attribute name="FvBinding" type="xs:string" use="optional"/>\r
         <xs:attribute name="ModuleName" type="xs:NCName" use="optional"/>\r
@@ -194,7 +205,7 @@
     </xs:attributeGroup>\r
     <xs:attributeGroup name="OptionAttributes">\r
         <xs:attribute name="Arch" type="SupportedArchitectures" use="optional"/>\r
-        <xs:attribute name="ArchType" type="ArchList" use="optional"/>\r
+        <xs:attribute name="ArchType" type="ArchListType" use="optional"/>\r
         <xs:attribute name="BuildTarget" type="BuildTargets" use="optional"/>\r
         <xs:attribute default="true" name="EnableFeature" type="xs:boolean" use="optional"/>\r
         <!-- LAH Does an Option need to have FeatureFlag Attribute? -->\r
@@ -207,7 +218,7 @@
     </xs:attributeGroup>\r
     <xs:attributeGroup name="PackageAttributes">\r
         <xs:attribute name="Arch" type="SupportedArchitectures" use="optional"/>\r
-        <xs:attribute name="ArchType" type="ArchList" use="optional"/>\r
+        <xs:attribute name="ArchType" type="ArchListType" use="optional"/>\r
         <xs:attribute name="PackageGuid" type="GuidType" use="optional"/>\r
         <xs:attribute name="PackageType" type="PackageType" use="optional"/>\r
         <xs:attribute name="PackageVersion" type="xs:string" use="optional"/>\r
@@ -217,7 +228,7 @@
     <!-- PackageNameAttributres are only used in the Package Dependencies section of an SPD file. -->\r
     <xs:attributeGroup name="PackageNameAttributes">\r
         <xs:attribute name="Arch" type="SupportedArchitectures" use="optional"/>\r
-        <xs:attribute name="ArchType" type="ArchList" use="optional"/>\r
+        <xs:attribute name="ArchType" type="ArchListType" use="optional"/>\r
         <!-- DO NOT USE remove Guid and start using PackageGuid instead -->\r
         <xs:attribute name="Guid" type="GuidType" use="optional"/>\r
         <xs:attribute name="PackageGuid" type="GuidType" use="optional"/>\r
@@ -234,7 +245,7 @@
             <xs:documentation xml:lang="en">Only NON FEATURE_FLAG PCDS should have the FeatureFlag attribute set.</xs:documentation>\r
         </xs:annotation>\r
         <xs:attribute name="Arch" type="SupportedArchitectures" use="optional"/>\r
-        <xs:attribute name="ArchType" type="ArchList" use="optional"/>\r
+        <xs:attribute name="ArchType" type="ArchListType" use="optional"/>\r
         <xs:attribute default="true" name="EnableFeature" type="xs:boolean" use="optional"/>\r
         <xs:attribute name="FeatureFlag" type="xs:normalizedString" use="optional"/>\r
         <xs:attribute name="ItemType" type="PcdItemTypes" use="required"/>\r
@@ -242,11 +253,16 @@
         <!-- DO NOT USE remove OverrideID from use -->\r
         <xs:attribute name="OverrideID" type="xs:int" use="optional"/>\r
     </xs:attributeGroup>\r
+    <xs:attributeGroup name="PcdDeclarationAttributes">\r
+        <xs:attribute name="SupArchList" type="ArchListType" use="optional"/>\r
+        <xs:attribute name="FeatureFlag" type="xs:normalizedString" use="optional"/>\r
+        <xs:attribute name="SupModuleTypes" type="ModuleTypeList" use="optional"/>\r
+    </xs:attributeGroup>\r
     <xs:attributeGroup name="PlatformAttributes">\r
         <!-- DO NOT USE remove AlternateName from use -->\r
         <xs:attribute name="AlternateName" type="FileNameConvention" use="optional"/>\r
         <xs:attribute name="Arch" type="SupportedArchitectures" use="optional"/>\r
-        <xs:attribute name="ArchType" type="ArchList" use="optional"/>\r
+        <xs:attribute name="ArchType" type="ArchListType" use="optional"/>\r
         <!-- DO NOT USE remove Guid from use -->\r
         <xs:attribute name="Guid" type="GuidType" use="optional"/>\r
         <xs:attribute name="PlatformName" type="PlatformNamingConvention" use="optional"/>\r
@@ -257,7 +273,7 @@
     </xs:attributeGroup>\r
     <xs:attributeGroup name="PpiAttributes">\r
         <xs:attribute name="Arch" type="SupportedArchitectures" use="optional"/>\r
-        <xs:attribute name="ArchType" type="ArchList" use="optional"/>\r
+        <xs:attribute name="ArchType" type="ArchListType" use="optional"/>\r
         <xs:attribute default="true" name="EnableFeature" type="xs:boolean" use="optional"/>\r
         <xs:attribute name="FeatureFlag" type="xs:normalizedString" use="optional"/>\r
         <xs:attribute name="Guid" type="GuidType" use="optional"/>\r
@@ -267,7 +283,7 @@
     </xs:attributeGroup>\r
     <xs:attributeGroup name="PpiNotifyAttributes">\r
         <xs:attribute name="Arch" type="SupportedArchitectures" use="optional"/>\r
-        <xs:attribute name="ArchType" type="ArchList" use="optional"/>\r
+        <xs:attribute name="ArchType" type="ArchListType" use="optional"/>\r
         <xs:attribute default="true" name="EnableFeature" type="xs:boolean" use="optional"/>\r
         <xs:attribute name="FeatureFlag" type="xs:normalizedString" use="optional"/>\r
         <xs:attribute name="Guid" type="GuidType" use="optional"/>\r
@@ -277,7 +293,7 @@
     </xs:attributeGroup>\r
     <xs:attributeGroup name="ProtocolAttributes">\r
         <xs:attribute name="Arch" type="SupportedArchitectures" use="optional"/>\r
-        <xs:attribute name="ArchType" type="ArchList" use="optional"/>\r
+        <xs:attribute name="ArchType" type="ArchListType" use="optional"/>\r
         <xs:attribute default="true" name="EnableFeature" type="xs:boolean" use="optional"/>\r
         <xs:attribute name="FeatureFlag" type="xs:normalizedString" use="optional"/>\r
         <xs:attribute name="Guid" type="GuidType" use="optional"/>\r
@@ -287,7 +303,7 @@
     </xs:attributeGroup>\r
     <xs:attributeGroup name="ProtocolNotifyAttributes">\r
         <xs:attribute name="Arch" type="SupportedArchitectures" use="optional"/>\r
-        <xs:attribute name="ArchType" type="ArchList" use="optional"/>\r
+        <xs:attribute name="ArchType" type="ArchListType" use="optional"/>\r
         <xs:attribute name="FeatureFlag" type="xs:normalizedString" use="optional"/>\r
         <xs:attribute name="Guid" type="GuidType" use="optional"/>\r
         <xs:attribute name="Usage" type="ProtocolNotifyUsage" use="optional"/>\r
@@ -321,7 +337,7 @@
     </xs:attributeGroup>\r
     <xs:attributeGroup name="SystemTableAttributes">\r
         <xs:attribute name="Arch" type="SupportedArchitectures" use="optional"/>\r
-        <xs:attribute name="ArchType" type="ArchList" use="optional"/>\r
+        <xs:attribute name="ArchType" type="ArchListType" use="optional"/>\r
         <xs:attribute default="true" name="EnableFeature" type="xs:boolean" use="optional"/>\r
         <xs:attribute name="FeatureFlag" type="xs:normalizedString" use="optional"/>\r
         <xs:attribute name="Guid" type="GuidType" use="optional"/>\r
@@ -334,7 +350,7 @@
     </xs:attributeGroup>\r
     <xs:attributeGroup name="VariableAttributes">\r
         <xs:attribute name="Arch" type="SupportedArchitectures" use="optional"/>\r
-        <xs:attribute name="ArchType" type="ArchList" use="optional"/>\r
+        <xs:attribute name="ArchType" type="ArchListType" use="optional"/>\r
         <xs:attribute default="true" name="EnableFeature" type="xs:boolean" use="optional"/>\r
         <xs:attribute name="FeatureFlag" type="xs:normalizedString" use="optional"/>\r
         <xs:attribute name="Guid" type="GuidType" use="optional"/>\r

diff --git a/Tools/XMLSchema/FrameworkDataElements.xsd b/Tools/XMLSchema/FrameworkDataElements.xsd
index 65db34a3248aaf67b1333f6867a7e9f7d42c32d5..cc9302a53b101087a41be18a9eb0dff28762ca62 100644 (file)
--- a/Tools/XMLSchema/FrameworkDataElements.xsd
+++ b/Tools/XMLSchema/FrameworkDataElements.xsd
@@ -472,9 +472,6 @@
         <xs:complexType>\r
             <xs:sequence minOccurs="1" maxOccurs="unbounded">\r
                 <xs:element name="Formset">\r
-                    <xs:annotation>\r
-                        <xs:documentation xml:lang="en">Describe the valid content of a Formset</xs:documentation>\r
-                    </xs:annotation>\r
                     <xs:complexType>\r
                         <xs:simpleContent>\r
                             <xs:extension base="C_Name">\r
@@ -586,11 +583,26 @@
         </xs:complexType>\r
     </xs:element>\r
     <xs:element name="GuidValue" type="GuidType"/>\r
-    <xs:element name="HelpText" type="Paragraph">\r
+    <xs:element name="HelpText" type="Paragraph"/>\r
+    <xs:element name="HiiPackages">\r
         <xs:annotation>\r
-            <xs:documentation xml:lang="en">This section is used to describe how a GUID, PPI or PROTOCOL is to be used within the context of PCDs.</xs:documentation>\r
+            <xs:documentation xml:lang="en">Describe the list of a HiiPackage elements</xs:documentation>\r
         </xs:annotation>\r
+        <xs:complexType>\r
+            <xs:sequence minOccurs="1" maxOccurs="unbounded">\r
+                <xs:element name="HiiPackage">\r
+                    <xs:complexType>\r
+                        <xs:simpleContent>\r
+                            <xs:extension base="C_Name">\r
+                                <xs:attributeGroup ref="FormsetAttributes"/>\r
+                            </xs:extension>\r
+                        </xs:simpleContent>\r
+                    </xs:complexType>\r
+                </xs:element>\r
+            </xs:sequence>\r
+        </xs:complexType>\r
     </xs:element>\r
+\r
     <xs:element name="Hobs">\r
         <xs:complexType>\r
             <xs:sequence minOccurs="1" maxOccurs="unbounded">\r
@@ -632,7 +644,8 @@
     <xs:element name="IncludeHeader">\r
         <xs:complexType>\r
             <xs:simpleContent>\r
-                <xs:extension base="FileNameConvention">\r
+                <xs:extension base="PathAndFilename">\r
+                    <!-- Need to use IncludeHeaderAttributes in final -->\r
                     <xs:attributeGroup ref="IncludeAttributes"/>\r
                 </xs:extension>\r
             </xs:simpleContent>\r
@@ -657,11 +670,21 @@
             </xs:sequence>\r
         </xs:complexType>\r
     </xs:element>\r
-    <xs:element name="IndustryStdHeaders">\r
+    <xs:element name="IndustryStdIncludes">\r
         <xs:complexType>\r
             <xs:sequence>\r
-                <xs:element minOccurs="1" maxOccurs="unbounded" ref="IncludeHeader"/>\r
+                <xs:element minOccurs="1" maxOccurs="unbounded" ref="IndustryStdHeader"/>\r
+            </xs:sequence>\r
+        </xs:complexType>\r
+    </xs:element>\r
+    <xs:element name="IndustryStdHeader">\r
+        <xs:complexType>\r
+            <xs:sequence>\r
+                <xs:element minOccurs="1" maxOccurs="1" name="Header" type="UiNameType"/>\r
+                <xs:element minOccurs="1" maxOccurs="1" name="IncludeHeader" type="PathAndFilename"/>\r
+                <xs:element minOccurs="1" maxOccurs="1" ref="HelpText"/>\r
             </xs:sequence>\r
+            <xs:attributeGroup ref="IndustryStdHeaderAttributes"/>\r
         </xs:complexType>\r
     </xs:element>\r
     <xs:element name="InstalledDate" type="DateType"/>\r
@@ -713,21 +736,19 @@
             </xs:simpleContent>\r
         </xs:complexType>\r
     </xs:element>\r
+    <!-- LAH This is LibraryClassDeclaration FINAL version -->\r
     <xs:element name="LibraryClassDeclaration">\r
         <xs:annotation>\r
             <xs:documentation xml:lang="en">This element defines a class of library, along with the path to the Include Header for this library</xs:documentation>\r
         </xs:annotation>\r
         <xs:complexType>\r
-            <xs:sequence minOccurs="0">\r
+            <xs:sequence>\r
                 <xs:element minOccurs="1" maxOccurs="1" name="LibraryClass">\r
-                    <xs:annotation>\r
-                        <xs:documentation xml:lang="en">Used in MSA and SPD files. This defines what class of library is being supported = produced (library module) or consumed by a module.</xs:documentation>\r
-                    </xs:annotation>\r
                     <xs:complexType>\r
                         <xs:simpleContent>\r
-                            <xs:extension base="BaseNameConvention">\r
-                                <xs:attribute name="RecommendedInstance" type="xs:NCName" use="optional"/>\r
+                            <xs:extension base="xs:NCName">\r
                                 <xs:attribute name="RecommendedInstanceGuid" type="GuidType" use="optional"/>\r
+                                <xs:attribute name="RecommendedInstanceVersion" type="xs:decimal" use="optional"/>\r
                             </xs:extension>\r
                         </xs:simpleContent>\r
                     </xs:complexType>\r
@@ -736,13 +757,11 @@
             </xs:sequence>\r
         </xs:complexType>\r
     </xs:element>\r
+    <!-- LAH This is LibraryClassDeclarations FINAL version -->\r
     <xs:element name="LibraryClassDeclarations">\r
-        <xs:annotation>\r
-            <xs:documentation xml:lang="en">This section defines what Classes of Libraries that this library belongs to. A Library may belong to multiple different library classes.</xs:documentation>\r
-        </xs:annotation>\r
-        <xs:complexType mixed="true">\r
-            <xs:sequence minOccurs="1" maxOccurs="unbounded">\r
-                <xs:element ref="LibraryClassDeclaration"/>\r
+        <xs:complexType>\r
+            <xs:sequence>\r
+                <xs:element minOccurs="1" maxOccurs="unbounded" ref="LibraryClassDeclaration"/>\r
             </xs:sequence>\r
         </xs:complexType>\r
     </xs:element>\r
@@ -853,30 +872,6 @@
             </xs:sequence>\r
         </xs:complexType>\r
     </xs:element>\r
-    <xs:element name="MsaPcdDeclarations">\r
-        <xs:annotation>\r
-            <xs:documentation xml:lang="en">Child of Module Surface Area Description (MSA)</xs:documentation>\r
-        </xs:annotation>\r
-        <xs:complexType>\r
-            <xs:sequence minOccurs="1">\r
-                <xs:element maxOccurs="unbounded" name="PcdEntry">\r
-                    <xs:annotation>\r
-                        <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>\r
-                        <xs:documentation xml:lang="en">This element is valid for PcdInfo.xml and FPD files.</xs:documentation>\r
-                    </xs:annotation>\r
-                    <xs:complexType>\r
-                        <xs:sequence>\r
-                            <xs:element minOccurs="1" maxOccurs="1" ref="C_Name"/>\r
-                            <xs:element minOccurs="0" maxOccurs="1" name="DefaultValue" type="DefaultValue"/>\r
-                            <xs:element minOccurs="0" maxOccurs="1" name="HelpText" type="Paragraph"/>\r
-                        </xs:sequence>\r
-                        <!-- 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. -->\r
-                        <xs:attribute name="PcdItemType" type="PcdItemTypes" use="required"/>\r
-                    </xs:complexType>\r
-                </xs:element>\r
-            </xs:sequence>\r
-        </xs:complexType>\r
-    </xs:element>\r
     <xs:element name="MsaFileList">\r
         <xs:annotation>\r
             <xs:documentation xml:lang="en">Surface Area Package Description (SPD) list of Module Surface Area files</xs:documentation>\r
@@ -1363,7 +1358,7 @@
                         <xs:sequence>\r
                             <xs:element minOccurs="1" maxOccurs="1" ref="C_Name"/>\r
                             <xs:element minOccurs="0" maxOccurs="1" name="DefaultValue" type="DefaultValue"/>\r
-                            <xs:element minOccurs="0" maxOccurs="1" name="HelpText" type="Paragraph"/>\r
+                            <xs:element minOccurs="0" maxOccurs="1" ref="HelpText"/>\r
                         </xs:sequence>\r
                         <!-- 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. -->\r
                         <xs:attribute name="PcdItemType" type="PcdItemTypes" use="required"/>\r
@@ -1372,19 +1367,15 @@
             </xs:sequence>\r
         </xs:complexType>\r
     </xs:element>\r
+    <!-- LAH This is PcdDeclarations FINAL version -->\r
     <xs:element name="PcdDeclarations">\r
         <xs:annotation>\r
             <xs:documentation xml:lang="en">Child of Package Surface Area Description (SPD)</xs:documentation>\r
-            <xs:documentation xml:lang="en">This permits entering information about a package's PCD information</xs:documentation>\r
+            <xs:documentation xml:lang="en">This section is for entering information about a package's PCDs</xs:documentation>\r
         </xs:annotation>\r
         <xs:complexType>\r
             <xs:sequence minOccurs="1">\r
                 <xs:element maxOccurs="unbounded" name="PcdEntry">\r
-                    <xs:annotation>\r
-                        <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>\r
-                        <xs:documentation xml:lang="en">This element is valid for PcdInfo.xml and FPD files.</xs:documentation>\r
-                        <xs:documentation xml:lang="en">There is ONE required Attribute, ItemType</xs:documentation>\r
-                    </xs:annotation>\r
                     <xs:complexType>\r
                         <xs:sequence>\r
                             <xs:element minOccurs="1" maxOccurs="1" ref="C_Name"/>\r
@@ -1393,9 +1384,9 @@
                             <xs:element minOccurs="1" maxOccurs="1" name="DatumType" type="PcdDataTypes"/>\r
                             <xs:element minOccurs="1" maxOccurs="1" name="ValidUsage" type="PcdListType"/>\r
                             <xs:element minOccurs="0" maxOccurs="1" name="DefaultValue" type="DefaultValue"/>\r
-                            <xs:element minOccurs="1" maxOccurs="1" name="HelpText" type="Paragraph"/>\r
+                            <xs:element minOccurs="1" maxOccurs="1" ref="HelpText"/>\r
                         </xs:sequence>\r
-                        <xs:attributeGroup ref="PcdAttributes"/>\r
+                        <xs:attributeGroup ref="PcdDeclarationAttributes"/>\r
                     </xs:complexType>\r
                 </xs:element>\r
             </xs:sequence>\r
@@ -1685,6 +1676,21 @@
             </xs:sequence>\r
         </xs:complexType>\r
     </xs:element>\r
+    <xs:element name="SkuInfo">\r
+        <xs:complexType>\r
+            <xs:sequence minOccurs="1" maxOccurs="unbounded">\r
+                <xs:element name="UiSkuName">\r
+                        <xs:complexType>\r
+                            <xs:simpleContent>\r
+                                <xs:extension base="UiNameType">\r
+                                    <xs:attribute name="SkuID" type="xs:nonNegativeInteger" use="required"/>\r
+                                </xs:extension>\r
+                            </xs:simpleContent>\r
+                        </xs:complexType>\r
+                    </xs:element>\r
+            </xs:sequence>\r
+        </xs:complexType>\r
+    </xs:element>\r
     <xs:element name="Specification">\r
         <xs:annotation>\r
             <xs:documentation xml:lang="en">This string is used to provide the name and version of the Specification that the component conforms to.</xs:documentation>\r

diff --git a/Tools/XMLSchema/FrameworkDataTypes.xsd b/Tools/XMLSchema/FrameworkDataTypes.xsd
index 10bde1f703684f0bb1220e069904a691f19020ff..af67ab0b19234b062b1dc9c8e53d0b9dc918a1fb 100644 (file)
--- a/Tools/XMLSchema/FrameworkDataTypes.xsd
+++ b/Tools/XMLSchema/FrameworkDataTypes.xsd
@@ -16,107 +16,35 @@
         <xs:documentation xml:lang="en">This schema defines EFI and Framework Data Types. Only simpleType are specified in this file. </xs:documentation>\r
     </xs:annotation>\r
     <xs:include schemaLocation="NamingConvention.xsd"/>\r
-    <xs:simpleType name="ArchList">\r
-        <xs:annotation>\r
-            <xs:documentation xml:lang="en">A list of one or more: IA32, X64, IPF and/or EBC</xs:documentation>\r
-        </xs:annotation>\r
+    <xs:simpleType name="ArchListType">\r
         <xs:list itemType="SupportedArchitectures"/>\r
     </xs:simpleType>\r
     <xs:simpleType name="BlockNameType">\r
-        <xs:annotation>\r
-            <xs:documentation xml:lang="en">FIRMWARE: Define a block name to be BLOCK[A-F0-9]{2}</xs:documentation>\r
-        </xs:annotation>\r
         <xs:restriction base="UCNameType">\r
             <xs:pattern value="BLOCK([A-F0-9]){2}"/>\r
         </xs:restriction>\r
     </xs:simpleType>\r
     <xs:simpleType name="BootModeNames">\r
-        <xs:annotation>\r
-            <xs:documentation xml:lang="en">This describes what boot modes can be set (produced) or what boot modes can be supported, as defined in the Module Surface Area Specification</xs:documentation>\r
-        </xs:annotation>\r
         <xs:restriction base="NameConvention">\r
-            <xs:enumeration value="FULL">\r
-                <xs:annotation>\r
-                    <xs:documentation xml:lang="en">BOOT_WITH_FULL_CONFIGURATION</xs:documentation>\r
-                </xs:annotation>\r
-            </xs:enumeration>\r
-            <xs:enumeration value="MINIMAL">\r
-                <xs:annotation>\r
-                    <xs:documentation xml:lang="en">BOOT_WITH_MINIMAL_CONFIGURATION</xs:documentation>\r
-                </xs:annotation>\r
-            </xs:enumeration>\r
-            <xs:enumeration value="NO_CHANGE">\r
-                <xs:annotation>\r
-                    <xs:documentation xml:lang="en">BOOT_ASSUMING_NO_CONFIGURATION_CHANGES</xs:documentation>\r
-                </xs:annotation>\r
-            </xs:enumeration>\r
-            <xs:enumeration value="DIAGNOSTICS">\r
-                <xs:annotation>\r
-                    <xs:documentation xml:lang="en">BOOT_WITH_FULL_CONFIGURATION_PLUS_DIAGNOSTICS</xs:documentation>\r
-                </xs:annotation>\r
-            </xs:enumeration>\r
-            <xs:enumeration value="DEFAULT">\r
-                <xs:annotation>\r
-                    <xs:documentation xml:lang="en">BOOT_WITH_DEFAULT_SETTINGS</xs:documentation>\r
-                </xs:annotation>\r
-            </xs:enumeration>\r
-            <xs:enumeration value="S2_RESUME">\r
-                <xs:annotation>\r
-                    <xs:documentation xml:lang="en">BOOT_ON_S2_RESUME</xs:documentation>\r
-                </xs:annotation>\r
-            </xs:enumeration>\r
-            <xs:enumeration value="S3_RESUME">\r
-                <xs:annotation>\r
-                    <xs:documentation xml:lang="en">BOOT_ON_S3_RESUME</xs:documentation>\r
-                </xs:annotation>\r
-            </xs:enumeration>\r
-            <xs:enumeration value="S4_RESUME">\r
-                <xs:annotation>\r
-                    <xs:documentation xml:lang="en">BOOT_ON_S4_RESUME</xs:documentation>\r
-                </xs:annotation>\r
-            </xs:enumeration>\r
-            <xs:enumeration value="S5_RESUME">\r
-                <xs:annotation>\r
-                    <xs:documentation xml:lang="en">BOOT_ON_S5_RESUME</xs:documentation>\r
-                </xs:annotation>\r
-            </xs:enumeration>\r
-            <xs:enumeration value="FLASH_UPDATE">\r
-                <xs:annotation>\r
-                    <xs:documentation xml:lang="en">BOOT_ON_FLASH_UPDATE</xs:documentation>\r
-                </xs:annotation>\r
-            </xs:enumeration>\r
-            <xs:enumeration value="RECOVERY">\r
-                <xs:annotation>\r
-                    <xs:documentation xml:lang="en">BOOT_IN_RECOVERY_MODE</xs:documentation>\r
-                </xs:annotation>\r
-            </xs:enumeration>\r
+            <xs:enumeration value="FULL"/>\r
+            <xs:enumeration value="MINIMAL"/>\r
+            <xs:enumeration value="NO_CHANGE"/>\r
+            <xs:enumeration value="DIAGNOSTICS"/>\r
+            <xs:enumeration value="DEFAULT"/>\r
+            <xs:enumeration value="S2_RESUME"/>\r
+            <xs:enumeration value="S3_RESUME"/>\r
+            <xs:enumeration value="S4_RESUME"/>\r
+            <xs:enumeration value="S5_RESUME"/>\r
+            <xs:enumeration value="FLASH_UPDATE"/>\r
+            <xs:enumeration value="RECOVERY"/>\r
         </xs:restriction>\r
     </xs:simpleType>\r
     <xs:simpleType name="BootModeUsage">\r
-        <xs:annotation>\r
-            <xs:documentation xml:lang="en">This describes the Boot Mode Usage Attributes, as defined in the Module Surface Area Specification</xs:documentation>\r
-        </xs:annotation>\r
         <xs:restriction base="NameConvention">\r
-            <xs:enumeration value="ALWAYS_CONSUMED">\r
-                <xs:annotation>\r
-                    <xs:documentation xml:lang="en">Supports the Boot Mode</xs:documentation>\r
-                </xs:annotation>\r
-            </xs:enumeration>\r
-            <xs:enumeration value="SOMETIMES_CONSUMED">\r
-                <xs:annotation>\r
-                    <xs:documentation xml:lang="en">Supports the Boot Mode on some execution path</xs:documentation>\r
-                </xs:annotation>\r
-            </xs:enumeration>\r
-            <xs:enumeration value="ALWAYS_PRODUCED">\r
-                <xs:annotation>\r
-                    <xs:documentation xml:lang="en">Always changes the Boot Mode</xs:documentation>\r
-                </xs:annotation>\r
-            </xs:enumeration>\r
-            <xs:enumeration value="SOMETIMES_PRODUCED">\r
-                <xs:annotation>\r
-                    <xs:documentation xml:lang="en">Sometimes changes the Boot Mode</xs:documentation>\r
-                </xs:annotation>\r
-            </xs:enumeration>\r
+            <xs:enumeration value="ALWAYS_CONSUMED"/>\r
+            <xs:enumeration value="SOMETIMES_CONSUMED"/>\r
+            <xs:enumeration value="ALWAYS_PRODUCED"/>\r
+            <xs:enumeration value="SOMETIMES_PRODUCED"/>\r
         </xs:restriction>\r
     </xs:simpleType>\r
     <xs:simpleType name="BuildTargets">\r
@@ -127,9 +55,6 @@
         </xs:restriction>\r
     </xs:simpleType>\r
     <xs:simpleType name="ComponentExecutionPhase">\r
-        <xs:annotation>\r
-            <xs:documentation xml:lang="en">These are the supported EFI/Framework Execution Phases</xs:documentation>\r
-        </xs:annotation>\r
         <xs:restriction base="UCNameType">\r
             <xs:enumeration value="MDE"/>\r
             <xs:enumeration value="SEC"/>\r
@@ -145,47 +70,18 @@
         </xs:restriction>\r
     </xs:simpleType>\r
     <xs:simpleType name="ConditionalTarget">\r
-        <xs:annotation>\r
-            <xs:documentation xml:lang="en">Conditional Targets are Other FeatureFlag Identifiers</xs:documentation>\r
-        </xs:annotation>\r
         <xs:list itemType="C_Name"/>\r
     </xs:simpleType>\r
     <xs:simpleType name="DataHubUsage">\r
-        <xs:annotation>\r
-            <xs:documentation xml:lang="en">This describes the Data Hub Usage Attributes, as defined in the Module Surface Area Specification</xs:documentation>\r
-        </xs:annotation>\r
         <xs:restriction base="NameConvention">\r
-            <xs:enumeration value="ALWAYS_CONSUMED">\r
-                <xs:annotation>\r
-                    <xs:documentation xml:lang="en">The module always consumes a data hub entry via registering a filter driver.</xs:documentation>\r
-                </xs:annotation>\r
-            </xs:enumeration>\r
-            <xs:enumeration value="SOMETIMES_CONSUMED">\r
-                <xs:annotation>\r
-                    <xs:documentation xml:lang="en">The module will use a data hub entry if it exists via registering a filter driver.</xs:documentation>\r
-                </xs:annotation>\r
-            </xs:enumeration>\r
-            <xs:enumeration value="ALWAYS_PRODUCED">\r
-                <xs:annotation>\r
-                    <xs:documentation xml:lang="en">The module always logs data into the data hub.</xs:documentation>\r
-                </xs:annotation>\r
-            </xs:enumeration>\r
-            <xs:enumeration value="SOMETIMES_PRODUCED">\r
-                <xs:annotation>\r
-                    <xs:documentation xml:lang="en">The module will log data into the data hub under certain circumstances</xs:documentation>\r
-                </xs:annotation>\r
-            </xs:enumeration>\r
-            <xs:enumeration value="PRIVATE">\r
-                <xs:annotation>\r
-                    <xs:documentation xml:lang="en">DataHub is produced and consumed only by this module</xs:documentation>\r
-                </xs:annotation>\r
-            </xs:enumeration>\r
+            <xs:enumeration value="ALWAYS_CONSUMED"/>\r
+            <xs:enumeration value="SOMETIMES_CONSUMED"/>\r
+            <xs:enumeration value="ALWAYS_PRODUCED"/>\r
+            <xs:enumeration value="SOMETIMES_PRODUCED"/>\r
+            <xs:enumeration value="PRIVATE"/>\r
         </xs:restriction>\r
     </xs:simpleType>\r
     <xs:simpleType name="DateType">\r
-        <xs:annotation>\r
-            <xs:documentation xml:lang="en">Date Format is YYYY-MM-DD HH:MM (24hr time format)</xs:documentation>\r
-        </xs:annotation>\r
         <xs:restriction base="xs:normalizedString">\r
             <xs:pattern value="[1-9][0-9][0-9][0-9]-[0-1][0-9]-[0-3][0-9] [0-2][0-9]:[0-5][0-9]"/>\r
         </xs:restriction>\r
@@ -197,9 +93,6 @@
         </xs:restriction>\r
     </xs:simpleType>\r
     <xs:simpleType name="DefaultValue">\r
-        <xs:annotation>\r
-            <xs:documentation xml:lang="en"> The DefaultValue is a union of a string and an integer. </xs:documentation>\r
-        </xs:annotation>\r
         <xs:union memberTypes="xs:normalizedString xs:int UnicodeString"/>\r
     </xs:simpleType>\r
     <xs:simpleType name="EfiSectionType">\r
@@ -220,9 +113,6 @@
         </xs:restriction>\r
     </xs:simpleType>\r
     <xs:simpleType name="EventTypes">\r
-        <xs:annotation>\r
-            <xs:documentation xml:lang="en">This describes the Supported Event Groups, as defined in the Module Surface Area Specification</xs:documentation>\r
-        </xs:annotation>\r
         <xs:restriction base="NameConvention">\r
             <xs:enumeration value="EVENT_GROUP_EXIT_BOOT_SERVICES"/>\r
             <xs:enumeration value="EVENT_GROUP_VIRTUAL_ADDRESS_CHANGE"/>\r
@@ -232,41 +122,15 @@
         </xs:restriction>\r
     </xs:simpleType>\r
     <xs:simpleType name="EventUsage">\r
-        <xs:annotation>\r
-            <xs:documentation xml:lang="en">This describes the Event Usage Attributes, as defined in the Module Surface Area Specification</xs:documentation>\r
-        </xs:annotation>\r
         <xs:restriction base="NameConvention">\r
-            <xs:enumeration value="ALWAYS_CONSUMED">\r
-                <xs:annotation>\r
-                    <xs:documentation xml:lang="en">A module registers a notification function and requires it to be executed for the module to fully function.</xs:documentation>\r
-                </xs:annotation>\r
-            </xs:enumeration>\r
-            <xs:enumeration value="SOMETIMES_CONSUMED">\r
-                <xs:annotation>\r
-                    <xs:documentation xml:lang="en">A module registers a notification function and utilizes it if it's signaled.</xs:documentation>\r
-                </xs:annotation>\r
-            </xs:enumeration>\r
-            <xs:enumeration value="ALWAYS_PRODUCED">\r
-                <xs:annotation>\r
-                    <xs:documentation xml:lang="en">A module will always signal the event.</xs:documentation>\r
-                </xs:annotation>\r
-            </xs:enumeration>\r
-            <xs:enumeration value="SOMETIMES_PRODUCED">\r
-                <xs:annotation>\r
-                    <xs:documentation xml:lang="en">A module will sometimes signal the event.</xs:documentation>\r
-                </xs:annotation>\r
-            </xs:enumeration>\r
-            <xs:enumeration value="PRIVATE">\r
-                <xs:annotation>\r
-                    <xs:documentation xml:lang="en">Event is produced and consumed only by this module</xs:documentation>\r
-                </xs:annotation>\r
-            </xs:enumeration>\r
+            <xs:enumeration value="ALWAYS_CONSUMED"/>\r
+            <xs:enumeration value="SOMETIMES_CONSUMED"/>\r
+            <xs:enumeration value="ALWAYS_PRODUCED"/>\r
+            <xs:enumeration value="SOMETIMES_PRODUCED"/>\r
+            <xs:enumeration value="PRIVATE"/>\r
         </xs:restriction>\r
     </xs:simpleType>\r
     <xs:simpleType name="ExecutionType">\r
-        <xs:annotation>\r
-            <xs:documentation xml:lang="en"> This defines the output types: Relocatable (REL,) Non-Relocatable (NREL,) Execute in Place (XIP) or Position Independent Code (PIC) </xs:documentation>\r
-        </xs:annotation>\r
         <xs:restriction base="UCNameType">\r
             <xs:enumeration value="REL" id="Relocatable"/>\r
             <xs:enumeration value="NREL" id="Non-Relocatable"/>\r
@@ -275,88 +139,33 @@
         </xs:restriction>\r
     </xs:simpleType>\r
     <xs:simpleType name="ExternType">\r
-        <xs:annotation>\r
-            <xs:documentation xml:lang="en">C Identifier Name for the Extern data as defined in the Module Surface Area Specification</xs:documentation>\r
-        </xs:annotation>\r
         <xs:restriction base="xs:string">\r
             <xs:pattern value="(_*\w*\W*)*"/>\r
         </xs:restriction>\r
     </xs:simpleType>\r
     <xs:simpleType name="ExternUsage">\r
-        <xs:annotation>\r
-            <xs:documentation xml:lang="en">This describes the Extern Usage Attributes, as defined in the Module Surface Area Specification</xs:documentation>\r
-        </xs:annotation>\r
         <xs:restriction base="NameConvention">\r
-            <xs:enumeration value="ALWAYS_CONSUMED">\r
-                <xs:annotation>\r
-                    <xs:documentation xml:lang="en">The EXTERN is always imported by the module</xs:documentation>\r
-                </xs:annotation>\r
-            </xs:enumeration>\r
-            <xs:enumeration value="ALWAYS_PRODUCED">\r
-                <xs:annotation>\r
-                    <xs:documentation xml:lang="en">The EXTERN is always exported by the module</xs:documentation>\r
-                </xs:annotation>\r
-            </xs:enumeration>\r
+            <xs:enumeration value="ALWAYS_CONSUMED"/>\r
+            <xs:enumeration value="ALWAYS_PRODUCED"/>\r
         </xs:restriction>\r
     </xs:simpleType>\r
     <xs:simpleType name="FileNameUsage">\r
-        <xs:annotation>\r
-            <xs:documentation xml:lang="en">This describes the FileName Usage Attributes, as defined in the Module Surface Area Specification</xs:documentation>\r
-        </xs:annotation>\r
         <xs:restriction base="NameConvention">\r
-            <xs:enumeration value="ALWAYS_CONSUMED">\r
-                <xs:annotation>\r
-                    <xs:documentation xml:lang="en">Module requires a file named GUID in an FV</xs:documentation>\r
-                </xs:annotation>\r
-            </xs:enumeration>\r
-            <xs:enumeration value="SOMETIMES_CONSUMED">\r
-                <xs:annotation>\r
-                    <xs:documentation xml:lang="en">Module will use a file named GUID in an FV if it is present</xs:documentation>\r
-                </xs:annotation>\r
-            </xs:enumeration>\r
-            <xs:enumeration value="ALWAYS_PRODUCED">\r
-                <xs:annotation>\r
-                    <xs:documentation xml:lang="en">Module Always produces a file named GUID in an FV</xs:documentation>\r
-                </xs:annotation>\r
-            </xs:enumeration>\r
-            <xs:enumeration value="SOMETIMES_PRODUCED">\r
-                <xs:annotation>\r
-                    <xs:documentation xml:lang="en">Module sometimes produces a file named GUID in an FV</xs:documentation>\r
-                </xs:annotation>\r
-            </xs:enumeration>\r
-            <xs:enumeration value="PRIVATE">\r
-                <xs:annotation>\r
-                    <xs:documentation xml:lang="en">Filename is produced and consumed only by this module</xs:documentation>\r
-                </xs:annotation>\r
-            </xs:enumeration>\r
+            <xs:enumeration value="ALWAYS_CONSUMED"/>\r
+            <xs:enumeration value="SOMETIMES_CONSUMED"/>\r
+            <xs:enumeration value="ALWAYS_PRODUCED"/>\r
+            <xs:enumeration value="SOMETIMES_PRODUCED"/>\r
+            <xs:enumeration value="PRIVATE"/>\r
         </xs:restriction>\r
     </xs:simpleType>\r
     <xs:simpleType name="FormSetUsage">\r
-        <xs:annotation>\r
-            <xs:documentation xml:lang="en">This describes the Formset Usage Attributes, as defined in the Module Surface Area Specification</xs:documentation>\r
-        </xs:annotation>\r
         <xs:restriction base="NameConvention">\r
-            <xs:enumeration value="ALWAYS_PRODUCED">\r
-                <xs:annotation>\r
-                    <xs:documentation xml:lang="en">The Formset is always registered into HII by the module</xs:documentation>\r
-                </xs:annotation>\r
-            </xs:enumeration>\r
-            <xs:enumeration value="SOMETIMES_PRODUCED">\r
-                <xs:annotation>\r
-                    <xs:documentation xml:lang="en">Some execution paths through the modules register forms into HII</xs:documentation>\r
-                </xs:annotation>\r
-            </xs:enumeration>\r
-            <xs:enumeration value="PRIVATE">\r
-                <xs:annotation>\r
-                    <xs:documentation xml:lang="en">Formset is produced and consumed only by this module</xs:documentation>\r
-                </xs:annotation>\r
-            </xs:enumeration>\r
+            <xs:enumeration value="ALWAYS_PRODUCED"/>\r
+            <xs:enumeration value="SOMETIMES_PRODUCED"/>\r
+            <xs:enumeration value="PRIVATE"/>\r
         </xs:restriction>\r
     </xs:simpleType>\r
     <xs:simpleType name="FrameworkComponentTypes">\r
-        <xs:annotation>\r
-            <xs:documentation xml:lang="en"> These are the EFI/Framework Component Types defined in the EFI Development Kit (EDK) Getting Started Guide </xs:documentation>\r
-        </xs:annotation>\r
         <xs:restriction base="UCNameType">\r
             <xs:enumeration value="APRIORI"/>\r
             <xs:enumeration value="SEC"/>\r
@@ -379,10 +188,23 @@
             <xs:enumeration value="CUSTOM_BUILD"/>\r
         </xs:restriction>\r
     </xs:simpleType>\r
+    <xs:simpleType name="FrameworkModuleTypes">\r
+        <xs:restriction base="ModuleTypeDef">\r
+            <xs:enumeration value="BASE"/>\r
+            <xs:enumeration value="SEC"/>\r
+            <xs:enumeration value="PEI_CORE"/>\r
+            <xs:enumeration value="PEIM"/>\r
+            <xs:enumeration value="DXE_CORE"/>\r
+            <xs:enumeration value="DXE_DRIVER"/>\r
+            <xs:enumeration value="DXE_RUNTIME_DRIVER"/>\r
+            <xs:enumeration value="DXE_SAL_DRIVER"/>\r
+            <xs:enumeration value="DXE_SMM_DRIVER"/>\r
+            <xs:enumeration value="UEFI_DRIVER"/>\r
+            <xs:enumeration value="UEFI_APPLICATION"/>\r
+            <xs:enumeration value="USER_DEFINED"/>\r
+        </xs:restriction>\r
+    </xs:simpleType>\r
     <xs:simpleType name="FvRegionTypes">\r
-        <xs:annotation>\r
-            <xs:documentation xml:lang="en">FIRMWARE: Pre-defined Firmware Volume Region Types</xs:documentation>\r
-        </xs:annotation>\r
         <xs:restriction base="UCNameType">\r
             <xs:enumeration value="FV_MAIN"/>\r
             <xs:enumeration value="FV_MAIN_COMPACT"/>\r
@@ -396,231 +218,83 @@
         </xs:restriction>\r
     </xs:simpleType>\r
     <xs:simpleType name="GuidUsage">\r
-        <xs:annotation>\r
-            <xs:documentation xml:lang="en">This describes the Guid Usage Attributes, as defined in the Module Surface Area Specification</xs:documentation>\r
-        </xs:annotation>\r
         <xs:restriction base="NameConvention">\r
-            <xs:enumeration value="ALWAYS_CONSUMED">\r
-                <xs:annotation>\r
-                    <xs:documentation xml:lang="en">Module always consumes the GUID</xs:documentation>\r
-                </xs:annotation>\r
-            </xs:enumeration>\r
-            <xs:enumeration value="SOMETIMES_CONSUMED">\r
-                <xs:annotation>\r
-                    <xs:documentation xml:lang="en">Module will consume the GUID only if the GUID is present</xs:documentation>\r
-                </xs:annotation>\r
-            </xs:enumeration>\r
-            <xs:enumeration value="ALWAYS_PRODUCED">\r
-                <xs:annotation>\r
-                    <xs:documentation xml:lang="en">Module will always produce the GUID</xs:documentation>\r
-                </xs:annotation>\r
-            </xs:enumeration>\r
-            <xs:enumeration value="SOMETIMES_PRODUCED">\r
-                <xs:annotation>\r
-                    <xs:documentation xml:lang="en">Module sometimes produces the GUID</xs:documentation>\r
-                </xs:annotation>\r
-            </xs:enumeration>\r
-            <xs:enumeration value="DEFAULT">\r
-                <xs:annotation>\r
-                    <xs:documentation xml:lang="en">The default is the GUID that specifies the instance of the package</xs:documentation>\r
-                </xs:annotation>\r
-            </xs:enumeration>\r
-            <xs:enumeration value="PRIVATE">\r
-                <xs:annotation>\r
-                    <xs:documentation xml:lang="en">Guid is produced and consumed only by this module</xs:documentation>\r
-                </xs:annotation>\r
-            </xs:enumeration>\r
+            <xs:enumeration value="ALWAYS_CONSUMED"/>\r
+            <xs:enumeration value="SOMETIMES_CONSUMED"/>\r
+            <xs:enumeration value="ALWAYS_PRODUCED"/>\r
+            <xs:enumeration value="SOMETIMES_PRODUCED"/>\r
+            <xs:enumeration value="DEFAULT"/>\r
+            <xs:enumeration value="PRIVATE"/>\r
+        </xs:restriction>\r
+    </xs:simpleType>\r
+    <xs:simpleType name="HiiPackageUsage">\r
+        <xs:restriction base="NameConvention">\r
+            <xs:enumeration value="ALWAYS_PRODUCED"/>\r
+            <xs:enumeration value="SOMETIMES_PRODUCED"/>\r
+            <xs:enumeration value="PRIVATE"/>\r
         </xs:restriction>\r
     </xs:simpleType>\r
     <xs:simpleType name="HobTypes">\r
-        <xs:annotation>\r
-            <xs:documentation xml:lang="en">Type of HOB that is being produced or consumed, as specified in the Module Surface Area Specification.</xs:documentation>\r
-        </xs:annotation>\r
         <xs:restriction base="NameConvention">\r
-            <xs:enumeration value="PHIT">\r
-                <xs:annotation>\r
-                    <xs:documentation xml:lang="en">EFI_HOB_TYPE_HANDOFF</xs:documentation>\r
-                </xs:annotation>\r
-            </xs:enumeration>\r
-            <xs:enumeration value="MEMORY_ALLOCATION">\r
-                <xs:annotation>\r
-                    <xs:documentation xml:lang="en">EFI_HOB_TYPE_MEMORY_ALLOCATION Note: The BaseName of the GUID is also required</xs:documentation>\r
-                </xs:annotation>\r
-            </xs:enumeration>\r
-            <xs:enumeration value="RESOURCE_DESCRIPTOR">\r
-                <xs:annotation>\r
-                    <xs:documentation xml:lang="en">EFI_HOB_TYPE_RESOURCE_DESCRIPTOR</xs:documentation>\r
-                </xs:annotation>\r
-            </xs:enumeration>\r
-            <xs:enumeration value="GUID_EXTENSION">\r
-                <xs:annotation>\r
-                    <xs:documentation xml:lang="en">EFI_HOB_TYPE_GUID_EXTENSION Note: The BaseName of the GUID is also required.</xs:documentation>\r
-                </xs:annotation>\r
-            </xs:enumeration>\r
-            <xs:enumeration value="FIRMWARE_VOLUME">\r
-                <xs:annotation>\r
-                    <xs:documentation xml:lang="en">EFI_HOB_TYPE_FV</xs:documentation>\r
-                </xs:annotation>\r
-            </xs:enumeration>\r
-            <xs:enumeration value="CPU">\r
-                <xs:annotation>\r
-                    <xs:documentation xml:lang="en">EFI_HOB_TYPE_CPU</xs:documentation>\r
-                </xs:annotation>\r
-            </xs:enumeration>\r
-            <xs:enumeration value="POOL">\r
-                <xs:annotation>\r
-                    <xs:documentation xml:lang="en">EFI_HOB_TYPE_PEI_MEMORY_POOL</xs:documentation>\r
-                </xs:annotation>\r
-            </xs:enumeration>\r
-            <xs:enumeration value="CAPSULE_VOLUME">\r
-                <xs:annotation>\r
-                    <xs:documentation xml:lang="en">EFI_HOB_TYPE_CV</xs:documentation>\r
-                </xs:annotation>\r
-            </xs:enumeration>\r
+            <xs:enumeration value="PHIT"/>\r
+            <xs:enumeration value="MEMORY_ALLOCATION"/>\r
+            <xs:enumeration value="RESOURCE_DESCRIPTOR"/>\r
+            <xs:enumeration value="GUID_EXTENSION"/>\r
+            <xs:enumeration value="FIRMWARE_VOLUME"/>\r
+            <xs:enumeration value="CPU"/>\r
+            <xs:enumeration value="POOL"/>\r
+            <xs:enumeration value="CAPSULE_VOLUME"/>\r
         </xs:restriction>\r
     </xs:simpleType>\r
     <xs:simpleType name="HobUsage">\r
-        <xs:annotation>\r
-            <xs:documentation xml:lang="en">This describes the Hob Usage Attributes, as defined in the Module Surface Area Specification</xs:documentation>\r
-        </xs:annotation>\r
         <xs:restriction base="NameConvention">\r
-            <xs:enumeration value="ALWAYS_CONSUMED">\r
-                <xs:annotation>\r
-                    <xs:documentation xml:lang="en">The HOB must be present in the system</xs:documentation>\r
-                </xs:annotation>\r
-            </xs:enumeration>\r
-            <xs:enumeration value="SOMETIMES_CONSUMED">\r
-                <xs:annotation>\r
-                    <xs:documentation xml:lang="en">The HOB will be used if it's present in the system</xs:documentation>\r
-                </xs:annotation>\r
-            </xs:enumeration>\r
-            <xs:enumeration value="ALWAYS_PRODUCED">\r
-                <xs:annotation>\r
-                    <xs:documentation xml:lang="en">The HOB is always produced by the module</xs:documentation>\r
-                </xs:annotation>\r
-            </xs:enumeration>\r
-            <xs:enumeration value="SOMETIMES_PRODUCED">\r
-                <xs:annotation>\r
-                    <xs:documentation xml:lang="en">The HOB will sometimes be produced by the module.</xs:documentation>\r
-                </xs:annotation>\r
-            </xs:enumeration>\r
-            <xs:enumeration value="PRIVATE">\r
-                <xs:annotation>\r
-                    <xs:documentation xml:lang="en">HOB is produced and consumed only by this module</xs:documentation>\r
-                </xs:annotation>\r
-            </xs:enumeration>\r
+            <xs:enumeration value="ALWAYS_CONSUMED"/>\r
+            <xs:enumeration value="SOMETIMES_CONSUMED"/>\r
+            <xs:enumeration value="ALWAYS_PRODUCED"/>\r
+            <xs:enumeration value="SOMETIMES_PRODUCED"/>\r
+            <xs:enumeration value="PRIVATE"/>\r
         </xs:restriction>\r
     </xs:simpleType>\r
+    <xs:simpleType name="IntList">\r
+        <xs:list itemType="xs:positiveInteger"/>\r
+    </xs:simpleType>\r
     <xs:simpleType name="LibraryUsage">\r
-        <xs:annotation>\r
-            <xs:documentation xml:lang="en">This describes the Library Usage Attributes, as defined in the Module Surface Area Specification</xs:documentation>\r
-        </xs:annotation>\r
         <xs:restriction base="NameConvention">\r
-            <xs:enumeration value="ALWAYS_CONSUMED">\r
-                <xs:annotation>\r
-                    <xs:documentation xml:lang="en">A module always consumes the library. This Guid represents the class of the library.</xs:documentation>\r
-                </xs:annotation>\r
-            </xs:enumeration>\r
+            <xs:enumeration value="ALWAYS_CONSUMED"/>\r
             <xs:enumeration value="SOMETIMES_CONSUMED"/>\r
             <xs:enumeration value="ALWAYS_PRODUCED"/>\r
             <xs:enumeration value="SOMETIMES_PRODUCED"/>\r
-            <xs:enumeration value="DEFAULT">\r
-                <xs:annotation>\r
-                    <xs:documentation xml:lang="en">The default is the GUID that specifies the instance of the library.</xs:documentation>\r
-                </xs:annotation>\r
-            </xs:enumeration>\r
-            <xs:enumeration value="PRIVATE">\r
-                <xs:annotation>\r
-                    <xs:documentation xml:lang="en">Library is produced and consumed only by this module</xs:documentation>\r
-                </xs:annotation>\r
-            </xs:enumeration>\r
+            <xs:enumeration value="DEFAULT"/>\r
+            <xs:enumeration value="PRIVATE"/>\r
         </xs:restriction>\r
     </xs:simpleType>\r
     <xs:simpleType name="ModuleTypeDef">\r
-        <xs:annotation>\r
-            <xs:documentation xml:lang="en"> These are the supported Framework Module Types </xs:documentation>\r
-        </xs:annotation>\r
         <xs:restriction base="NameConvention">\r
-            <xs:enumeration value="BASE">\r
-                <xs:annotation>\r
-                    <xs:documentation xml:lang="en">Module only depends on things in the MDE package and is environment neutral</xs:documentation>\r
-                </xs:annotation>\r
-            </xs:enumeration>\r
-            <xs:enumeration value="SEC">\r
-                <xs:annotation>\r
-                    <xs:documentation xml:lang="en">Module is the Security Section and depends on catching the reset vectory</xs:documentation>\r
-                </xs:annotation>\r
-            </xs:enumeration>\r
-            <xs:enumeration value="PEI_CORE">\r
-                <xs:annotation>\r
-                    <xs:documentation xml:lang="en">Module is the PEI Core</xs:documentation>\r
-                </xs:annotation>\r
-            </xs:enumeration>\r
-            <xs:enumeration value="PEIM">\r
-                <xs:annotation>\r
-                    <xs:documentation xml:lang="en">Module is a PEIM and depends on the PEI Services Table</xs:documentation>\r
-                </xs:annotation>\r
-            </xs:enumeration>\r
-            <xs:enumeration value="DXE_CORE">\r
-                <xs:annotation>\r
-                    <xs:documentation xml:lang="en">Module is the DXE Core</xs:documentation>\r
-                </xs:annotation>\r
-            </xs:enumeration>\r
-            <xs:enumeration value="DXE_DRIVER">\r
-                <xs:annotation>\r
-                    <xs:documentation xml:lang="en">Module is a DXE Driver and depends on the EFI Boot Services, EFI Runtime Services and the DXE Service Table</xs:documentation>\r
-                </xs:annotation>\r
-            </xs:enumeration>\r
-            <xs:enumeration value="DXE_RUNTIME_DRIVER">\r
-                <xs:annotation>\r
-                    <xs:documentation xml:lang="en">Module is a DXE Driver and depends on the EFI Boot Services, EFI Runtime Services and the DXE Service Table. The module runs after ExitBootServices and produces CreateEvent EventGroupExitBootServices and EventGroupVirtualAddressChange. Code written in this module can run in physical or virtual mode.</xs:documentation>\r
-                </xs:annotation>\r
-            </xs:enumeration>\r
-            <xs:enumeration value="DXE_SAL_DRIVER">\r
-                <xs:annotation>\r
-                    <xs:documentation xml:lang="en">Module is a DXE Driver and depends on the EFI Boot Services, EFI Runtime Services and the DXE Service Table. The module runs after ExitBootServices and produces CreateEvent EventGroupExitBootServices and EventGroupVirtualAddressChange. Code written in this module can run in physical AND in virtual mode.</xs:documentation>\r
-                </xs:annotation>\r
-            </xs:enumeration>\r
-            <xs:enumeration value="DXE_SMM_DRIVER">\r
-                <xs:annotation>\r
-                    <xs:documentation xml:lang="en">Module is a DXE Driver and depends on the EFI Boot Services, EFI Runtime Services and the DXE Service Table. The module also runs in SMM mode and depends on the SMM Service Table. </xs:documentation>\r
-                </xs:annotation>\r
-            </xs:enumeration>\r
-            <xs:enumeration value="TOOLS">\r
-                <xs:annotation>\r
-                    <xs:documentation xml:lang="en">The TOOLS ModuleType is to be used for Tiano Tools modules</xs:documentation>\r
-                </xs:annotation>\r
-            </xs:enumeration>\r
-            <xs:enumeration value="UEFI_DRIVER">\r
-                <xs:annotation>\r
-                    <xs:documentation xml:lang="en">Module is a UEFI Driver and depends on the EFI and Service Tables.</xs:documentation>\r
-                </xs:annotation>\r
-            </xs:enumeration>\r
-            <xs:enumeration value="UEFI_APPLICATION">\r
-                <xs:annotation>\r
-                    <xs:documentation xml:lang="en">Module is a UEFI Applciation and depens on the EFI and Service Tables.</xs:documentation>\r
-                </xs:annotation>\r
-            </xs:enumeration>\r
-            <xs:enumeration value="USER_DEFINED">\r
-                <xs:annotation>\r
-                    <xs:documentation xml:lang="en">Module does not fit into other classifications. The user must have an apriori knowledge of its Usage, and must provide that information to others using this module.</xs:documentation>\r
-                </xs:annotation>\r
-            </xs:enumeration>\r
+            <xs:enumeration value="BASE"/>\r
+            <xs:enumeration value="SEC"/>\r
+            <xs:enumeration value="PEI_CORE"/>\r
+            <xs:enumeration value="PEIM"/>\r
+            <xs:enumeration value="DXE_CORE"/>\r
+            <xs:enumeration value="DXE_DRIVER"/>\r
+            <xs:enumeration value="DXE_RUNTIME_DRIVER"/>\r
+            <xs:enumeration value="DXE_SAL_DRIVER"/>\r
+            <xs:enumeration value="DXE_SMM_DRIVER"/>\r
+            <xs:enumeration value="TOOLS"/>\r
+            <xs:enumeration value="UEFI_DRIVER"/>\r
+            <xs:enumeration value="UEFI_APPLICATION"/>\r
+            <xs:enumeration value="USER_DEFINED"/>\r
         </xs:restriction>\r
     </xs:simpleType>\r
+    <xs:simpleType name="ModuleTypeList">\r
+        <xs:list itemType="FrameworkModuleTypes"/>\r
+    </xs:simpleType>\r
     <xs:simpleType name="Module_Unified">\r
-        <xs:annotation>\r
-            <xs:documentation xml:lang="en">Define a flag to determine whether to put intermediate build files into a directory under the Module, or into a unified tree under the package or platform build trees</xs:documentation>\r
-        </xs:annotation>\r
         <xs:restriction base="UCNameType">\r
             <xs:enumeration value="MODULE"/>\r
             <xs:enumeration value="UNIFIED"/>\r
         </xs:restriction>\r
     </xs:simpleType>\r
     <xs:simpleType name="PackageType">\r
-        <xs:annotation>\r
-            <xs:documentation xml:lang="en">Packages are either source, binary or mixed packages.</xs:documentation>\r
-        </xs:annotation>\r
         <xs:restriction base="UCNameType">\r
             <xs:enumeration value="SOURCE"/>\r
             <xs:enumeration value="BINARY"/>\r
@@ -628,25 +302,10 @@
         </xs:restriction>\r
     </xs:simpleType>\r
     <xs:simpleType name="PackageUsage">\r
-        <xs:annotation>\r
-            <xs:documentation xml:lang="en">This describes the Package Usage Attributes, as defined in the Module Surface Area Specification</xs:documentation>\r
-        </xs:annotation>\r
         <xs:restriction base="NameConvention">\r
-            <xs:enumeration value="ALWAYS_CONSUMED">\r
-                <xs:annotation>\r
-                    <xs:documentation xml:lang="en">A module always consumes a package. This GUID represents the class of the package.</xs:documentation>\r
-                </xs:annotation>\r
-            </xs:enumeration>\r
-            <xs:enumeration value="ALWAYS_PRODUCED">\r
-                <xs:annotation>\r
-                    <xs:documentation xml:lang="en">This is the Package we are creating. This GUID represents the class of the package.</xs:documentation>\r
-                </xs:annotation>\r
-            </xs:enumeration>\r
-            <xs:enumeration value="DEFAULT">\r
-                <xs:annotation>\r
-                    <xs:documentation xml:lang="en">The default is the GUID that specifies the instance of the package.</xs:documentation>\r
-                </xs:annotation>\r
-            </xs:enumeration>\r
+            <xs:enumeration value="ALWAYS_CONSUMED"/>\r
+            <xs:enumeration value="ALWAYS_PRODUCED"/>\r
+            <xs:enumeration value="DEFAULT"/>\r
         </xs:restriction>\r
     </xs:simpleType>\r
     <xs:simpleType name="PcdListType">\r
@@ -654,27 +313,11 @@
     </xs:simpleType>\r
     <xs:simpleType name="PcdTypes">\r
         <xs:restriction base="NameConvention">\r
-            <xs:enumeration value="FIXED_AT_BUILD">\r
-                <xs:annotation>\r
-                    <xs:documentation xml:lang="en">PCD Item is only a build time option and cannot be Dyanmic or Binary patched into the module.</xs:documentation>\r
-                </xs:annotation>\r
-            </xs:enumeration>\r
+            <xs:enumeration value="FIXED_AT_BUILD"/>\r
             <xs:enumeration value="FEATURE_FLAG"/>\r
-            <xs:enumeration value="PATCHABLE_IN_MODULE">\r
-                <xs:annotation>\r
-                    <xs:documentation xml:lang="en">PCD Item is set to a default value at build time and a binary of the module can be patched to update the value.</xs:documentation>\r
-                </xs:annotation>\r
-            </xs:enumeration>\r
-            <xs:enumeration value="DYNAMIC">\r
-                <xs:annotation>\r
-                    <xs:documentation xml:lang="en">PCD Item is found via a PCD PPI in PEI or a PCD Protocol in DXE. The token that matches the PCD entry is either generated by the build (and is only unique to that build) or is from the default database. This form also implies a build option will be produced for this module that allows the user to pick FixedAtBuild, PatchableInModule or Dynamic. If no Type is specified, it defaults to Dynamic</xs:documentation>\r
-                </xs:annotation>\r
-            </xs:enumeration>\r
-            <xs:enumeration value="DYNAMIC_EX">\r
-                <xs:annotation>\r
-                    <xs:documentation xml:lang="en">PCD Item is found via a PCD PPI in PEI or a PCD Protocol in DXE. The token that matches the PCD entry is either generated by the build (and is only unique to that build) or is from the default database. This form also implies a build option will be produced for this module that allows the user to pick FixedAtBuild, PatchableInModule or Dynamic. If no Type is specified, it defaults to Dynamic</xs:documentation>\r
-                </xs:annotation>\r
-            </xs:enumeration>\r
+            <xs:enumeration value="PATCHABLE_IN_MODULE"/>\r
+            <xs:enumeration value="DYNAMIC"/>\r
+            <xs:enumeration value="DYNAMIC_EX"/>\r
         </xs:restriction>\r
     </xs:simpleType>\r
     <xs:simpleType name="PcdDriverTypes">\r
@@ -694,188 +337,63 @@
         </xs:restriction>\r
     </xs:simpleType>\r
     <xs:simpleType name="PcdFeatureFlagUsage">\r
-        <xs:annotation>\r
-            <xs:documentation xml:lang="en">This describes the PCD FEATURE_FLAG Usage Attributes, as defined in the Module Surface Area Specification</xs:documentation>\r
-        </xs:annotation>\r
         <xs:restriction base="UsageTypes">\r
-            <xs:enumeration value="ALWAYS_PRODUCED">\r
-                <xs:annotation>\r
-                    <xs:documentation xml:lang="en">Item is Always produced</xs:documentation>\r
-                </xs:annotation>\r
-            </xs:enumeration>\r
-            <xs:enumeration value="DEFAULT">\r
-                <xs:annotation>\r
-                    <xs:documentation xml:lang="en">Item is tagged as the default</xs:documentation>\r
-                </xs:annotation>\r
-            </xs:enumeration>\r
+            <xs:enumeration value="ALWAYS_PRODUCED"/>\r
+            <xs:enumeration value="DEFAULT"/>\r
         </xs:restriction>\r
     </xs:simpleType>\r
     <xs:simpleType name="PcdItemTypes">\r
         <xs:restriction base="NameConvention">\r
-            <xs:enumeration value="FEATURE_FLAG">\r
-                <xs:annotation>\r
-                    <xs:documentation xml:lang="en">The PCD Item represents a feature flag for the module. Features can only be selected at build time. Items of type FeatureFlag are used to conditionally construct module surface area that is produced as a result of a buld.</xs:documentation>\r
-                </xs:annotation>\r
-            </xs:enumeration>\r
-            <xs:enumeration value="FIXED_AT_BUILD">\r
-                <xs:annotation>\r
-                    <xs:documentation xml:lang="en">PCD Item is only a build time option and cannot be Dyanmic or Binary patched into the module.</xs:documentation>\r
-                </xs:annotation>\r
-            </xs:enumeration>\r
-            <xs:enumeration value="PATCHABLE_IN_MODULE">\r
-                <xs:annotation>\r
-                    <xs:documentation xml:lang="en">PCD Item is set to a default value at build time and a binary of the module can be patched to update the value.</xs:documentation>\r
-                </xs:annotation>\r
-            </xs:enumeration>\r
-            <xs:enumeration value="DYNAMIC">\r
-                <xs:annotation>\r
-                    <xs:documentation xml:lang="en">PCD Item is found via a PCD PPI in PEI or a PCD Protocol in DXE. The token that matches the PCD entry is either generated by the build (and is only unique to that build) or is from the default database. This form also implies a build option will be produced for this module that allows the user to pick FixedAtBuild, PatchableInModule or Dynamic. If no Type is specified, it defaults to Dynamic</xs:documentation>\r
-                </xs:annotation>\r
-            </xs:enumeration>\r
-            <xs:enumeration value="DYNAMIC_EX">\r
-                <xs:annotation>\r
-                    <xs:documentation xml:lang="en">PCD Item is found via a PCD PPI in PEI or a PCD Protocol in DXE. Any PCD token database is supported</xs:documentation>\r
-                </xs:annotation>\r
-            </xs:enumeration>\r
+            <xs:enumeration value="FEATURE_FLAG"/>\r
+            <xs:enumeration value="FIXED_AT_BUILD"/>\r
+            <xs:enumeration value="PATCHABLE_IN_MODULE"/>\r
+            <xs:enumeration value="DYNAMIC"/>\r
+            <xs:enumeration value="DYNAMIC_EX"/>\r
         </xs:restriction>\r
     </xs:simpleType>\r
     <xs:simpleType name="PcdUsage">\r
-        <xs:annotation>\r
-            <xs:documentation xml:lang="en">The PCD Usage is only relevant to Items tagged with FeatureFlag, as defined in the Module Surface Area Specification</xs:documentation>\r
-        </xs:annotation>\r
         <xs:restriction base="NameConvention">\r
-            <xs:enumeration value="ALWAYS_CONSUMED">\r
-                <xs:annotation>\r
-                    <xs:documentation xml:lang="en">The PCD entry must always be provide as the build will include the code and the associated Surface Area.</xs:documentation>\r
-                </xs:annotation>\r
-            </xs:enumeration>\r
-            <xs:enumeration value="SOMETIMES_CONSUMED">\r
-                <xs:annotation>\r
-                    <xs:documentation xml:lang="en">If the FEATURE_FLAG is TRUE the build will include the code and the associated Surface Area. If the FEATURE_FLAG is FALSE, the code and the associated surface area is not included.</xs:documentation>\r
-                </xs:annotation>\r
-            </xs:enumeration>\r
-            <xs:enumeration value="ALWAYS_PRODUCED">\r
-                <xs:annotation>\r
-                    <xs:documentation xml:lang="en">The PCD Entry is Always included in the build code</xs:documentation>\r
-                </xs:annotation>\r
-            </xs:enumeration>\r
-            <xs:enumeration value="SOMETIMES_PRODUCED">\r
-                <xs:annotation>\r
-                    <xs:documentation xml:lang="en">If the FEATURE_FLAG is TRUE the build will include the code and the associated Surface Area. If the FEATURE_FLAG is FALSE, the code and the associated surface area is not included.</xs:documentation>\r
-                </xs:annotation>\r
-            </xs:enumeration>\r
-            <xs:enumeration value="DEFAULT">\r
-                <xs:annotation>\r
-                    <xs:documentation xml:lang="en">"true" or "false". Indicates the default value for the PCD entry. This is used by the platform wizard to suggest values for a given platform build.</xs:documentation>\r
-                </xs:annotation>\r
-            </xs:enumeration>\r
+            <xs:enumeration value="ALWAYS_CONSUMED"/>\r
+            <xs:enumeration value="SOMETIMES_CONSUMED"/>\r
+            <xs:enumeration value="ALWAYS_PRODUCED"/>\r
+            <xs:enumeration value="SOMETIMES_PRODUCED"/>\r
+            <xs:enumeration value="DEFAULT"/>\r
         </xs:restriction>\r
     </xs:simpleType>\r
     <xs:simpleType name="PpiNotifyUsage">\r
-        <xs:annotation>\r
-            <xs:documentation xml:lang="en">This describes the PPI Notify Usage Attributes, as defined in the Module Surface Area Specification</xs:documentation>\r
-        </xs:annotation>\r
         <xs:restriction base="NameConvention">\r
-            <xs:enumeration value="SOMETIMES_CONSUMED">\r
-                <xs:annotation>\r
-                    <xs:documentation xml:lang="en">Module will consume the PPI if it's produced. Consumption is defined by executing the PPI notify function.</xs:documentation>\r
-                </xs:annotation>\r
-            </xs:enumeration>\r
+            <xs:enumeration value="SOMETIMES_CONSUMED"/>\r
         </xs:restriction>\r
     </xs:simpleType>\r
     <xs:simpleType name="PpiUsage">\r
-        <xs:annotation>\r
-            <xs:documentation xml:lang="en">This describes the PPI Usage Attributes, as defined in the Module Surface Area Specification</xs:documentation>\r
-        </xs:annotation>\r
         <xs:restriction base="NameConvention">\r
-            <xs:enumeration value="ALWAYS_CONSUMED">\r
-                <xs:annotation>\r
-                    <xs:documentation xml:lang="en">Item is Required for the driver to function. This is part of the dependency expression of a module if the item represents a PPI or Protocol</xs:documentation>\r
-                </xs:annotation>\r
-            </xs:enumeration>\r
-            <xs:enumeration value="SOMETIMES_CONSUMED">\r
-                <xs:annotation>\r
-                    <xs:documentation xml:lang="en">Item is Consumed by the driver if the Item exists</xs:documentation>\r
-                </xs:annotation>\r
-            </xs:enumeration>\r
-            <xs:enumeration value="ALWAYS_PRODUCED">\r
-                <xs:annotation>\r
-                    <xs:documentation xml:lang="en">Item is Always produced</xs:documentation>\r
-                </xs:annotation>\r
-            </xs:enumeration>\r
-            <xs:enumeration value="SOMETIMES_PRODUCED">\r
-                <xs:annotation>\r
-                    <xs:documentation xml:lang="en">Item is Conditionally produced</xs:documentation>\r
-                </xs:annotation>\r
-            </xs:enumeration>\r
-            <xs:enumeration value="PRIVATE">\r
-                <xs:annotation>\r
-                    <xs:documentation xml:lang="en">Ppi is produced and consumed only by this module</xs:documentation>\r
-                </xs:annotation>\r
-            </xs:enumeration>\r
+            <xs:enumeration value="ALWAYS_CONSUMED"/>\r
+            <xs:enumeration value="SOMETIMES_CONSUMED"/>\r
+            <xs:enumeration value="ALWAYS_PRODUCED"/>\r
+            <xs:enumeration value="SOMETIMES_PRODUCED"/>\r
+            <xs:enumeration value="PRIVATE"/>\r
         </xs:restriction>\r
     </xs:simpleType>\r
     <xs:simpleType name="ProtocolNotifyUsage">\r
-        <xs:annotation>\r
-            <xs:documentation xml:lang="en">This describes the PROTOCOL Notify Usage Attributes, as defined in the Module Surface Area Specification</xs:documentation>\r
-        </xs:annotation>\r
         <xs:restriction base="NameConvention">\r
-            <xs:enumeration value="SOMETIMES_CONSUMED">\r
-                <xs:annotation>\r
-                    <xs:documentation xml:lang="en">Module will Consume protocol if it's produced. Consumption is defined by executing the protocol notify function.</xs:documentation>\r
-                </xs:annotation>\r
-            </xs:enumeration>\r
+            <xs:enumeration value="SOMETIMES_CONSUMED"/>\r
         </xs:restriction>\r
     </xs:simpleType>\r
     <xs:simpleType name="ProtocolUsage">\r
-        <xs:annotation>\r
-            <xs:documentation xml:lang="en">This describes the PROTOCOL Usage Attributes, as defined in the Module Surface Area Specification</xs:documentation>\r
-        </xs:annotation>\r
         <xs:restriction base="NameConvention">\r
-            <xs:enumeration value="ALWAYS_CONSUMED">\r
-                <xs:annotation>\r
-                    <xs:documentation xml:lang="en">Item is Required for the driver to function. This is part of the dependency expression of a module if the item represents a PPI or Protocol</xs:documentation>\r
-                </xs:annotation>\r
-            </xs:enumeration>\r
-            <xs:enumeration value="SOMETIMES_CONSUMED">\r
-                <xs:annotation>\r
-                    <xs:documentation xml:lang="en">Item is Consumed by the driver if the Item exists</xs:documentation>\r
-                </xs:annotation>\r
-            </xs:enumeration>\r
-            <xs:enumeration value="ALWAYS_PRODUCED">\r
-                <xs:annotation>\r
-                    <xs:documentation xml:lang="en">Item is Always produced</xs:documentation>\r
-                </xs:annotation>\r
-            </xs:enumeration>\r
-            <xs:enumeration value="SOMETIMES_PRODUCED">\r
-                <xs:annotation>\r
-                    <xs:documentation xml:lang="en">Item is Conditionally produced</xs:documentation>\r
-                </xs:annotation>\r
-            </xs:enumeration>\r
-            <xs:enumeration value="TO_START">\r
-                <xs:annotation>\r
-                    <xs:documentation xml:lang="en">Protocol Only - Protocol is required by driver binding Start() function to make Start() succeed</xs:documentation>\r
-                </xs:annotation>\r
-            </xs:enumeration>\r
-            <xs:enumeration value="BY_START">\r
-                <xs:annotation>\r
-                    <xs:documentation xml:lang="en">Protocol Only - Protocol is produced by driver binding Start() function if and only if Start() succeeds</xs:documentation>\r
-                </xs:annotation>\r
-            </xs:enumeration>\r
-            <xs:enumeration value="PRIVATE">\r
-                <xs:annotation>\r
-                    <xs:documentation xml:lang="en">Protocol is produced and consumed only by this module</xs:documentation>\r
-                </xs:annotation>\r
-            </xs:enumeration>\r
+            <xs:enumeration value="ALWAYS_CONSUMED"/>\r
+            <xs:enumeration value="SOMETIMES_CONSUMED"/>\r
+            <xs:enumeration value="ALWAYS_PRODUCED"/>\r
+            <xs:enumeration value="SOMETIMES_PRODUCED"/>\r
+            <xs:enumeration value="TO_START"/>\r
+            <xs:enumeration value="BY_START"/>\r
+            <xs:enumeration value="PRIVATE"/>\r
         </xs:restriction>\r
     </xs:simpleType>\r
     <xs:simpleType name="SkuListType">\r
         <xs:list itemType="HexByteDataType"/>\r
     </xs:simpleType>\r
     <xs:simpleType name="SupportedArchitectures">\r
-        <xs:annotation>\r
-            <xs:documentation xml:lang="en"> These are the currently Supportted Architectures type codes </xs:documentation>\r
-        </xs:annotation>\r
         <xs:restriction base="NameConvention">\r
             <xs:enumeration value="ALL"/>\r
             <xs:enumeration value="EBC"/>\r
@@ -887,47 +405,18 @@
         </xs:restriction>\r
     </xs:simpleType>\r
     <xs:simpleType name="SystemTableUsage">\r
-        <xs:annotation>\r
-            <xs:documentation xml:lang="en">This describes the System Table Usage Attributes, as defined in the Module Surface Area Specification</xs:documentation>\r
-        </xs:annotation>\r
         <xs:restriction base="NameConvention">\r
-            <xs:enumeration value="ALWAYS_CONSUMED">\r
-                <xs:annotation>\r
-                    <xs:documentation xml:lang="en">Module requires a GUIDed entry in the system table</xs:documentation>\r
-                </xs:annotation>\r
-            </xs:enumeration>\r
-            <xs:enumeration value="SOMETIMES_CONSUMED">\r
-                <xs:annotation>\r
-                    <xs:documentation xml:lang="en">Module will use the GUIDed entry in the system table only if the GUID is present</xs:documentation>\r
-                </xs:annotation>\r
-            </xs:enumeration>\r
-            <xs:enumeration value="ALWAYS_PRODUCED">\r
-                <xs:annotation>\r
-                    <xs:documentation xml:lang="en">Module Always produces a GUIDed entry in the system table</xs:documentation>\r
-                </xs:annotation>\r
-            </xs:enumeration>\r
-            <xs:enumeration value="SOMETIMES_PRODUCED">\r
-                <xs:annotation>\r
-                    <xs:documentation xml:lang="en">Module sometimes produces a GUIDed entry in the system table for some of its execution flow</xs:documentation>\r
-                </xs:annotation>\r
-            </xs:enumeration>\r
-            <xs:enumeration value="PRIVATE">\r
-                <xs:annotation>\r
-                    <xs:documentation xml:lang="en">SystemTable is produced and consumed only by this module</xs:documentation>\r
-                </xs:annotation>\r
-            </xs:enumeration>\r
+            <xs:enumeration value="ALWAYS_CONSUMED"/>\r
+            <xs:enumeration value="SOMETIMES_CONSUMED"/>\r
+            <xs:enumeration value="ALWAYS_PRODUCED"/>\r
+            <xs:enumeration value="SOMETIMES_PRODUCED"/>\r
+            <xs:enumeration value="PRIVATE"/>\r
         </xs:restriction>\r
     </xs:simpleType>\r
     <xs:simpleType name="Token">\r
-        <xs:annotation>\r
-            <xs:documentation xml:lang="en"> The Token data is union of HexDoubleWordDataType, GuidNaming Convetion and GuidArrayType. </xs:documentation>\r
-        </xs:annotation>\r
         <xs:union memberTypes="GuidArrayType GuidNamingConvention HexDoubleWordDataType"/>\r
     </xs:simpleType>\r
     <xs:simpleType name="ToolChains">\r
-        <xs:annotation>\r
-            <xs:documentation xml:lang="en">Supported Tool Chains are MSFT, INTEL, GCC and CYGWIN</xs:documentation>\r
-        </xs:annotation>\r
         <xs:restriction base="UCNameType">\r
             <xs:enumeration value="MSFT"/>\r
             <xs:enumeration value="INTEL"/>\r
@@ -936,107 +425,45 @@
         </xs:restriction>\r
     </xs:simpleType>\r
     <xs:simpleType name="ToothPick">\r
-        <xs:annotation>\r
-            <xs:documentation xml:lang="en">Describes which way the directory separator is leaning, either \ for WINDOWS or / for UNIX</xs:documentation>\r
-        </xs:annotation>\r
         <xs:restriction base="xs:normalizedString">\r
             <xs:enumeration value="UNIX"/>\r
             <xs:enumeration value="WINDOWS"/>\r
         </xs:restriction>\r
     </xs:simpleType>\r
+    <xs:simpleType name="UiNameType">\r
+        <xs:restriction base="xs:string">\r
+            <xs:pattern value="(([a-zA-Z][a-zA-Z0-9]*)(_)*(.)*)+"/>\r
+        </xs:restriction>\r
+    </xs:simpleType>\r
     <xs:simpleType name="UnicodeString">\r
-        <xs:annotation>\r
-            <xs:documentation xml:lang="en">Define how we specify unicode strings</xs:documentation>\r
-        </xs:annotation>\r
         <xs:restriction base="xs:normalizedString">\r
             <xs:pattern value="L(:)?(&quot;)(\w+)*((\W*)*(\s*)*(\w*)*)*(&quot;)"/>\r
         </xs:restriction>\r
     </xs:simpleType>\r
     <xs:simpleType name="UsageTypes">\r
-        <xs:annotation>\r
-            <xs:documentation xml:lang="en">This describes the Generic Usage Attributes, as defined in the Module Surface Area Specification</xs:documentation>\r
-        </xs:annotation>\r
         <xs:restriction base="NameConvention">\r
-            <xs:enumeration value="ALWAYS_CONSUMED">\r
-                <xs:annotation>\r
-                    <xs:documentation xml:lang="en">Item is Required for the driver to function. This is part of the dependency expression of a module if the item represents a PPI or Protocol</xs:documentation>\r
-                </xs:annotation>\r
-            </xs:enumeration>\r
-            <xs:enumeration value="SOMETIMES_CONSUMED">\r
-                <xs:annotation>\r
-                    <xs:documentation xml:lang="en">Item is Consumed by the driver if the Item exists</xs:documentation>\r
-                </xs:annotation>\r
-            </xs:enumeration>\r
-            <xs:enumeration value="ALWAYS_PRODUCED">\r
-                <xs:annotation>\r
-                    <xs:documentation xml:lang="en">Item is Always produced</xs:documentation>\r
-                </xs:annotation>\r
-            </xs:enumeration>\r
-            <xs:enumeration value="SOMETIMES_PRODUCED">\r
-                <xs:annotation>\r
-                    <xs:documentation xml:lang="en">Item is Conditionally produced</xs:documentation>\r
-                </xs:annotation>\r
-            </xs:enumeration>\r
-            <xs:enumeration value="TO_START">\r
-                <xs:annotation>\r
-                    <xs:documentation xml:lang="en">Protocol Only - Protocol is required by driver binding Start() function to make Start() succeed</xs:documentation>\r
-                </xs:annotation>\r
-            </xs:enumeration>\r
-            <xs:enumeration value="BY_START">\r
-                <xs:annotation>\r
-                    <xs:documentation xml:lang="en">Protocol Only - Protocol is produced by driver binding Start() function if and only if Start() succeeds</xs:documentation>\r
-                </xs:annotation>\r
-            </xs:enumeration>\r
-            <xs:enumeration value="PRIVATE">\r
-                <xs:annotation>\r
-                    <xs:documentation xml:lang="en">Item is Private to the module and cannot be used by other modules</xs:documentation>\r
-                </xs:annotation>\r
-            </xs:enumeration>\r
-            <xs:enumeration value="DEFAULT">\r
-                <xs:annotation>\r
-                    <xs:documentation xml:lang="en">This is the default value for an Item</xs:documentation>\r
-                </xs:annotation>\r
-            </xs:enumeration>\r
+            <xs:enumeration value="ALWAYS_CONSUMED"/>\r
+            <xs:enumeration value="SOMETIMES_CONSUMED"/>\r
+            <xs:enumeration value="ALWAYS_PRODUCED"/>\r
+            <xs:enumeration value="SOMETIMES_PRODUCED"/>\r
+            <xs:enumeration value="TO_START"/>\r
+            <xs:enumeration value="BY_START"/>\r
+            <xs:enumeration value="PRIVATE"/>\r
+            <xs:enumeration value="DEFAULT"/>\r
         </xs:restriction>\r
     </xs:simpleType>\r
     <xs:simpleType name="VariableOffsetValues">\r
-        <xs:annotation>\r
-            <xs:documentation xml:lang="en">Describes the available Variable Offset data types, Bytes:Bits or BitSize</xs:documentation>\r
-        </xs:annotation>\r
         <xs:restriction base="xs:string">\r
             <xs:pattern value="\d+(:)?\d*"/>\r
         </xs:restriction>\r
     </xs:simpleType>\r
     <xs:simpleType name="VariableUsage">\r
-        <xs:annotation>\r
-            <xs:documentation xml:lang="en">This describes the Variable Usage Attributes, as defined in the Module Surface Area Specification</xs:documentation>\r
-        </xs:annotation>\r
         <xs:restriction base="NameConvention">\r
-            <xs:enumeration value="ALWAYS_CONSUMED">\r
-                <xs:annotation>\r
-                    <xs:documentation xml:lang="en">Module requires the variable entry to be set</xs:documentation>\r
-                </xs:annotation>\r
-            </xs:enumeration>\r
-            <xs:enumeration value="SOMETIMES_CONSUMED">\r
-                <xs:annotation>\r
-                    <xs:documentation xml:lang="en">Module will use the variable entry if it's set</xs:documentation>\r
-                </xs:annotation>\r
-            </xs:enumeration>\r
-            <xs:enumeration value="ALWAYS_PRODUCED">\r
-                <xs:annotation>\r
-                    <xs:documentation xml:lang="en">Module Always will write the variable</xs:documentation>\r
-                </xs:annotation>\r
-            </xs:enumeration>\r
-            <xs:enumeration value="SOMETIMES_PRODUCED">\r
-                <xs:annotation>\r
-                    <xs:documentation xml:lang="en">Module sometimes writes the variable</xs:documentation>\r
-                </xs:annotation>\r
-            </xs:enumeration>\r
-            <xs:enumeration value="PRIVATE">\r
-                <xs:annotation>\r
-                    <xs:documentation xml:lang="en">Variable is produced and consumed only by this module</xs:documentation>\r
-                </xs:annotation>\r
-            </xs:enumeration>\r
+            <xs:enumeration value="ALWAYS_CONSUMED"/>\r
+            <xs:enumeration value="SOMETIMES_CONSUMED"/>\r
+            <xs:enumeration value="ALWAYS_PRODUCED"/>\r
+            <xs:enumeration value="SOMETIMES_PRODUCED"/>\r
+            <xs:enumeration value="PRIVATE"/>\r
         </xs:restriction>\r
     </xs:simpleType>\r
     <!-- Complex Data Types -->\r
@@ -1046,9 +473,6 @@
         </xs:sequence>\r
     </xs:complexType>\r
     <xs:complexType name="ToolType">\r
-        <xs:annotation>\r
-            <xs:documentation xml:lang="en">This type is to permit adding specific tools and tool arguments for User Defined tools, into the Module Build Description file.</xs:documentation>\r
-        </xs:annotation>\r
         <xs:sequence>\r
             <xs:element name="ToolName" type="xs:string"/>\r
             <xs:element name="ToolArgs" type="xs:string"/>\r

diff --git a/Tools/XMLSchema/FrameworkHeaders.xsd b/Tools/XMLSchema/FrameworkHeaders.xsd
index a34d7a088f4a0f7a8aed3bdbd36d5f44c221063a..a798526839f2cec129cdce7b3888e95cec7e9928 100644 (file)
--- a/Tools/XMLSchema/FrameworkHeaders.xsd
+++ b/Tools/XMLSchema/FrameworkHeaders.xsd
@@ -212,43 +212,49 @@
     </xs:element>\r
     <xs:element name="SpdHeader">\r
         <xs:annotation>\r
-            <xs:documentation xml:lang="en">This head is for the Surface Area Package Description file (SPD) The Guid may change when the contents of the file are changed.</xs:documentation>\r
+            <xs:documentation xml:lang="en">This head is for the Surface Area Package Description file (SPD)</xs:documentation>\r
+            <xs:documentation xml:lang="en">The Guid MUST change when the contents of the file undergo MAJOR FUNCTIONALITY changes.</xs:documentation>\r
+            <xs:documentation xml:lang="en">The Version MUST change when the contents of the file undergo MINOR FUNCTIONALITY changes.</xs:documentation>\r
         </xs:annotation>\r
         <xs:complexType>\r
             <xs:sequence>\r
-                <xs:element minOccurs="1" maxOccurs="1" ref="PackageName"/>\r
+                <xs:element minOccurs="1" maxOccurs="1" name="PackageName" type="UiNameType"/>\r
                 <xs:choice minOccurs="1" maxOccurs="1">\r
+                    <!-- DO NOT USE! Guid needs to be removed -->\r
                     <xs:element minOccurs="0" maxOccurs="1" ref="Guid"/>\r
-                    <!-- Guid needs to be removed -->\r
-                    <xs:element minOccurs="0" maxOccurs="1" ref="GuidValue"/>\r
                     <!-- GuidValue needs to be required -->\r
+                    <xs:element minOccurs="0" maxOccurs="1" ref="GuidValue"/>\r
                 </xs:choice>\r
-                <xs:element minOccurs="1" maxOccurs="1" ref="Version"/>\r
+                <xs:element minOccurs="1" maxOccurs="1" name="Version" type="xs:decimal"/>\r
                 <xs:element minOccurs="1" maxOccurs="1" ref="Abstract"/>\r
                 <xs:element minOccurs="1" maxOccurs="1" ref="Description"/>\r
                 <xs:element minOccurs="1" maxOccurs="1" ref="Copyright"/>\r
                 <xs:element minOccurs="1" maxOccurs="1" ref="License"/>\r
                 <xs:choice minOccurs="1" maxOccurs="1">\r
-                    <xs:element minOccurs="0" maxOccurs="1" ref="Created"/>\r
                     <!-- Created needs to be removed -->\r
+                    <xs:element minOccurs="0" maxOccurs="1" ref="Created"/>\r
+                    <!-- CreatedDate needs to be removed -->\r
                     <xs:element minOccurs="0" maxOccurs="1" ref="CreatedDate"/>\r
-                    <!-- CreatedDate needs to be required -->\r
                 </xs:choice>\r
+                <!-- E_Mail needs to be removed -->\r
                 <xs:element minOccurs="0" maxOccurs="1" ref="E-Mail"/>\r
                 <xs:choice minOccurs="0" maxOccurs="1">\r
+                    <!-- Updated needs to be removed -->\r
                     <xs:element minOccurs="0" maxOccurs="1" ref="Updated"/>\r
-                    <!-- Created needs to be removed -->\r
+                    <!-- UpdatedDate needs to be removed -->\r
                     <xs:element minOccurs="0" maxOccurs="1" ref="ModifiedDate"/>\r
-                    <!-- CreatedDate needs to be required -->\r
                 </xs:choice>\r
+                <!-- URL needs to be removed -->\r
                 <xs:element minOccurs="0" maxOccurs="1" ref="URL"/>\r
+                <!-- PackageType needs to be removed -->\r
                 <xs:element minOccurs="1" maxOccurs="1" ref="PackageType"/>\r
+                <!-- ReadOnly and RePackage remain in final -->\r
                 <xs:element minOccurs="0" maxOccurs="1" ref="ReadOnly"/>\r
                 <xs:element minOccurs="0" maxOccurs="1" ref="RePackage"/>\r
+                <!-- Specification needs to be required - FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00000052 -->\r
                 <xs:element minOccurs="0" maxOccurs="unbounded" ref="Specification"/>\r
-                <!-- Specification needs to be required - FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00090000 -->\r
-                <xs:element minOccurs="0" maxOccurs="1" ref="OutputDirectory"/>\r
                 <!-- OutputDirectory needs to be removed -->\r
+                <xs:element minOccurs="0" maxOccurs="1" ref="OutputDirectory"/>\r
             </xs:sequence>\r
         </xs:complexType>\r
     </xs:element>\r

diff --git a/Tools/XMLSchema/SurfaceArea.xsd b/Tools/XMLSchema/SurfaceArea.xsd
index e5e0276c38058f2b0bab03ecd5e8411468a600e1..7b0c08c78fb73bc6bb93d8681531fabe39ed23c9 100644 (file)
--- a/Tools/XMLSchema/SurfaceArea.xsd
+++ b/Tools/XMLSchema/SurfaceArea.xsd
@@ -23,11 +23,7 @@
             <xs:sequence>\r
                 <xs:element minOccurs="1" maxOccurs="1" ref="FdbHeader"/>\r
                 <xs:element minOccurs="1" maxOccurs="1" ref="PackageList"/>\r
-                <xs:choice>\r
-                    <xs:element minOccurs="0" maxOccurs="1" ref="PlatformList"/>\r
-                    <!-- DO NOT USE! removing PlatformDescriptions, use PlatformList instead. -->\r
-                    <xs:element minOccurs="0" maxOccurs="1" ref="PlatformDescriptions"/>\r
-                </xs:choice>\r
+                <xs:element minOccurs="0" maxOccurs="1" ref="PlatformList"/>\r
             </xs:sequence>\r
         </xs:complexType>\r
     </xs:element>\r
@@ -38,6 +34,7 @@
         <xs:complexType>\r
             <xs:sequence>\r
                 <xs:element minOccurs="1" maxOccurs="1" ref="PlatformHeader"/>\r
+                <xs:element minOccurs="0" maxOccurs="1" ref="SkuInfo"/>\r
                 <xs:element minOccurs="0" maxOccurs="1" ref="Flash"/>\r
                 <!-- DO NOT USE! removing TianoImage, use FrameworkModules instead. -->\r
                 <xs:element minOccurs="0" maxOccurs="1" ref="TianoImage"/>\r
@@ -45,6 +42,7 @@
                 <!-- DO NOT USE! removing PcdBuildDeclarations here, use PcdBuildDeclaratiion in ModuleSA instead. -->\r
                 <xs:element minOccurs="0" maxOccurs="1" ref="PcdBuildDeclarations"/>\r
                 <xs:choice minOccurs="0">\r
+                    <!-- DO NOT USE! removing PcdDynamicBuildDeclarations here, use DynamicPcdBuildDefinitions in ModuleSA instead. -->\r
                     <xs:element minOccurs="0" maxOccurs="1" ref="PcdDynamicBuildDeclarations"/>\r
                     <xs:element minOccurs="0" maxOccurs="1" ref="DynamicPcdBuildDefinitions"/>\r
                 </xs:choice>\r
@@ -89,6 +87,7 @@
                 <xs:element minOccurs="0" maxOccurs="1" ref="LibraryClassDefinitions"/>\r
                 <xs:element minOccurs="1" maxOccurs="1" ref="SourceFiles"/>\r
                 <xs:element minOccurs="0" maxOccurs="1" ref="Includes"/>\r
+                <xs:element minOccurs="0" maxOccurs="1" ref="Libraries"/>\r
                 <xs:element minOccurs="0" maxOccurs="1" ref="Protocols"/>\r
                 <xs:element minOccurs="0" maxOccurs="1" ref="Events"/>\r
                 <xs:element minOccurs="0" maxOccurs="1" ref="Hobs"/>\r
@@ -141,8 +140,9 @@
                 <xs:element minOccurs="0" maxOccurs="1" ref="LibraryClassDefinitions"/>\r
                 <xs:element minOccurs="1" maxOccurs="1" ref="SourceFiles"/>\r
                 <xs:choice minOccurs="0">\r
-                    <xs:element minOccurs="0" maxOccurs="1" ref="Includes"/>\r
-                    <xs:element minOccurs="0" maxOccurs="1" ref="PackageDependencies"/>\r
+                  <!-- DO NOT USE! removing Includes, use PackageDependencies instead -->\r
+                  <xs:element minOccurs="0" maxOccurs="1" ref="Includes"/>\r
+                  <xs:element minOccurs="0" maxOccurs="1" ref="PackageDependencies"/>\r
                 </xs:choice>\r
                 <xs:element minOccurs="0" maxOccurs="1" ref="Protocols"/>\r
                 <xs:element minOccurs="0" maxOccurs="1" ref="Events"/>\r
@@ -152,11 +152,13 @@
                 <xs:element minOccurs="0" maxOccurs="1" ref="BootModes"/>\r
                 <xs:element minOccurs="0" maxOccurs="1" ref="SystemTables"/>\r
                 <xs:element minOccurs="0" maxOccurs="1" ref="DataHubs"/>\r
+                <!-- DO NOT USE! removing Formsets, use HiiPackages instead -->\r
                 <xs:element minOccurs="0" maxOccurs="1" ref="Formsets"/>\r
+                <xs:element minOccurs="0" maxOccurs="1" ref="HiiPackages"/>\r
                 <xs:element minOccurs="0" maxOccurs="1" ref="Guids"/>\r
                 <xs:element minOccurs="0" maxOccurs="1" ref="Externs"/>\r
                 <xs:choice minOccurs="0">\r
-                    <!-- DO NOT USE! removing PCDs, use MsaPcdDeclarations instead -->\r
+                    <!-- DO NOT USE! removing PCDs, use PcdCoded instead -->\r
                     <xs:element minOccurs="0" maxOccurs="1" ref="PCDs"/>\r
                     <xs:element minOccurs="0" maxOccurs="1" ref="PcdCoded"/>\r
                 </xs:choice>\r
@@ -173,7 +175,8 @@
             <xs:sequence>\r
                 <xs:element minOccurs="1" maxOccurs="1" ref="SpdHeader"/>\r
                 <xs:element minOccurs="0" maxOccurs="1" ref="LibraryClassDeclarations"/>\r
-                <xs:element minOccurs="0" maxOccurs="1" ref="IndustryStdHeaders"/>\r
+                <xs:element minOccurs="0" maxOccurs="1" ref="IndustryStdIncludes"/>\r
+                <!-- DO NOT USE removing PackageDependencies, this is moving to FDP installation process -->\r
                 <xs:element minOccurs="0" maxOccurs="1" ref="PackageDependencies"/>\r
                 <xs:element minOccurs="0" maxOccurs="1" ref="MsaFiles"/>\r
                 <xs:element minOccurs="0" maxOccurs="1" ref="PackageHeaders"/>\r