X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=blobdiff_plain;f=Tools%2FXMLSchema%2FSurfaceArea.xsd;h=ed47c113c341dd6933ca174a867bbba354ba1fbe;hp=a0223cb96f2611de587ca6aea1586c426c9487b4;hb=02b4b59b2bb80e88409bb144463366e0f4e89b5d;hpb=0850ca3b8c56d87cd2a248101343889a7f073182

diff --git a/Tools/XMLSchema/SurfaceArea.xsd b/Tools/XMLSchema/SurfaceArea.xsd
index a0223cb96f..ed47c113c3 100644
--- a/Tools/XMLSchema/SurfaceArea.xsd
+++ b/Tools/XMLSchema/SurfaceArea.xsd
@@ -23,11 +23,7 @@
             <xs:sequence>
                 <xs:element minOccurs="1" maxOccurs="1" ref="FdbHeader"/>
                 <xs:element minOccurs="1" maxOccurs="1" ref="PackageList"/>
-                <xs:choice>
-                    <xs:element minOccurs="0" maxOccurs="1" ref="PlatformList"/>
-                    <!-- DO NOT USE! removing PlatformDescriptions, use PlatformList instead. -->
-                    <xs:element minOccurs="0" maxOccurs="1" ref="PlatformDescriptions"/>
-                </xs:choice>
+                <xs:element minOccurs="0" maxOccurs="1" ref="PlatformList"/>
             </xs:sequence>
         </xs:complexType>
     </xs:element>
@@ -38,14 +34,20 @@
         <xs:complexType>
             <xs:sequence>
                 <xs:element minOccurs="1" maxOccurs="1" ref="PlatformHeader"/>
+                <xs:element minOccurs="0" maxOccurs="1" ref="SkuInfo"/>
                 <xs:element minOccurs="0" maxOccurs="1" ref="Flash"/>
                 <!-- DO NOT USE! removing TianoImage, use FrameworkModules instead. -->
                 <xs:element minOccurs="0" maxOccurs="1" ref="TianoImage"/>
                 <xs:element minOccurs="0" maxOccurs="1" ref="FrameworkModules"/>
                 <!-- DO NOT USE! removing PcdBuildDeclarations here, use PcdBuildDeclaratiion in ModuleSA instead. -->
                 <xs:element minOccurs="0" maxOccurs="1" ref="PcdBuildDeclarations"/>
-                <xs:element minOccurs="0" maxOccurs="1" ref="PcdDynamicBuildDeclarations"/>
+                <xs:choice minOccurs="0">
+                    <!-- DO NOT USE! removing PcdDynamicBuildDeclarations here, use DynamicPcdBuildDefinitions in ModuleSA instead. -->
+                    <xs:element minOccurs="0" maxOccurs="1" ref="PcdDynamicBuildDeclarations"/>
+                    <xs:element minOccurs="0" maxOccurs="1" ref="DynamicPcdBuildDefinitions"/>
+                </xs:choice>
                 <xs:element minOccurs="0" maxOccurs="1" ref="BuildOptions"/>
+                <xs:element minOccurs="0" maxOccurs="unbounded" ref="UserExtensions"/>
             </xs:sequence>
         </xs:complexType>
     </xs:element>
@@ -85,6 +87,7 @@
                 <xs:element minOccurs="0" maxOccurs="1" ref="LibraryClassDefinitions"/>
                 <xs:element minOccurs="1" maxOccurs="1" ref="SourceFiles"/>
                 <xs:element minOccurs="0" maxOccurs="1" ref="Includes"/>
+                <xs:element minOccurs="0" maxOccurs="1" ref="Libraries"/>
                 <xs:element minOccurs="0" maxOccurs="1" ref="Protocols"/>
                 <xs:element minOccurs="0" maxOccurs="1" ref="Events"/>
                 <xs:element minOccurs="0" maxOccurs="1" ref="Hobs"/>
@@ -136,7 +139,11 @@
                 <xs:element minOccurs="1" maxOccurs="1" ref="MsaHeader"/>
                 <xs:element minOccurs="0" maxOccurs="1" ref="LibraryClassDefinitions"/>
                 <xs:element minOccurs="1" maxOccurs="1" ref="SourceFiles"/>
-                <xs:element minOccurs="0" maxOccurs="1" ref="Includes"/>
+                <xs:choice minOccurs="0">
+                    <!-- DO NOT USE! removing Includes, use PackageDependencies instead -->
+                    <xs:element minOccurs="0" maxOccurs="1" ref="Includes"/>
+                    <xs:element minOccurs="0" maxOccurs="1" ref="PackageDependencies"/>
+                </xs:choice>
                 <xs:element minOccurs="0" maxOccurs="1" ref="Protocols"/>
                 <xs:element minOccurs="0" maxOccurs="1" ref="Events"/>
                 <xs:element minOccurs="0" maxOccurs="1" ref="Hobs"/>
@@ -145,15 +152,18 @@
                 <xs:element minOccurs="0" maxOccurs="1" ref="BootModes"/>
                 <xs:element minOccurs="0" maxOccurs="1" ref="SystemTables"/>
                 <xs:element minOccurs="0" maxOccurs="1" ref="DataHubs"/>
+                <!-- DO NOT USE! removing Formsets, use HiiPackages instead -->
                 <xs:element minOccurs="0" maxOccurs="1" ref="Formsets"/>
+                <xs:element minOccurs="0" maxOccurs="1" ref="HiiPackages"/>
                 <xs:element minOccurs="0" maxOccurs="1" ref="Guids"/>
                 <xs:element minOccurs="0" maxOccurs="1" ref="Externs"/>
                 <xs:choice minOccurs="0">
-                    <!-- DO NOT USE! removing PCDs, use MsaPcdDeclarations instead -->
+                    <!-- DO NOT USE! removing PCDs, use PcdCoded instead -->
                     <xs:element minOccurs="0" maxOccurs="1" ref="PCDs"/>
-                    <xs:element minOccurs="0" maxOccurs="1" ref="MsaPcdDeclarations"/>
+                    <xs:element minOccurs="0" maxOccurs="1" ref="PcdCoded"/>
                 </xs:choice>
                 <xs:element minOccurs="0" maxOccurs="1" ref="BuildOptions"/>
+                <xs:element minOccurs="0" maxOccurs="unbounded" ref="UserExtensions"/>
             </xs:sequence>
         </xs:complexType>
     </xs:element>
@@ -165,9 +175,12 @@
             <xs:sequence>
                 <xs:element minOccurs="1" maxOccurs="1" ref="SpdHeader"/>
                 <xs:element minOccurs="0" maxOccurs="1" ref="LibraryClassDeclarations"/>
-                <xs:element minOccurs="0" maxOccurs="1" ref="IndustryStdHeaders"/>
+                <xs:element minOccurs="0" maxOccurs="1" ref="IndustryStdIncludes"/>
+                <!-- DO NOT USE removing THIS INSTANCE of PackageDependencies, this is moving to FDP installation process -->
                 <xs:element minOccurs="0" maxOccurs="1" ref="PackageDependencies"/>
+                <!-- DO NOT USE removing MsaFiles, use MsaFileList instead , do not wrap in choice, too many entries to convert all at once. -->
                 <xs:element minOccurs="0" maxOccurs="1" ref="MsaFiles"/>
+                <xs:element minOccurs="0" maxOccurs="1" ref="MsaFileList"/>
                 <xs:element minOccurs="0" maxOccurs="1" ref="PackageHeaders"/>
                 <xs:element minOccurs="0" maxOccurs="1" ref="GuidDeclarations"/>
                 <xs:element minOccurs="0" maxOccurs="1" ref="ProtocolDeclarations"/>
@@ -177,6 +190,7 @@
                     <xs:element minOccurs="0" maxOccurs="1" ref="PcdDefinitions"/>
                     <xs:element minOccurs="0" maxOccurs="1" ref="PcdDeclarations"/>
                 </xs:choice>
+                <xs:element minOccurs="0" maxOccurs="unbounded" ref="UserExtensions"/>
             </xs:sequence>
         </xs:complexType>
     </xs:element>