removed require for different sections of <TianoImage> SEC,PEI_CORE,etc are now...

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

diff --git a/Tools/XMLSchema/FrameworkDataTypes.xsd b/Tools/XMLSchema/FrameworkDataTypes.xsd
index 402d2b2752adf1f85580a160300f6454c1d69dbb..4fbaea4e76f45819c5d34203afd8088e8a06c31d 100644 (file)
--- a/Tools/XMLSchema/FrameworkDataTypes.xsd
+++ b/Tools/XMLSchema/FrameworkDataTypes.xsd
@@ -1101,15 +1101,13 @@
         <xs:attribute name="Version" type="VersionDataType" use="optional"/>\r
     </xs:attributeGroup>\r
     <xs:attributeGroup name="MsaAttributes">\r
         <xs:attribute name="Version" type="VersionDataType" use="optional"/>\r
     </xs:attributeGroup>\r
     <xs:attributeGroup name="MsaAttributes">\r

-        <xs:attribute name="Guid" type="GuidType" use="optional"/>\r

         <xs:attribute name="Arch" type="SupportedArchitectures" use="optional"/>\r
         <xs:attribute name="Arch" type="SupportedArchitectures" use="optional"/>\r

+        <xs:attribute name="FvBinding" type="xs:string" use="optional"/>\r

         <xs:attribute name="ModuleName" type="C_Name" use="optional"/>\r
         <xs:attribute name="ModuleName" type="C_Name" use="optional"/>\r

-        <xs:attribute name="Version" type="VersionDataType" use="optional"/>\r
-        <xs:attribute name="Platform" type="PlatformNamingConvention" use="optional"/>\r
+        <xs:attribute name="ModuleGuid" type="GuidType" use="optional"/>\r
+        <xs:attribute name="PackageName" type="C_Name" use="optional"/>\r
+        <xs:attribute name="PackageGuid" type="GuidType" use="optional"/>\r

         <xs:attribute name="BuildSequence" type="xs:int" use="optional"/>\r
         <xs:attribute name="BuildSequence" type="xs:int" use="optional"/>\r

-        <xs:attribute name="FV" type="xs:string" use="optional"/>\r
-        <xs:attribute name="FvBinding" type="xs:string" use="optional"/>\r
-        <xs:attribute name="PACKAGE" type="xs:string" use="optional"/>\r

     </xs:attributeGroup>\r
     <xs:attributeGroup name="OptionAttributes">\r
         <xs:attribute name="Platform" type="PlatformNamingConvention" use="optional"/>\r
     </xs:attributeGroup>\r
     <xs:attributeGroup name="OptionAttributes">\r
         <xs:attribute name="Platform" type="PlatformNamingConvention" use="optional"/>\r

diff --git a/Tools/XMLSchema/FrameworkPlatformDataElements.xsd b/Tools/XMLSchema/FrameworkPlatformDataElements.xsd
index 5cbaaca699fae05145093ee6f3966409652f0842..7702f02e370c812bce1113c537cc5e0be8bec483 100644 (file)
--- a/Tools/XMLSchema/FrameworkPlatformDataElements.xsd
+++ b/Tools/XMLSchema/FrameworkPlatformDataElements.xsd
@@ -231,11 +231,11 @@
         </xs:annotation>\r
         <xs:complexType>\r
             <xs:sequence>\r
         </xs:annotation>\r
         <xs:complexType>\r
             <xs:sequence>\r

-                <xs:element minOccurs="1" maxOccurs="1" name="SEC" type="Components"/>\r
-                <xs:element minOccurs="1" maxOccurs="1" name="PEI_CORE" type="Components"/>\r
-                <xs:element minOccurs="1" maxOccurs="1" name="PEIM" type="Components"/>\r
-                <xs:element minOccurs="1" maxOccurs="1" name="DXE_CORE" type="Components"/>\r
-                <xs:element minOccurs="1" maxOccurs="1" name="DXE_DRIVERS" type="Components"/>\r
+                <xs:element minOccurs="0" maxOccurs="1" name="SEC" type="Components"/>\r
+                <xs:element minOccurs="0" maxOccurs="1" name="PEI_CORE" type="Components"/>\r
+                <xs:element minOccurs="0" maxOccurs="1" name="PEIM" type="Components"/>\r
+                <xs:element minOccurs="0" maxOccurs="1" name="DXE_CORE" type="Components"/>\r
+                <xs:element minOccurs="0" maxOccurs="1" name="DXE_DRIVERS" type="Components"/>\r

                 <xs:element minOccurs="0" maxOccurs="1" name="OTHER_COMPONENTS" type="Components"/>\r
             </xs:sequence>\r
         </xs:complexType>\r
                 <xs:element minOccurs="0" maxOccurs="1" name="OTHER_COMPONENTS" type="Components"/>\r
             </xs:sequence>\r
         </xs:complexType>\r