Updated for EDK II Prime
authorlhauch <lhauch@7335b38e-4728-0410-8992-fb3ffe349368>
Tue, 5 Jun 2007 20:37:53 +0000 (20:37 +0000)
committerlhauch <lhauch@7335b38e-4728-0410-8992-fb3ffe349368>
Tue, 5 Jun 2007 20:37:53 +0000 (20:37 +0000)
git-svn-id: https://buildtools.tianocore.org/svn/buildtools/trunk/BaseTools@101 7335b38e-4728-0410-8992-fb3ffe349368

Conf/XMLSchema/FarManifest.xsd
Conf/XMLSchema/FrameworkDataAttributes.xsd
Conf/XMLSchema/FrameworkDataElements.xsd
Conf/XMLSchema/FrameworkDataTypes.xsd
Conf/XMLSchema/FrameworkHeaders.xsd
Conf/XMLSchema/NamingConvention.xsd
Conf/XMLSchema/SurfaceArea.xsd

index 744ec58..6e75734 100644 (file)
@@ -2,7 +2,7 @@
 <!--\r
 Filename: FarManifest.xsd\r
 \r
-Copyright (c) 2006, Intel Corp.\r
+Copyright (c) 2007, Intel Corp.\r
 All rights reserved. This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which may be found at http://opensource.org/licenses/bsd-license.php\r
@@ -11,7 +11,7 @@ THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
 WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 \r
 -->\r
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" targetNamespace="http://www.TianoCore.org/2006/Edk2.0" xmlns="http://www.TianoCore.org/2006/Edk2.0">\r
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" targetNamespace="http://www.TianoCore.org/2007/Edk2.1" xmlns="http://www.TianoCore.org/2007/Edk2.1">\r
   <xs:include schemaLocation="FrameworkHeaders.xsd"/>  \r
   <xs:annotation>\r
     <xs:documentation xml:lang="en">\r
@@ -34,17 +34,10 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
             </xs:documentation>\r
           </xs:annotation>\r
         </xs:element>\r
-        <xs:element minOccurs="0" maxOccurs="1" ref="FarPlatformList">          \r
-          <xs:annotation>\r
-            <xs:documentation>\r
-              The list of platforms in this FAR.\r
-            </xs:documentation>\r
-          </xs:annotation>\r
-        </xs:element>\r
         <xs:element minOccurs="0" maxOccurs="1" ref="Contents">   \r
           <xs:annotation>\r
             <xs:documentation>\r
-              Extra contents that are not part of any Package or Platform. These file paths are WORKSPACE relative.  If a file exists in the workspace at this location, then the user should be asked whether to overwrite.  When the user removes the far, these should be removed also, unless they have been modified (per md5sum).\r
+              Extra contents that are not part of any Package. These file paths are WORKSPACE relative.  If a file exists in the workspace at this location, then the user should be asked whether to overwrite.  When the user removes the far, these should be removed also, unless they have been modified (per md5sum).\r
             </xs:documentation>\r
           </xs:annotation>\r
         </xs:element>\r
@@ -78,13 +71,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
             </xs:documentation>\r
           </xs:annotation>\r
         </xs:element>\r
-        <xs:element minOccurs="0" maxOccurs="1" ref="FarPlatformList">\r
-          <xs:annotation>\r
-            <xs:documentation>\r
-              This list of platforms is relative to the package root of the package that they are contained in. If the package that these are bound to is intstalled in some directory other than the default, then these platforms should be stored relative to that.\r
-            </xs:documentation>\r
-          </xs:annotation>\r
-        </xs:element>\r
         <xs:element ref="Contents">\r
           <xs:annotation>\r
             <xs:documentation>\r
@@ -96,36 +82,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       </xs:sequence>\r
     </xs:complexType>\r
   </xs:element>\r
-  <xs:element name="FarPlatform">\r
-    <xs:annotation>\r
-      <xs:documentation>\r
-        Platforms are treated separately from packages. A platform is listed in the far if, and only if, it is not part of some package.\r
-      </xs:documentation>\r
-    </xs:annotation>\r
-    <xs:complexType>\r
-      <xs:sequence>\r
-        <xs:element ref="FarFilename">\r
-          <xs:annotation>\r
-            <xs:documentation>\r
-              This is the relative path to the .fpd file that describes the platform.\r
-            </xs:documentation>\r
-          </xs:annotation>\r
-        </xs:element>\r
-        <xs:element ref="GuidValue"></xs:element>\r
-        <xs:element ref="Version"></xs:element>\r
-        <xs:element minOccurs="0" maxOccurs="unbounded" ref="UserExtensions"></xs:element>\r
-      </xs:sequence>\r
-    </xs:complexType>\r
-  </xs:element>\r
   <xs:element name="DefaultPath" type="PathAndFilename"/>\r
-  <xs:element name="FarPlatformList">\r
-    <xs:complexType>\r
-      <xs:sequence>\r
-        <xs:element maxOccurs="unbounded" ref="FarPlatform">\r
-        </xs:element>\r
-      </xs:sequence>\r
-    </xs:complexType>\r
-  </xs:element>\r
   <xs:element name="FarFilename" type="DbPathAndFilename">\r
     <xs:annotation>\r
       <xs:documentation>\r
@@ -165,20 +122,17 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     <xs:documentation>\r
       3.  A far f is said to depend on a package p, iff there is a module m contained in f that depends on p.\r
     </xs:documentation>\r
-    <xs:documentation>\r
-      3.1 A platform q is said to depend on a package p, iff p, or some module m contained in p, is necessary to build q.\r
-    </xs:documentation>\r
     <xs:documentation>\r
       4.  A far f may be installed into the workspace w, iff for each module m in f, m's dependencies are met by the packages in w or f.\r
     </xs:documentation>\r
     <xs:documentation>\r
-      a.  It is supported to "partially" install a far. A partial installation of a far means that 1 or more packages and/or platforms are installed into the workspace from the far. For each package or platform p in f, p's dependencies must be satisfied by a package in the workspace.\r
+      a.  It is supported to "partially" install a far. A partial installation of a far means that 1 or more packages are installed into the workspace from the far. For each package p in f, p's dependencies must be satisfied by a package in the workspace.\r
     </xs:documentation>\r
     <xs:documentation>\r
       5.  A far f may be removed from the workspace w, iff for each module m in w, and for each package p in f, m does not depend on p.\r
     </xs:documentation>\r
     <xs:documentation>\r
-      a.  It is supported to "partially" remove a far. In this case, one or more of the packages or platforms in the far can be removed, provided that for each package and platform p in the workspace w, there does not exist a module m such that m depends on p.\r
+      a.  It is supported to "partially" remove a far. In this case, one or more of the packages in the far can be removed, provided that for each package p in the workspace w, there does not exist a module m such that m depends on p.\r
     </xs:documentation>\r
     <xs:documentation>\r
       6.  When installing a far f into workspace w, for each package p in f, allow the user to install in p's default location, or choose a new location l (which must be unoccupied) within the workspace. Record this location l in the database. Each package p in f will be recorded in the database, associated with the GUID of f, as well as the actual install location l. (So we will know which far each package belongs to.)\r
@@ -199,7 +153,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       10. When a far f is removed from the workspace w, for each package p in f, we will remove p from w.\r
     </xs:documentation>\r
     <xs:documentation>\r
-      11. If a package or platform p belongs to a far f, then it is legal to remove p from the workspace w iff, there does not exist a module m in w such that m depends on p.\r
+      11. If a package p belongs to a far f, then it is legal to remove p from the workspace w iff, there does not exist a module m in w such that m depends on p.\r
     </xs:documentation>\r
     <xs:documentation>\r
       12. When a far f is removed from the workspace, the we will remove all the files in f from the workspace tree. If a file has been modified from the original as installed from the far (per md5sum) then the user should be asked if he is "sure" he wants to remove it.\r
@@ -211,13 +165,10 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       14. If a package p is marked with p->RePackage==false, then p may not be added to a far.\r
     </xs:documentation>\r
     <xs:documentation>\r
-      15. When constructing a far f that contains at least one platform, then f may optionally be constructed such that for each platform q in f, every package p on which q depends should be included in f, unless p->RePackage==false. The far will have all the packages required, and may then be installed as a self-inflating executable that will create a brand new workspace on the developer's workstation.\r
-    </xs:documentation>\r
-    <xs:documentation>\r
-      16. A far f is identical to a far g, iff f->Guid == g->Guid.\r
+      15. A far f is identical to a far g, iff f->Guid == g->Guid.\r
     </xs:documentation>\r
     <xs:documentation>\r
-      17. A far f may be installed into the workspace w, iff there is no far g in w such that f->Guid==g->Guid. In that case, it is called "updating" the far in the workspace. The user may select some subset of packages or platforms to reinstall or update, to ensure that the files in the workspace are correct.\r
+      17. A far f may be installed into the workspace w, iff there is no far g in w such that f->Guid==g->Guid. In that case, it is called "updating" the far in the workspace. The user may select some subset of packages to reinstall or update, to ensure that the files in the workspace are correct.\r
     </xs:documentation>\r
   </xs:annotation>\r
 </xs:schema>\r
index 2f8b8af..d40561e 100644 (file)
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>\r
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" xmlns="http://www.TianoCore.org/2006/Edk2.0" targetNamespace="http://www.TianoCore.org/2006/Edk2.0">\r
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" xmlns="http://www.TianoCore.org/2007/Edk2.1" targetNamespace="http://www.TianoCore.org/2007/Edk2.1">\r
   <!--\r
     Filename: FrameworkDataAttributes.xsd\r
     \r
-    Copyright (c) 2006, Intel Corp.\r
+    Copyright (c) 2007, Intel Corp.\r
     All rights reserved. This program and the accompanying materials\r
     are licensed and made available under the terms and conditions of the BSD License\r
     which may be found at http://opensource.org/licenses/bsd-license.php\r
   </xs:annotation>\r
   <xs:include schemaLocation="NamingConvention.xsd"/>\r
   <xs:include schemaLocation="FrameworkDataTypes.xsd"/>\r
-  <xs:include schemaLocation="FrameworkPlatformDataTypes.xsd"/>\r
   <!-- Fix Name data type from xs:string -->\r
-  <xs:attributeGroup name="BlockAttributes">\r
-    <xs:attribute name="Name" type="BlockNameType" use="required"/>\r
-    <xs:attribute name="Size" type="HexAddressType" use="required"/>\r
-    <xs:attribute name="Flags" type="HexAddressType" use="optional"/>\r
+  <xs:attributeGroup name="BinaryFileAttributes">\r
+    <xs:attribute name="FileType" type="BinFileType" use="required"/>\r
+    <xs:attribute name="SupArchList" type="ArchListType" use="optional"/>\r
+    <xs:attribute name="Target" type="ToolsNameConvention" use="optional"/>\r
+    <xs:attribute name="TagName" type="ToolsNameConvention" use="optional"/>\r
   </xs:attributeGroup>\r
   <xs:attributeGroup name="BootModeAttributes">\r
     <xs:attribute name="BootModeName" type="BootModeNames" use="required"/>\r
     <xs:attribute name="SupArchList" type="ArchListType" use="optional"/>\r
     <xs:attribute name="FeatureFlag" type="FeatureFlagExpressionType" use="optional"/>\r
   </xs:attributeGroup>\r
-  <xs:attributeGroup name="FfsAttributes">\r
-    <xs:attribute name="FfsFormatKeyword" type="KeywordType" use="required"/>\r
-    <xs:attribute name="FfsFileType" type="EfiFfsFileTypes" use="optional"/>\r
-    <xs:attribute name="FfsAttribTailPresent" type="xs:boolean" use="optional"/>\r
-    <xs:attribute name="FfsAttribRecovery" type="xs:boolean" use="optional" default="false"/>\r
-    <xs:attribute name="FfsAttribDataAlignment" type="FfsDataAlignmentType" use="optional"/>\r
-    <xs:attribute name="FfsAttribChecksumRequired" type="xs:boolean" use="optional" default="true"/>\r
-    <xs:attribute name="SupModuleList" type="ModuleListType" use="optional"/>\r
-  </xs:attributeGroup>\r
   <xs:attributeGroup name="FilenameAttributes">\r
     <xs:attribute name="TagName" type="ToolsNameConvention" use="optional"/>\r
     <xs:attribute name="ToolCode" type="ToolsNameConvention" use="optional"/>\r
     <xs:attribute name="SupArchList" type="ArchListType" use="optional"/>\r
     <xs:attribute name="FeatureFlag" type="FeatureFlagExpressionType" use="optional"/>\r
   </xs:attributeGroup>\r
-  <xs:attributeGroup name="FlashDeviceImageAttributes">\r
-    <xs:attribute name="Name" type="xs:string" use="required"/>\r
-  </xs:attributeGroup>\r
-  <xs:attributeGroup name="FlashDeviceImageFileAttributes">\r
-    <xs:attribute name="Name" type="xs:string" use="required"/>\r
-    <xs:attribute name="Region" type="xs:string" use="required"/>\r
-    <xs:attribute name="SubRegion" type="xs:string" use="optional"/>\r
-    <xs:attribute name="Optional" type="xs:boolean" use="optional"/>\r
-  </xs:attributeGroup>\r
-  <xs:attributeGroup name="FlashDeviceInfoAttributes">\r
-    <xs:attribute name="Name" type="xs:string" use="required"/>\r
-    <xs:attribute name="Size" type="HexAddressType" use="required"/>\r
-    <xs:attribute name="BaseAddress" type="HexAddressType" use="required"/>\r
-    <xs:attribute name="ErasePolarity" type="Polarity" use="required"/>\r
-  </xs:attributeGroup>\r
-  <xs:attributeGroup name="FvRegionNameAttributes">\r
-    <xs:attribute name="FvBaseAddressPcdCName" type="C_NameType" use="required"/>\r
-    <xs:attribute name="FvRegionSizePcdCName" type="C_NameType" use="required"/>\r
-    <xs:attribute name="FvRegionAlignmentPcdCName" type="C_NameType" use="optional"/>\r
-    <xs:attribute name="FvPcdTokenSpaceGuid" type="GuidType" use="optional"/>\r
-    <xs:attribute name="Alignment" type="xs:positiveInteger" use="optional"/>\r
-  </xs:attributeGroup>\r
   <xs:attributeGroup name="GuidAttributes">\r
     <xs:attribute name="Usage" type="GuidUsage" use="required"/>\r
     <xs:attribute name="SupArchList" type="ArchListType" use="optional"/>\r
     <xs:attribute name="SupArchList" type="ArchListType" use="optional"/>\r
     <xs:attribute name="SupModuleList" type="ModuleListType" 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="ModuleGuid" type="GuidType" use="required"/>\r
-    <xs:attribute name="ModuleVersion" type="VersionDataType" use="optional"/>\r
-    <xs:attribute name="PackageGuid" type="GuidType" use="required"/>\r
-    <xs:attribute name="PackageVersion" type="VersionDataType" use="optional"/>\r
-  </xs:attributeGroup>\r
   <xs:attributeGroup name="LibraryClassAttributes">\r
     <xs:attribute name="Usage" type="LibraryUsage" use="required"/>\r
     <xs:attribute name="RecommendedInstanceVersion" type="VersionDataType" use="optional"/>\r
     <xs:attribute name="SupArchList" type="ArchListType" use="optional"/>\r
     <xs:attribute name="SupModuleList" type="ModuleListType" use="optional"/>\r
   </xs:attributeGroup>\r
-  <xs:attributeGroup name="MsaGuidAttributes">\r
-    <xs:attribute name="Usage" type="GuidUsage" use="optional"/>\r
-    <xs:attribute name="SupArchList" type="ArchListType" use="optional"/>\r
-    <xs:attribute name="FeatureFlag" type="FeatureFlagExpressionType" use="optional"/>\r
-  </xs:attributeGroup>\r
-  <xs:attributeGroup name="ModuleNameAttributes">\r
-    <xs:attribute name="ModuleGuid" type="GuidType" use="required"/>\r
-    <xs:attribute name="ModuleName" type="UiNameType" use="optional"/>\r
-    <xs:attribute name="ModuleVersion" type="VersionDataType" use="optional"/>\r
-  </xs:attributeGroup>\r
-  <xs:attributeGroup name="MsaAttributes">\r
-    <xs:attribute name="PackageGuid" type="GuidType" use="required"/>\r
-    <xs:attribute name="ModuleGuid" type="GuidType" use="required"/>\r
-    <xs:attribute name="ModuleVersion" type="VersionDataType" use="optional"/>\r
-    <xs:attribute name="PackageVersion" type="VersionDataType" use="optional"/>\r
-    <xs:attribute name="ForceDebug" type="xs:boolean" default="false" use="optional"/>\r
-    <xs:attribute name="BindingOrder" type="xs:int" use="optional"/>\r
-    <xs:attribute name="SupArchList" type="ArchListType" use="optional"/>\r
-  </xs:attributeGroup>\r
   <xs:attributeGroup name="OptionAttributes">\r
     <xs:attribute name="BuildTargets" type="BuildTargetList" use="optional"/>\r
     <xs:attribute name="ToolChainFamily" type="ToolsNameConvention" use="optional"/>\r
   </xs:attributeGroup>\r
   <xs:attributeGroup name="PackageNameAttributes">\r
     <!--Used with the FrameworkDatabase PackageList.Packagename  -->\r
-    <xs:attribute name="PackageGuid" type="GuidType" use="required"/>\r
+    <xs:attribute name="PackageGuid" type="GuidType" use="optional"/>\r
     <xs:attribute name="PackageVersion" type="VersionDataType" use="optional"/>\r
     <xs:attribute name="SupArchList" type="ArchListType" use="optional"/>\r
   </xs:attributeGroup>\r
-  <xs:attributeGroup name="DynamicBuildPcdAttributes">\r
-    <xs:annotation>\r
-      <xs:documentation xml:lang="en">These attributes are for the Pcds listed in PcdData, PcdEntry and/or PcdBuildData entries.</xs:documentation>\r
-    </xs:annotation>\r
-    <xs:attribute name="ItemType" type="PcdItemTypes" use="required"/>\r
-  </xs:attributeGroup>\r
-  <xs:attributeGroup name="PcdBuildDefinitionAttributes">\r
-    <xs:attribute name="ItemType" type="PcdItemTypes" use="required"/>\r
-  </xs:attributeGroup>\r
-  <xs:attributeGroup name="PcdCodedAttributes">\r
+   <xs:attributeGroup name="PcdCodedAttributes">\r
     <!-- We need to modify ALL the MSA files that have PcdCoded sections to \r
       set the PcdUsage.  Once we modify all the MSA files and we modify the \r
       wizard and the build tools, we need to make this required. -->\r
     <xs:attribute name="SupArchList" type="ArchListType" use="optional"/>\r
     <xs:attribute name="SupModuleList" type="ModuleListType" use="optional"/>\r
   </xs:attributeGroup>\r
-  <xs:attributeGroup name="PlatformAttributes">\r
-    <xs:attribute name="PlatformGuid" type="GuidType" use="required"/>\r
-    <xs:attribute name="PlatformVersion" type="VersionDataType" use="required"/>\r
-    <xs:attribute name="SupArchList" type="ArchListType" use="optional"/>\r
-  </xs:attributeGroup>\r
   <xs:attributeGroup name="PpiDeclarationAttributes">\r
     <xs:attribute name="Name" type="UiNameType" use="required"/>\r
     <xs:attribute name="GuidTypeList" type="GuidListType" use="optional"/>\r
     <xs:attribute name="SupArchList" type="ArchListType" use="optional"/>\r
     <xs:attribute name="FeatureFlag" type="FeatureFlagExpressionType" use="optional"/>\r
   </xs:attributeGroup>\r
-  <xs:attributeGroup name="ProcessStepAttributes">\r
-    <xs:annotation>\r
-      <xs:documentation xml:lang="en">Attributes are either compressable and/or sequence order binding</xs:documentation>\r
-    </xs:annotation>\r
-    <xs:attribute name="BindingOrder" type="xs:int" use="optional"/>\r
-    <xs:attribute name="SectionType" type="EfiSectionType" use="optional"/>\r
-  </xs:attributeGroup>\r
   <xs:attributeGroup name="ProtocolAttributes">\r
     <xs:attribute name="Usage" type="ProtocolUsage" use="required"/>\r
     <xs:attribute name="SupArchList" type="ArchListType" use="optional"/>\r
     <xs:attribute name="SupArchList" type="ArchListType" use="optional"/>\r
     <xs:attribute name="FeatureFlag" type="FeatureFlagExpressionType" use="optional"/>\r
   </xs:attributeGroup>\r
-  <xs:attributeGroup name="RawDataAttributes">\r
-    <xs:attribute name="Name" type="xs:string" use="required"/>\r
-    <xs:attribute name="Region" type="xs:string" use="required"/>\r
-    <xs:attribute name="SubRegion" type="xs:string" use="required"/>\r
-  </xs:attributeGroup>\r
-  <xs:attributeGroup name="RegionAttributes">\r
-    <xs:attribute name="Name" type="xs:string" use="required"/>\r
-    <xs:attribute name="Size" type="HexAddressType" use="required"/>\r
-    <xs:attribute name="Flags" type="HexAddressType" use="optional"/>\r
-    <xs:attribute name="Attributes" type="xs:string" use="required"/>\r
-    <xs:attribute name="AreaType" type="EfiFvAreaType" use="required"/>\r
-    <xs:attribute name="Alignment" type="HexAddressType" use="optional"/>\r
-  </xs:attributeGroup>\r
-  <xs:attributeGroup name="SectionsAttributes">\r
-    <xs:annotation>\r
-      <xs:documentation xml:lang="en">Attributes for Sections, EncapsulationTag and EncapsulationType</xs:documentation>\r
-    </xs:annotation>\r
-    <xs:attribute name="BindingOrder" type="xs:nonNegativeInteger" use="optional"/>\r
-    <xs:attribute name="Compressible" type="xs:boolean" default="true" use="optional"/>\r
-    <xs:attribute name="SectionType" type="EfiSectionType" use="optional"/>\r
-    <xs:attribute name="EncapsulationType" type="xs:normalizedString" use="optional"/>\r
-    <xs:attribute name="Alignment" type="xs:string" use="optional"/>\r
-    <xs:attribute name="ToolName" type="xs:string" use="optional"/>\r
-    <xs:attribute name="SupArchList" type="ArchListType" use="optional"/>\r
-    <xs:attribute name="FeatureFlag" type="FeatureFlagExpressionType" use="optional"/>\r
-  </xs:attributeGroup>\r
-  <xs:attributeGroup name="SubRegionAttributes">\r
-    <xs:attribute name="CreateHob" type="xs:boolean" use="required"/>\r
-    <xs:attribute name="Name" type="xs:string" use="required"/>\r
-    <xs:attribute name="Size" type="HexAddressType" use="required"/>\r
-    <xs:attribute name="Attributes" type="xs:string" use="required"/>\r
-    <xs:attribute name="AreaType" type="EfiFvAreaType" use="required"/>\r
-    <xs:attribute name="NameGuid" type="xs:string" use="required"/>\r
-    <xs:attribute name="AreaTypeGuid" type="xs:string" use="optional"/>\r
-    <xs:attribute name="FileSystemGuid" type="xs:string" use="optional"/>\r
-  </xs:attributeGroup>\r
   <xs:attributeGroup name="SystemTableAttributes">\r
     <xs:attribute name="Usage" type="SystemTableUsage" use="required"/>\r
     <xs:attribute name="SupArchList" type="ArchListType" use="optional"/>\r
     <xs:attribute name="FeatureFlag" type="FeatureFlagExpressionType" use="optional"/>\r
   </xs:attributeGroup>\r
-  <xs:attributeGroup name="UrlAttribute">\r
-    <xs:attribute name="Url" type="xs:anyURI"/>\r
-  </xs:attributeGroup>\r
   <xs:attributeGroup name="VariableAttributes">\r
     <xs:attribute name="Usage" type="VariableUsage" use="required"/>\r
     <xs:attribute name="SupArchList" type="ArchListType" use="optional"/>\r
index 9770208..56608d9 100644 (file)
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>\r
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" xmlns="http://www.TianoCore.org/2006/Edk2.0" targetNamespace="http://www.TianoCore.org/2006/Edk2.0">\r
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" xmlns="http://www.TianoCore.org/2007/Edk2.1" targetNamespace="http://www.TianoCore.org/2007/Edk2.1">\r
   <!--\r
     Filename: FrameworkDataElements.xsd\r
     \r
-    Copyright (c) 2006, Intel Corp.\r
+    Copyright (c) 2007, Intel Corp.\r
     All rights reserved. This program and the accompanying materials\r
     are licensed and made available under the terms and conditions of the BSD License\r
     which may be found at http://opensource.org/licenses/bsd-license.php\r
   </xs:annotation>\r
   <xs:include schemaLocation="NamingConvention.xsd"/>\r
   <xs:include schemaLocation="FrameworkDataTypes.xsd"/>\r
-  <xs:include schemaLocation="FrameworkPlatformDataTypes.xsd"/>\r
-  <xs:include schemaLocation="FrameworkDataAttributes.xsd"/>\r
+    <xs:include schemaLocation="FrameworkDataAttributes.xsd"/>\r
   <xs:element name="Abstract" type="Sentence">\r
     <xs:annotation>\r
       <xs:documentation xml:lang="en">Abstract is valid for all Description Files</xs:documentation>\r
       <xs:documentation xml:lang="en">This section is required. This is a single sentence to describe the module and will be used in sample files as the abstract data in the header comment section.</xs:documentation>\r
     </xs:annotation>\r
   </xs:element>\r
-  <xs:element name="AntTask">\r
-    <xs:annotation>\r
-      <xs:documentation xml:lang="en">This is a sub-element of UserDefinedAntTasks</xs:documentation>\r
-      <xs:documentation xml:lang="en">Define a file that contains one or more ant tasks that are to be added into or replacing of sequences of build steps. These files will be called using the ant-call task on a file name. These files must be valid apache-ant formatted task files.</xs:documentation>\r
-    </xs:annotation>\r
-    <xs:complexType>\r
-      <xs:sequence>\r
-        <xs:element minOccurs="0" maxOccurs="1" name="AntCmdOptions" type="xs:normalizedString"/>\r
-        <xs:element minOccurs="0" maxOccurs="1" name="Filename" type="PathAndFilename"/>\r
-      </xs:sequence>\r
-      <xs:attribute name="Id" type="xs:int" use="required"/>\r
-    </xs:complexType>\r
-  </xs:element>\r
   <xs:element name="BootModes">\r
     <xs:annotation>\r
       <xs:documentation xml:lang="en">BootModes is valid for all Description Files</xs:documentation>\r
       </xs:sequence>\r
     </xs:complexType>\r
   </xs:element>\r
-  <xs:element name="BuildOptions">\r
-    <xs:annotation>\r
-      <xs:documentation xml:lang="en">BuildOptions is valid for FPD files.</xs:documentation>\r
-    </xs:annotation>\r
-    <xs:complexType>\r
-      <xs:sequence>\r
-        <xs:element minOccurs="0" maxOccurs="1" ref="UserDefinedAntTasks"/>\r
-        <xs:element minOccurs="0" maxOccurs="1" ref="Options"/>\r
-        <xs:element minOccurs="0" maxOccurs="unbounded" ref="UserExtensions"/>\r
-        <!-- The following sections are legacy and will be removed -->\r
-        <xs:element minOccurs="0" maxOccurs="unbounded" name="Ffs">\r
-          <xs:complexType>\r
-            <xs:sequence>\r
-              <xs:element minOccurs="0" maxOccurs="unbounded" name="Attribute">\r
-                <xs:complexType>\r
-                  <xs:attribute name="Name" type="C_NameType"/>\r
-                  <xs:attribute name="Value" type="xs:string"/>\r
-                </xs:complexType>\r
-              </xs:element>\r
-              <xs:element minOccurs="0" maxOccurs="1" name="Sections">\r
-                <xs:complexType>\r
-                  <xs:sequence minOccurs="1">\r
-                    <xs:element name="Section" minOccurs="0" maxOccurs="unbounded">\r
-                      <xs:complexType>\r
-                        <xs:sequence>\r
-                          <xs:element ref=" Filenames " minOccurs="0"/>\r
-                          <xs:element name="Args" type=" ArgsType " minOccurs="0"/>\r
-                          <xs:element name="OutFile" type=" FileNameConvention " minOccurs="0"/>\r
-                          <xs:element name="OutputFileExtension" type=" xs:string " minOccurs="0"/>\r
-                          <xs:element name="ToolName" type=" ToolType " minOccurs="0"/>\r
-                        </xs:sequence>\r
-                        <xs:attributeGroup ref=" SectionsAttributes "/>\r
-                      </xs:complexType>\r
-                    </xs:element>\r
-                    <xs:element name="Sections" minOccurs="0" maxOccurs="unbounded">\r
-                      <xs:complexType>\r
-                        <xs:sequence minOccurs="1" maxOccurs="unbounded">\r
-                          <xs:element name="Section">\r
-                            <xs:complexType>\r
-                              <xs:sequence>\r
-                                <xs:element ref=" Filenames " minOccurs="0"/>\r
-                                <xs:element name="Args" type=" ArgsType " minOccurs="0"/>\r
-                                <xs:element name="OutFile" type=" FileNameConvention " minOccurs="0"/>\r
-                                <xs:element name="OutputFileExtension" type=" xs:string " minOccurs="0"/>\r
-                                <xs:element name="ToolName" type=" ToolType " minOccurs="0"/>\r
-                              </xs:sequence>\r
-                              <xs:attributeGroup ref="SectionsAttributes"/>\r
-                            </xs:complexType>\r
-                          </xs:element>\r
-                        </xs:sequence>\r
-                        <xs:attributeGroup ref=" SectionsAttributes "/>\r
-                      </xs:complexType>\r
-                    </xs:element>\r
-                  </xs:sequence>\r
-                  <xs:attributeGroup ref=" SectionsAttributes "/>\r
-                </xs:complexType>\r
-              </xs:element>\r
-            </xs:sequence>\r
-            <xs:attribute name="FfsKey" type="KeywordType" use="optional"/>\r
-          </xs:complexType>\r
-        </xs:element>\r
-      </xs:sequence>\r
-    </xs:complexType>\r
-  </xs:element>\r
-  <xs:element name="Copyright" type="Paragraph"/>\r
+   <xs:element name="Copyright" type="Paragraph"/>\r
   <xs:element name="DataHubs">\r
     <xs:annotation>\r
       <xs:documentation xml:lang="en">This is a list of DataHubRecord elements.</xs:documentation>\r
       <xs:documentation xml:lang="en">This section is required for new modules and libraries and must contain more information than the Abstract.</xs:documentation>\r
     </xs:annotation>\r
   </xs:element>\r
-  <xs:element name="DynamicPcdBuildDefinitions">\r
+  <xs:element name="BinaryFiles">\r
     <xs:annotation>\r
-      <xs:documentation xml:lang="en">Child of Framework Platform Description (FPD)</xs:documentation>\r
-      <xs:documentation xml:lang="en">FPD uses this PCD information for Dynamic PCDs Only</xs:documentation>\r
+      <xs:documentation xml:lang="en">Multiple Filenames may be specified, and they may also be scoped to a specific Architecture.</xs:documentation>\r
     </xs:annotation>\r
     <xs:complexType>\r
       <xs:sequence>\r
-        <xs:element minOccurs="1" maxOccurs="unbounded" name="PcdBuildData">\r
+        <xs:element minOccurs="0" maxOccurs="1" name="HelpText" type="Paragraph"/>\r
+        <xs:element minOccurs="1" maxOccurs="unbounded" name="Filename">\r
           <xs:complexType>\r
-            <xs:sequence>\r
-              <xs:element minOccurs="1" maxOccurs="1" name="C_Name" type="C_NameType"/>\r
-              <xs:element minOccurs="1" maxOccurs="1" name="Token" type="TokenDataType"/>\r
-              <xs:element minOccurs="1" maxOccurs="1" name="TokenSpaceGuidCName" type="C_NameType"/>\r
-              <xs:element minOccurs="1" maxOccurs="1" name="DatumType" type="PcdDataTypes"/>\r
-              <xs:element minOccurs="0" maxOccurs="1" name="MaxDatumSize" type="DatumSizeLimitation"/>\r
-              <xs:element minOccurs="1" maxOccurs="unbounded" name="SkuInfo">\r
-                <xs:complexType>\r
-                  <xs:sequence>\r
-                    <xs:element minOccurs="1" maxOccurs="1" name="SkuId" type="xs:nonNegativeInteger"/>\r
-                    <xs:choice>\r
-                      <xs:group minOccurs="0" maxOccurs="1" ref="HiiEnable"/>\r
-                      <xs:group minOccurs="0" maxOccurs="1" ref="VpdEnable"/>\r
-                      <xs:group minOccurs="0" maxOccurs="1" ref="DefaultGroup"/>\r
-                    </xs:choice>\r
-                  </xs:sequence>\r
-                </xs:complexType>\r
-              </xs:element>\r
-            </xs:sequence>\r
-            <xs:attributeGroup ref="DynamicBuildPcdAttributes"/>\r
+            <xs:simpleContent>\r
+              <xs:extension base="PathAndFilename"> \r
+                <xs:attributeGroup ref="BinaryFileAttributes"/>\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="Events">\r
+   <xs:element name="Events">\r
     <xs:annotation>\r
       <xs:documentation xml:lang="en">This is a list of MSA Events</xs:documentation>\r
     </xs:annotation>\r
       <xs:attributeGroup ref="IndustryStdHeaderAttributes"/>\r
     </xs:complexType>\r
   </xs:element>\r
-  <xs:element name="Libraries">\r
-    <xs:annotation>\r
-      <xs:documentation xml:lang="en">Different (Module) Instances of Libraries used ONLY in FPD Files.</xs:documentation>\r
-    </xs:annotation>\r
-    <xs:complexType>\r
-      <xs:sequence>\r
-        <xs:element minOccurs="1" maxOccurs="unbounded" name="Instance">\r
-          <xs:complexType>\r
-            <xs:attributeGroup ref="LibraryAttributes"/>\r
-          </xs:complexType>\r
-        </xs:element>\r
-      </xs:sequence>\r
-    </xs:complexType>\r
-  </xs:element>\r
   <xs:element name="LibraryClass">\r
     <xs:annotation>\r
       <xs:documentation xml:lang="en">Used in MSA files. This defines what class of library is being supported = produced (library module) or consumed by a module.</xs:documentation>\r
       </xs:sequence>\r
     </xs:complexType>\r
   </xs:element>\r
-  <xs:element name="ModuleSaBuildOptions">\r
-    <xs:complexType>\r
-      <xs:sequence>\r
-        <xs:element minOccurs="0" maxOccurs="1" name="FvBinding" type="KeywordList"/>\r
-        <!-- The FfsFileNameGuid allows the Platform Integrator to specify a GUID for the FFS File Name GUID -->\r
-        <xs:element minOccurs="0" maxOccurs="1" name="FfsFileNameGuid" type="GuidType"/>\r
-        <!-- If binding is specified, you MUST specify the FfsFormatKey -->\r
-        <xs:element minOccurs="0" maxOccurs="1" name="FfsFormatKey" type="KeywordType"/>\r
-        <xs:element minOccurs="0" maxOccurs="1" ref="Options"/>\r
-      </xs:sequence>\r
-    </xs:complexType>\r
-  </xs:element>\r
   <xs:element name="ModuleDefinitions">\r
     <xs:complexType>\r
       <xs:sequence>\r
     </xs:annotation>\r
     <xs:complexType>\r
       <xs:sequence>\r
-        <xs:element minOccurs="1" maxOccurs="unbounded" name="Filename" type="DbPathAndFilename"/>\r
-      </xs:sequence>\r
-    </xs:complexType>\r
-  </xs:element>\r
-  <!-- PcdBuildDefinition is a child of FPD ModuleSA element for FIXED_AT_BUILD, PATCHABLE_IN_MODULE, and FEATURE_FLAG PCDS Only! -->\r
-  <xs:element name="PcdBuildDefinition">\r
-    <xs:annotation>\r
-      <xs:documentation xml:lang="en">Child of FPD ModuleSA element for FIXED_AT_BUILD, PATCHABLE_IN_MODULE, and FEATURE_FLAG PCDS Only!</xs:documentation>\r
-    </xs:annotation>\r
-    <xs:complexType>\r
-      <xs:sequence>\r
-        <xs:element minOccurs="1" maxOccurs="unbounded" name="PcdData">\r
+        <xs:element minOccurs="1" maxOccurs="unbounded" name="Filename">\r
           <xs:complexType>\r
-            <xs:sequence>\r
-              <xs:element minOccurs="1" maxOccurs="1" name="C_Name" type="C_NameType"/>\r
-              <xs:element minOccurs="1" maxOccurs="1" name="Token" type="TokenDataType"/>\r
-              <xs:element minOccurs="1" maxOccurs="1" name="TokenSpaceGuidCName" type="C_NameType"/>\r
-              <xs:element minOccurs="1" maxOccurs="1" name="DatumType" type="PcdDataTypes"/>\r
-              <!-- MaxDatumSize is only required if the DatumType is VOID* -->\r
-              <xs:element minOccurs="0" maxOccurs="1" name="MaxDatumSize" type="DatumSizeLimitation"/>\r
-              <xs:element minOccurs="0" maxOccurs="1" name="Value" type="DefaultValueType"/>\r
-            </xs:sequence>\r
-            <xs:attributeGroup ref="PcdBuildDefinitionAttributes"/>\r
+            <xs:simpleContent>\r
+              <xs:extension base="PathAndFilename"> \r
+                <xs:attributeGroup ref="PackageNameAttributes"/>\r
+              </xs:extension>\r
+            </xs:simpleContent>\r
           </xs:complexType>\r
-        </xs:element>\r
+          </xs:element>\r
       </xs:sequence>\r
     </xs:complexType>\r
   </xs:element>\r
-  <xs:group name="DefaultGroup">\r
-    <xs:sequence>\r
-      <xs:element minOccurs="1" maxOccurs="1" name="Value" type="DefaultValueType"/>\r
-    </xs:sequence>\r
-  </xs:group>\r
-  <xs:group name="HiiEnable">\r
-    <xs:annotation>\r
-      <xs:documentation xml:lang="en">If HiiEnable group is specified, then HiiEnable is default true</xs:documentation>\r
-    </xs:annotation>\r
-    <xs:sequence>\r
-      <xs:element minOccurs="1" maxOccurs="1" name="VariableName" type="HexWordArrayType"/>\r
-      <xs:element minOccurs="1" maxOccurs="1" name="VariableGuid" type="C_NameType"/>\r
-      <xs:element minOccurs="1" maxOccurs="1" name="VariableOffset" type="Hex64BitDataType"/>\r
-      <xs:element minOccurs="1" maxOccurs="1" name="HiiDefaultValue" type="DefaultValueType"/>\r
-    </xs:sequence>\r
-  </xs:group>\r
-  <xs:group name="VpdEnable">\r
-    <xs:annotation>\r
-      <xs:documentation xml:lang="en">If VpdEnable group is specified, then VpdEnable is default true</xs:documentation>\r
-    </xs:annotation>\r
-    <xs:sequence>\r
-      <xs:element minOccurs="1" maxOccurs="1" name="VpdOffset" type="Hex64BitDataType"/>\r
-    </xs:sequence>\r
-  </xs:group>\r
   <xs:element name="PcdCoded">\r
     <xs:annotation>\r
       <xs:documentation xml:lang="en">Child of Module Surface Area Description (MSA)</xs:documentation>\r
       </xs:sequence>\r
     </xs:complexType>\r
   </xs:element>\r
-  <xs:element name="FfsFormatDeclarations">\r
-    <xs:complexType>\r
-      <xs:sequence>\r
-        <xs:element minOccurs="1" maxOccurs="unbounded" name="FfsFormatDeclaration">\r
-          <!-- Required Attributes are the FfsFormatKeyword and SupModuleList -->\r
-          <xs:complexType>\r
-            <xs:sequence>\r
-              <xs:element minOccurs="1" maxOccurs="unbounded" ref="ProcessStep"/>\r
-            </xs:sequence>\r
-            <xs:attributeGroup ref="FfsAttributes"/>\r
-          </xs:complexType>\r
-        </xs:element>\r
-      </xs:sequence>\r
-    </xs:complexType>\r
-  </xs:element>\r
   <xs:element name="PpiDeclarations">\r
     <xs:annotation>\r
       <xs:documentation xml:lang="en">PpiDeclarations is a child of PackageSurfaceArea (SPD) </xs:documentation>\r
       </xs:sequence>\r
     </xs:complexType>\r
   </xs:element>\r
-  <xs:element name="ProcessStep">\r
-    <xs:complexType>\r
-      <xs:sequence>\r
-        <!-- The following is a macro for Apache ANT -->\r
-        <xs:element minOccurs="0" maxOccurs="1" name="MacroDefFile">\r
-          <xs:complexType>\r
-            <xs:simpleContent>\r
-              <xs:extension base="PathAndFilename">\r
-                <xs:attribute name="MacroName" type="KeywordType" use="required"/>\r
-              </xs:extension>\r
-            </xs:simpleContent>\r
-          </xs:complexType>\r
-        </xs:element>\r
-        <!-- The following is for System Executables -->\r
-        <xs:element minOccurs="0" maxOccurs="1" name="ToolName" type="xs:NCName"/>\r
-        <xs:element minOccurs="0" maxOccurs="unbounded" name="ToolArgs" type="xs:normalizedString"/>\r
-        <xs:element minOccurs="0" maxOccurs="unbounded" name="InputPattern" type="xs:normalizedString"/>\r
-        <xs:element minOccurs="0" maxOccurs="1" name="OutputPattern" type="xs:normalizedString"/>\r
-      </xs:sequence>\r
-      <xs:attributeGroup ref="ProcessStepAttributes"/>\r
-    </xs:complexType>\r
-  </xs:element>\r
   <xs:element name="SourceFiles">\r
     <xs:annotation>\r
       <xs:documentation xml:lang="en">Multiple Filenames may be specified, and they may also be scoped to a specific Architecture.</xs:documentation>\r
       </xs:sequence>\r
     </xs:complexType>\r
   </xs:element>\r
-  <xs:element name="SkuInfo">\r
-    <xs:complexType>\r
-      <xs:sequence>\r
-        <xs:element minOccurs="1" maxOccurs="unbounded" 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="SystemTables">\r
     <xs:annotation>\r
       <xs:documentation xml:lang="en">This is list of System Table elements.</xs:documentation>\r
       </xs:sequence>\r
     </xs:complexType>\r
   </xs:element>\r
-  <xs:element name="UserDefinedAntTasks">\r
-    <xs:annotation>\r
-      <xs:documentation xml:lang="en">This is a sub-element of BuildOptions</xs:documentation>\r
-      <xs:documentation xml:lang="en">Permit Users to define their own custom ANT tasks.</xs:documentation>\r
-    </xs:annotation>\r
-    <xs:complexType>\r
-      <xs:sequence>\r
-        <xs:element minOccurs="1" maxOccurs="unbounded" ref="AntTask"/>\r
-      </xs:sequence>\r
-    </xs:complexType>\r
-  </xs:element>\r
   <xs:element name="UserExtensions">\r
     <xs:complexType>\r
       <xs:sequence>\r
index c2074ff..18db608 100644 (file)
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>\r
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" xmlns="http://www.TianoCore.org/2006/Edk2.0" targetNamespace="http://www.TianoCore.org/2006/Edk2.0">\r
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" xmlns="http://www.TianoCore.org/2007/Edk2.1" targetNamespace="http://www.TianoCore.org/2007/Edk2.1">\r
   <!--\r
     Filename: FrameworkDataTypes.xsd\r
     \r
-    Copyright (c) 2006, Intel Corp.\r
+    Copyright (c) 2007, Intel Corp.\r
     All rights reserved. This program and the accompanying materials\r
     are licensed and made available under the terms and conditions of the BSD License\r
     which may be found at http://opensource.org/licenses/bsd-license.php\r
       <xs:minLength value="1"/>\r
     </xs:restriction>\r
   </xs:simpleType>\r
+  <xs:simpleType name="BinFileType">\r
+    <xs:restriction base="xs:NCName">\r
+      <xs:enumeration value="LIB"/>\r
+      <xs:enumeration value="UNI_UI"/>\r
+      <xs:enumeration value="UNI_VER"/>\r
+      <xs:enumeration value="PE32"/>\r
+      <xs:enumeration value="FW"/>\r
+      <xs:enumeration value="GUID"/>\r
+      <xs:enumeration value="FREEFORM"/>\r
+      <xs:enumeration value="UEFI_APP"/>\r
+      <xs:enumeration value="PIC"/>\r
+      <xs:enumeration value="PEI_DEPEX"/>\r
+      <xs:enumeration value="DXE_DEPEX"/>\r
+      <xs:enumeration value="TE"/>\r
+      <xs:enumeration value="VER"/>\r
+      <xs:enumeration value="UI"/>\r
+      <xs:enumeration value="BIN"/>\r
+      <xs:enumeration value="FV"/>\r
+    </xs:restriction>\r
+  </xs:simpleType>\r
   <xs:simpleType name="BlockNameType">\r
     <xs:restriction base="UCNameType">\r
       <xs:pattern value="\s*BLOCK[A-F0-9]{2}\s*"/>\r
index cee80f2..6927c7b 100644 (file)
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>\r
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" targetNamespace="http://www.TianoCore.org/2006/Edk2.0" xmlns="http://www.TianoCore.org/2006/Edk2.0">\r
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" targetNamespace="http://www.TianoCore.org/2007/Edk2.1" xmlns="http://www.TianoCore.org/2007/Edk2.1">\r
   <!--\r
     Filename: FrameworkHeaders.xsd\r
     \r
-    Copyright (c) 2006, Intel Corp.\r
+    Copyright (c) 2007, Intel Corp.\r
 \r
     All rights reserved. This program and the accompanying materials\r
     are licensed and made available under the terms and conditions of the BSD License\r
@@ -12,7 +12,7 @@
     THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
     WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
     \r
-    APPROVED: 14-Jun-2006\r
+    APPROVED: 05-Jun-2007\r
   -->\r
   <xs:include schemaLocation="FrameworkDataElements.xsd"/>\r
   <xs:element name="FdbHeader">\r
     <xs:complexType>\r
       <xs:sequence>\r
         <xs:element minOccurs="1" maxOccurs="1" name="DatabaseName" type="UiNameType" fixed="FrameworkDatabase"/>\r
-        <xs:element minOccurs="1" maxOccurs="1" name="GuidValue" type="GuidType"/>\r
+        <xs:element minOccurs="1" maxOccurs="1" name="GuidValue" type="GuidType" default="DD6913E0-3E4E-4B83-8838-57EE7FB71DD1"/>\r
         <xs:element minOccurs="1" maxOccurs="1" ref="Version"/>\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:element minOccurs="1" maxOccurs="1" name="Specification" type="Sentence" default="FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00000052"/>\r
+        <xs:element minOccurs="1" maxOccurs="1" name="Specification" type="Sentence" default="FRAMEWORK_PACKAGING_SPECIFICATION   0x00090000"/>\r
       </xs:sequence>\r
     </xs:complexType>\r
   </xs:element>\r
@@ -47,7 +47,7 @@
         <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:element minOccurs="1" maxOccurs="1" name="Specification" type="Sentence" default="FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00000052"/>\r
+        <xs:element minOccurs="1" maxOccurs="1" name="Specification" type="Sentence" default="FRAMEWORK_PACKAGING_SPECIFICATION   0x00090000"/>\r
       </xs:sequence>\r
     </xs:complexType>\r
   </xs:element>\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:element minOccurs="1" maxOccurs="1" name="Specification" type="Sentence" default="FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00000052"/>\r
-      </xs:sequence>\r
-    </xs:complexType>\r
-  </xs:element>\r
-  <xs:element name="PlatformHeader">\r
-    <xs:annotation>\r
-      <xs:documentation xml:lang="en">This header is for the Framework Platform Description (FPD) files.</xs:documentation>\r
-      <xs:documentation xml:lang="en">The Guid MUST change if the FPD changes break backward compatibility.</xs:documentation>\r
-      <xs:documentation xml:lang="en">The Version MUST change if the FPD changes, however, backward compatiblity is maintained.</xs:documentation>\r
-    </xs:annotation>\r
-    <xs:complexType>\r
-      <xs:sequence>\r
-        <xs:element minOccurs="1" maxOccurs="1" name="PlatformName" type="UiNameType"/>\r
-        <xs:element minOccurs="1" maxOccurs="1" name="GuidValue" type="GuidType"/>\r
-        <xs:element minOccurs="1" maxOccurs="1" ref="Version"/>\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:element minOccurs="1" maxOccurs="1" name="Specification" type="Sentence" default="FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00000052"/>\r
+        <xs:element minOccurs="1" maxOccurs="1" name="Specification" type="Sentence" default="FRAMEWORK_PACKAGING_SPECIFICATION   0x00090000"/>\r
       </xs:sequence>\r
     </xs:complexType>\r
   </xs:element>\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:element minOccurs="1" maxOccurs="1" name="Specification" type="Sentence" default="FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00000052"/>\r
+        <xs:element minOccurs="1" maxOccurs="1" name="Specification" type="Sentence" default="FRAMEWORK_PACKAGING_SPECIFICATION   0x00090000"/>\r
       </xs:sequence>\r
     </xs:complexType>\r
   </xs:element>\r
index 978a365..809f1a8 100644 (file)
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>\r
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" targetNamespace="http://www.TianoCore.org/2006/Edk2.0" xmlns="http://www.TianoCore.org/2006/Edk2.0">\r
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" targetNamespace="http://www.TianoCore.org/2007/Edk2.1" xmlns="http://www.TianoCore.org/2007/Edk2.1">\r
   <!--\r
     Filename: NamingConvention.xsd\r
     \r
-    Copyright (c) 2006, Intel Corp.\r
+    Copyright (c) 2007, Intel Corp.\r
     All rights reserved. This program and the accompanying materials\r
     are licensed and made available under the terms and conditions of the BSD License\r
     which may be found at http://opensource.org/licenses/bsd-license.php\r
index d79e574..e0c95e0 100644 (file)
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>\r
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" targetNamespace="http://www.TianoCore.org/2006/Edk2.0" xmlns="http://www.TianoCore.org/2006/Edk2.0">\r
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" targetNamespace="http://www.TianoCore.org/2007/Edk2.1" xmlns="http://www.TianoCore.org/2007/Edk2.1">\r
   <!--\r
     Filename: SurfaceArea.xsd\r
     \r
-    Copyright (c) 2006, Intel Corp.\r
+    Copyright (c) 2007, Intel Corp.\r
     All rights reserved. This program and the accompanying materials\r
     are licensed and made available under the terms and conditions of the BSD License\r
     which may be found at http://opensource.org/licenses/bsd-license.php\r
     THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
     WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
     \r
-    APPROVED: 14-Jun-2006\r
+    APPROVED: 05-Jun-2007\r
   -->\r
   <xs:include schemaLocation="FrameworkHeaders.xsd"/>\r
   <xs:include schemaLocation="FrameworkDataElements.xsd"/>\r
-  <xs:include schemaLocation="FrameworkPlatformDataElements.xsd"/>\r
   <xs:annotation>\r
     <xs:documentation xml:lang="en">This describes the valid content of a FrameworkDatabase (DB) File.</xs:documentation>\r
   </xs:annotation>\r
       <xs:sequence>\r
         <xs:element minOccurs="1" maxOccurs="1" ref="FdbHeader"/>\r
         <xs:element minOccurs="1" maxOccurs="1" ref="PackageList"/>\r
-        <xs:element minOccurs="0" maxOccurs="1" ref="PlatformList"/>\r
         <xs:element minOccurs="0" maxOccurs="1" ref="FarList"/>\r
         <xs:element minOccurs="0" maxOccurs="unbounded" ref="UserExtensions"/>\r
       </xs:sequence>\r
     </xs:complexType>\r
   </xs:element>\r
-  <xs:annotation>\r
-    <xs:documentation xml:lang="en">This describes the valid content of a Framework Platform Description (FPD) File.</xs:documentation>\r
-  </xs:annotation>\r
-  <xs:element name="PlatformSurfaceArea">\r
-    <xs:complexType>\r
-      <xs:sequence>\r
-        <xs:element minOccurs="1" maxOccurs="1" ref="PlatformHeader"/>\r
-        <!-- This section will be for new definitions of how we put together the Framework Binary Images -->\r
-        <xs:element minOccurs="0" maxOccurs="1" ref="PlatformDefinitions"/>\r
-        <!-- The Flash section is the legacy implementation of Flash -->\r
-        <xs:element minOccurs="0" maxOccurs="1" ref="Flash"/>\r
-        <xs:element minOccurs="0" maxOccurs="1" ref="FrameworkModules"/>\r
-        <xs:element minOccurs="0" maxOccurs="1" ref="DynamicPcdBuildDefinitions"/>\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
   <xs:annotation>\r
     <xs:documentation xml:lang="en">This describes the valid content for a Module Surface Area Description (MSA) file.</xs:documentation>\r
   </xs:annotation>\r
@@ -58,6 +38,7 @@
         <xs:element minOccurs="1" maxOccurs="1" ref="ModuleDefinitions"/>\r
         <xs:element minOccurs="0" maxOccurs="1" ref="LibraryClassDefinitions"/>\r
         <xs:element minOccurs="0" maxOccurs="1" ref="SourceFiles"/>\r
+        <xs:element minOccurs="0" maxOccurs="1" ref="BinaryFiles"/>\r
         <xs:element minOccurs="0" maxOccurs="1" ref="NonProcessedFiles"/>\r
         <xs:element minOccurs="0" maxOccurs="1" ref="PackageDependencies"/>\r
         <xs:element minOccurs="0" maxOccurs="1" ref="Protocols"/>\r
       </xs:sequence>\r
     </xs:complexType>\r
   </xs:element>\r
-  <!-- This element is listed here, only because we are using elements from both the FrameworkDataElements and FrameworkPlatformDataElements files. -->\r
-  <xs:element name="PlatformDefinitions">\r
-    <xs:complexType>\r
-      <xs:sequence>\r
-        <!-- This is the list of ALL architectures that are supported by this Platform -->\r
-        <xs:element minOccurs="1" maxOccurs="1" name="SupportedArchitectures" type="ArchListType"/>\r
-        <xs:element minOccurs="1" maxOccurs="1" name="BuildTargets" type="BuildTargetList"/>\r
-        <xs:element default="UNIFIED" name="IntermediateDirectories" type="IntermediateOutputType"/>\r
-        <xs:element minOccurs="0" maxOccurs="1" name="OutputDirectory" type="xs:anyURI"/>\r
-        <xs:element minOccurs="0" maxOccurs="1" name="ForceDebugTarget" type="KeywordType"/>\r
-        <!-- SkuInfo is only defined if Sku enabled -->\r
-        <xs:element minOccurs="0" maxOccurs="1" ref="SkuInfo"/>\r
-        <xs:element minOccurs="0" maxOccurs="1" ref="FlashDeviceDefinitions"/>\r
-        <xs:element minOccurs="0" maxOccurs="1" ref="FfsFormatDeclarations"/>\r
-        <xs:element minOccurs="0" maxOccurs="1" name="ClonedFrom">\r
-          <xs:complexType>\r
-            <xs:sequence>\r
-              <xs:element minOccurs="1" maxOccurs="unbounded" name="Cloned">\r
-                <xs:complexType>\r
-                  <xs:sequence>\r
-                    <xs:element minOccurs="1" maxOccurs="1" name="PlatformGuid" type="GuidType"/>\r
-                    <xs:element minOccurs="1" maxOccurs="1" name="PlatformVersion" type="VersionDataType"/>\r
-                  </xs:sequence>\r
-                  <!-- The Id is a number used to track heritage  the first entry will be 0 and increment from then on. -->\r
-                  <xs:attribute name="Id" type="xs:nonNegativeInteger" use="required"/>\r
-                  <!-- If the original module was installed from a FAR, track the FAR it came from. -->\r
-                  <xs:attribute name="FarGuid" type="GuidType" use="optional"/>\r
-                </xs:complexType>\r
-              </xs:element>\r
-            </xs:sequence>\r
-          </xs:complexType>\r
-        </xs:element>\r
-      </xs:sequence>\r
-    </xs:complexType>\r
-  </xs:element>\r
 </xs:schema>\r