Sync the type of <VariableName> with the latest email send by Larry.

[mirror_edk2.git] / Tools / XMLSchema / SurfaceArea.xsd

diff --git a/Tools/XMLSchema/SurfaceArea.xsd b/Tools/XMLSchema/SurfaceArea.xsd
index a0223cb96f2611de587ca6aea1586c426c9487b4..ed47c113c341dd6933ca174a867bbba354ba1fbe 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,14 +34,20 @@
         <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
                 <xs:element minOccurs="0" maxOccurs="1" ref="FrameworkModules"/>\r
                 <!-- DO NOT USE! removing PcdBuildDeclarations here, use PcdBuildDeclaratiion in ModuleSA instead. -->\r
                 <xs:element minOccurs="0" maxOccurs="1" ref="PcdBuildDeclarations"/>\r
-                <xs:element minOccurs="0" maxOccurs="1" ref="PcdDynamicBuildDeclarations"/>\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
                 <xs:element minOccurs="0" maxOccurs="1" ref="BuildOptions"/>\r
+                <xs:element minOccurs="0" maxOccurs="unbounded" ref="UserExtensions"/>\r
             </xs:sequence>\r
         </xs:complexType>\r
     </xs:element>\r
@@ -85,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
@@ -136,7 +139,11 @@
                 <xs:element minOccurs="1" maxOccurs="1" ref="MsaHeader"/>\r
                 <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:choice minOccurs="0">\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
                 <xs:element minOccurs="0" maxOccurs="1" ref="Hobs"/>\r
@@ -145,15 +152,18 @@
                 <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="MsaPcdDeclarations"/>\r
+                    <xs:element minOccurs="0" maxOccurs="1" ref="PcdCoded"/>\r
                 </xs:choice>\r
                 <xs:element minOccurs="0" maxOccurs="1" ref="BuildOptions"/>\r
+                <xs:element minOccurs="0" maxOccurs="unbounded" ref="UserExtensions"/>\r
             </xs:sequence>\r
         </xs:complexType>\r
     </xs:element>\r
@@ -165,9 +175,12 @@
             <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 THIS INSTANCE of PackageDependencies, this is moving to FDP installation process -->\r
                 <xs:element minOccurs="0" maxOccurs="1" ref="PackageDependencies"/>\r
+                <!-- DO NOT USE removing MsaFiles, use MsaFileList instead , do not wrap in choice, too many entries to convert all at once. -->\r
                 <xs:element minOccurs="0" maxOccurs="1" ref="MsaFiles"/>\r
+                <xs:element minOccurs="0" maxOccurs="1" ref="MsaFileList"/>\r
                 <xs:element minOccurs="0" maxOccurs="1" ref="PackageHeaders"/>\r
                 <xs:element minOccurs="0" maxOccurs="1" ref="GuidDeclarations"/>\r
                 <xs:element minOccurs="0" maxOccurs="1" ref="ProtocolDeclarations"/>\r
@@ -177,6 +190,7 @@
                     <xs:element minOccurs="0" maxOccurs="1" ref="PcdDefinitions"/>\r
                     <xs:element minOccurs="0" maxOccurs="1" ref="PcdDeclarations"/>\r
                 </xs:choice>\r
+                <xs:element minOccurs="0" maxOccurs="unbounded" ref="UserExtensions"/>\r
             </xs:sequence>\r
         </xs:complexType>\r
     </xs:element>\r