X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=blobdiff_plain;f=Tools%2FXMLSchema%2FFrameworkPlatformDataElements.xsd;h=a32b28c2f361f288bd81c2d3624848ad039e5b32;hp=f4c56843c95a53fb301548e476588d2b1db4bf14;hb=d84573dbd1dd5a212e3b1856f96c18e867641025;hpb=0a94a7d997ffb93fe34a0d438098a8f746952f7b

diff --git a/Tools/XMLSchema/FrameworkPlatformDataElements.xsd b/Tools/XMLSchema/FrameworkPlatformDataElements.xsd
index f4c56843c9..a32b28c2f3 100644
--- a/Tools/XMLSchema/FrameworkPlatformDataElements.xsd
+++ b/Tools/XMLSchema/FrameworkPlatformDataElements.xsd
@@ -16,8 +16,10 @@
         <xs:documentation xml:lang="en"> This schema defines EFI and Framework Platform Data Elements that are specific to platform creation.</xs:documentation>
     </xs:annotation>
     <xs:include schemaLocation="NamingConvention.xsd"/>
+    <xs:include schemaLocation="FrameworkDataAttributes.xsd"/>
     <xs:include schemaLocation="FrameworkDataTypes.xsd"/>
     <xs:include schemaLocation="FrameworkDataElements.xsd"/>
+    <xs:include schemaLocation="FrameworkPlatformDataTypes.xsd"/>
     <xs:element name="Capsule">
         <xs:complexType>
             <xs:sequence>
@@ -73,8 +75,8 @@
                     <xs:element name="FlashDefinition" type="FlashData"/>
                     <xs:element name="FlashDefinitionFile" type="FileNameConvention"/>
                 </xs:choice>
-                <xs:element minOccurs="0" maxOccurs="unbounded" ref="FvImages"/>
-                <xs:element minOccurs="0" maxOccurs="unbounded" ref="Capsules"/>
+                <xs:element minOccurs="0" maxOccurs="1" ref="FvImages"/>
+                <xs:element minOccurs="0" maxOccurs="1" ref="Capsules"/>
             </xs:sequence>
             <xs:attribute name="MicrocodeFile" type="FileNameConvention" use="optional"/>
         </xs:complexType>
@@ -152,7 +154,7 @@
                     </xs:complexType>
                 </xs:element>
             </xs:sequence>
-            <xs:attributeGroup ref="BlockAttributes"/>
+            <xs:attributeGroup ref="FlashDeviceInfoAttributes"/>
         </xs:complexType>
     </xs:element>
     <xs:element name="FlashDeviceOverrideImage">
@@ -231,21 +233,53 @@
         </xs:annotation>
         <xs:complexType>
             <xs:sequence minOccurs="1">
-                <xs:element minOccurs="0" maxOccurs="1" ref="SourceFiles"/>  <!-- DO NOT USE! REMOVE in FINAL -->
-                <xs:element minOccurs="0" maxOccurs="1" ref="Includes"/>  <!-- DO NOT USE! REMOVE in FINAL -->
+                <!-- DO NOT USE! REMOVE SourceFiles in FINAL -->
+                <xs:element minOccurs="0" maxOccurs="1" ref="SourceFiles"/>
+                <!-- DO NOT USE! REMOVE Includes in FINAL -->
+                <xs:element minOccurs="0" maxOccurs="1" ref="Includes"/>
+                <!-- Libraries stays in FINAL -->
                 <xs:element minOccurs="0" maxOccurs="1" ref="Libraries"/>
-                <xs:element minOccurs="0" maxOccurs="1" ref="Protocols"/>  <!-- DO NOT USE! REMOVE in FINAL -->
-                <xs:element minOccurs="0" maxOccurs="1" ref="Events"/>  <!-- DO NOT USE! REMOVE in FINAL -->
-                <xs:element minOccurs="0" maxOccurs="1" ref="Hobs"/>  <!-- DO NOT USE! REMOVE in FINAL -->
-                <xs:element minOccurs="0" maxOccurs="1" ref="PPIs"/>  <!-- DO NOT USE! REMOVE in FINAL -->
-                <xs:element minOccurs="0" maxOccurs="1" ref="Variables"/>  <!-- DO NOT USE! REMOVE in FINAL -->
-                <xs:element minOccurs="0" maxOccurs="1" ref="BootModes"/>  <!-- DO NOT USE! REMOVE in FINAL -->
-                <xs:element minOccurs="0" maxOccurs="1" ref="SystemTables"/>  <!-- DO NOT USE! REMOVE in FINAL -->
-                <xs:element minOccurs="0" maxOccurs="1" ref="DataHubs"/>  <!-- DO NOT USE! REMOVE in FINAL -->
-                <xs:element minOccurs="0" maxOccurs="1" ref="Formsets"/>  <!-- DO NOT USE! REMOVE in FINAL -->
-                <xs:element minOccurs="0" maxOccurs="1" ref="Guids"/>  <!-- DO NOT USE! REMOVE in FINAL -->
-                <xs:element minOccurs="0" maxOccurs="1" ref="Externs"/>
-                <xs:element minOccurs="0" maxOccurs="1" ref="PcdBuildDeclarations"/>
+                <!-- DO NOT USE! REMOVE Protocols in FINAL -->
+                <xs:element minOccurs="0" maxOccurs="1" ref="Protocols"/>
+                <!-- DO NOT USE! REMOVE Events in FINAL -->
+                <xs:element minOccurs="0" maxOccurs="1" ref="Events"/>
+                <!-- DO NOT USE! REMOVE Hobs in FINAL -->
+                <xs:element minOccurs="0" maxOccurs="1" ref="Hobs"/>
+                <!-- DO NOT USE! REMOVE PPIs in FINAL -->
+                <xs:element minOccurs="0" maxOccurs="1" ref="PPIs"/>
+                <!-- DO NOT USE! REMOVE Variables in FINAL -->
+                <xs:element minOccurs="0" maxOccurs="1" ref="Variables"/>
+                <!-- DO NOT USE! REMOVE BootModes in FINAL -->
+                <xs:element minOccurs="0" maxOccurs="1" ref="BootModes"/>
+                <!-- DO NOT USE! REMOVE SystemTables in FINAL -->
+                <xs:element minOccurs="0" maxOccurs="1" ref="SystemTables"/>
+                <!-- DO NOT USE! REMOVE DataHubs in FINAL -->
+                <xs:element minOccurs="0" maxOccurs="1" ref="DataHubs"/>
+                <!-- DO NOT USE! REMOVE Formsets in FINAL -->
+                <xs:element minOccurs="0" maxOccurs="1" ref="Formsets"/>
+                <!-- DO NOT USE! REMOVE Guids in FINAL -->
+                <xs:element minOccurs="0" maxOccurs="1" ref="Guids"/>
+                <xs:choice minOccurs="0">
+                    <!-- DO NOT USE! REMOVE Externs stays in FINAL -->
+                    <xs:element minOccurs="0" maxOccurs="1" ref="Externs"/>
+                    <xs:element minOccurs="0" maxOccurs="1" name="Extern">
+                        <xs:annotation>
+                            <xs:documentation xml:lang="en">Only specification is allow here. We need to let this be an addtion OR, if the WORD portion exists, this entry takes precedence.</xs:documentation>
+                        </xs:annotation>
+                        <xs:complexType>
+                            <xs:sequence>
+                                <xs:element minOccurs="1" maxOccurs="unbounded" ref="Specification"/>
+                            </xs:sequence>
+                        </xs:complexType>
+                    </xs:element>
+                </xs:choice>
+                <xs:choice>
+                    <!-- DO NOT USE! REMOVE PcdBuildDeclarations in FINAL -->
+                    <xs:element minOccurs="0" maxOccurs="1" ref="PcdBuildDeclarations"/>
+                    <!-- PcdBuildDefinition stays in FINAL -->
+                    <xs:element minOccurs="0" maxOccurs="1" ref="PcdBuildDefinition"/>
+                </xs:choice>
+                <!-- BuildOptions stays in FINAL -->
                 <xs:element minOccurs="0" maxOccurs="1" ref="BuildOptions"/>
             </xs:sequence>
             <xs:attributeGroup ref="MsaAttributes"/>
@@ -298,12 +332,17 @@
         </xs:annotation>
         <xs:complexType>
             <xs:sequence>
-                <xs:element minOccurs="0" maxOccurs="1" name="SEC" type="Components"/>
-                <xs:element minOccurs="0" maxOccurs="1" name="PEI_CORE" type="Components"/>
-                <xs:element minOccurs="0" maxOccurs="1" name="PEIM" type="Components"/>
-                <xs:element minOccurs="0" maxOccurs="1" name="DXE_CORE" type="Components"/>
-                <xs:element minOccurs="0" maxOccurs="1" name="DXE_DRIVERS" type="Components"/>
-                <xs:element minOccurs="0" maxOccurs="1" name="OTHER_COMPONENTS" type="Components"/>
+                <xs:choice>
+                    <xs:sequence>
+                        <xs:element minOccurs="0" maxOccurs="1" name="SEC" type="Components"/>
+                        <xs:element minOccurs="0" maxOccurs="1" name="PEI_CORE" type="Components"/>
+                        <xs:element minOccurs="0" maxOccurs="1" name="PEIM" type="Components"/>
+                        <xs:element minOccurs="0" maxOccurs="1" name="DXE_CORE" type="Components"/>
+                        <xs:element minOccurs="0" maxOccurs="1" name="DXE_DRIVERS" type="Components"/>
+                        <xs:element minOccurs="0" maxOccurs="1" name="OTHER_COMPONENTS" type="Components"/>
+                    </xs:sequence>
+                    <xs:element minOccurs="1" maxOccurs="unbounded" ref="ModuleSA"/>
+                </xs:choice>
             </xs:sequence>
         </xs:complexType>
     </xs:element>
@@ -322,62 +361,6 @@
             </xs:sequence>
         </xs:complexType>
     </xs:element>
-    <xs:simpleType name="EfiFvAttributeType">
-        <xs:annotation>
-            <xs:documentation xml:lang="en">The list of EFI_FLASH_AREA Attributes</xs:documentation>
-        </xs:annotation>
-        <xs:restriction base="UCNameType">
-            <xs:enumeration value="EFI_FLASH_AREA_FV"/>
-            <xs:enumeration value="EFI_FLASH_AREA_MEMMAPPED_FV"/>
-            <xs:enumeration value="EFI_FLASH_AREA_SUBFV"/>
-        </xs:restriction>
-    </xs:simpleType>
-    <xs:simpleType name="EfiFvAreaType">
-        <xs:annotation>
-            <xs:documentation xml:lang="en">The list of valid EFI Area Types</xs:documentation>
-        </xs:annotation>
-        <xs:restriction base="UCNameType">
-            <xs:enumeration value="EFI_FLASH_AREA_EFI_VARIABLES"/>
-            <xs:enumeration value="EFI_FLASH_AREA_UNUSED"/>
-            <xs:enumeration value="EFI_FLASH_AREA_MAIN_BIOS"/>
-            <xs:enumeration value="EFI_FLASH_AREA_GUID_DEFINED"/>
-            <xs:enumeration value="EFI_FLASH_AREA_FTW_STATE"/>
-            <xs:enumeration value="EFI_FLASH_AREA_FTW_BACKUP"/>
-            <xs:enumeration value="EFI_FLASH_AREA_RECOVERY_BIOS"/>
-        </xs:restriction>
-    </xs:simpleType>
-    <xs:simpleType name="EfiNameGuidType">
-        <xs:annotation>
-            <xs:documentation xml:lang="en">Right now, only EFI_FLASH_MAP_HOB_GUID is defined</xs:documentation>
-        </xs:annotation>
-        <xs:restriction base="UCNameType">
-            <xs:enumeration value="EFI_FLASH_MAP_HOB_GUID"/>
-        </xs:restriction>
-    </xs:simpleType>
-    <xs:simpleType name="FlashSize">
-        <xs:restriction base="xs:string">
-            <xs:enumeration value="256KB"/>
-            <xs:enumeration value="512KB"/>
-            <xs:enumeration value="1MB"/>
-            <xs:enumeration value="2MB"/>
-            <xs:enumeration value="4MB"/>
-        </xs:restriction>
-    </xs:simpleType>
-    <xs:simpleType name="FvImageTypes">
-        <xs:restriction base="xs:NCName">
-            <xs:enumeration value="Attributes"/>
-            <xs:enumeration value="Options"/>
-            <xs:enumeration value="Components"/>
-            <xs:enumeration value="ValidImageNames"/>
-        </xs:restriction>
-    </xs:simpleType>
-    <xs:simpleType name="FvSubRegionTypes">
-        <xs:restriction base="UCNameType">
-            <xs:enumeration value="NV_VARIABLE_STORE"/>
-            <xs:enumeration value="MICROCODE"/>
-            <xs:enumeration value="NV_FTW_WORKING"/>
-        </xs:restriction>
-    </xs:simpleType>
     <xs:complexType name="Components">
         <xs:sequence minOccurs="1" maxOccurs="unbounded">
             <xs:element ref="ModuleSA"/>
@@ -444,47 +427,4 @@
             <xs:element minOccurs="1" maxOccurs="1" name="NameGuid" type="EfiNameGuidType"/>
         </xs:sequence>
     </xs:complexType>
-    <xs:attributeGroup name="BlockAttributes">
-        <xs:attribute name="Name" type="BlockNameType" use="required"/>
-        <xs:attribute name="Size" type="HexAddressType" use="required"/>
-        <xs:attribute name="Flags" type="HexAddressType" use="optional"/>
-    </xs:attributeGroup>
-    <xs:attributeGroup name="FlashDeviceImageAttributes">
-        <xs:attribute name="Name" type="xs:string" use="required"/>
-    </xs:attributeGroup>
-    <xs:attributeGroup name="FlashDeviceImageFileAttributes">
-        <xs:attribute name="Name" type="xs:string" use="required"/>
-        <xs:attribute name="Region" type="xs:string" use="required"/>
-        <xs:attribute name="SubRegion" type="xs:string" use="optional"/>
-        <xs:attribute name="Optional" type="xs:boolean" use="optional"/>
-    </xs:attributeGroup>
-    <xs:attributeGroup name="FlashDeviceInfoAttributes">
-        <xs:attribute name="Name" type="xs:string" use="required"/>
-        <xs:attribute name="Size" type="HexAddressType" use="required"/>
-        <xs:attribute name="BaseAddress" type="HexAddressType" use="required"/>
-        <xs:attribute name="ErasePolarity" type="ZeroOrOne" use="required"/>
-    </xs:attributeGroup>
-    <xs:attributeGroup name="RawDataAttributes">
-        <xs:attribute name="Name" type="xs:string" use="required"/>
-        <xs:attribute name="Region" type="xs:string" use="required"/>
-        <xs:attribute name="SubRegion" type="xs:string" use="required"/>
-    </xs:attributeGroup>
-    <xs:attributeGroup name="RegionAttributes">
-        <xs:attribute name="Name" type="xs:string" use="required"/>
-        <xs:attribute name="Size" type="HexAddressType" use="required"/>
-        <xs:attribute name="Flags" type="HexAddressType" use="optional"/>
-        <xs:attribute name="Alignment" type="HexAddressType" use="optional"/>
-        <xs:attribute name="Attributes" type="xs:string" use="required"/>
-        <xs:attribute name="AreaType" type="EfiFvAreaType" use="required"/>
-    </xs:attributeGroup>
-    <xs:attributeGroup name="SubRegionAttributes">
-        <xs:attribute name="CreateHob" type="xs:boolean" use="required"/>
-        <xs:attribute name="Name" type="xs:string" use="required"/>
-        <xs:attribute name="Size" type="HexAddressType" use="required"/>
-        <xs:attribute name="Attributes" type="xs:string" use="required"/>
-        <xs:attribute name="AreaType" type="EfiFvAreaType" use="required"/>
-        <xs:attribute name="NameGuid" type="xs:string" use="required"/>
-        <xs:attribute name="AreaTypeGuid" type="xs:string" use="optional"/>
-        <xs:attribute name="FileSystemGuid" type="xs:string" use="optional"/>
-    </xs:attributeGroup>
 </xs:schema>