Change Binary Fat module from fat.ffs to fat.efi

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

diff --git a/EdkFatBinPkg/Ebc/Fat.FFS b/EdkFatBinPkg/Ebc/Fat.FFS
deleted file mode 100644 (file)
index e941918..0000000
Binary files a/EdkFatBinPkg/Ebc/Fat.FFS and /dev/null differ

diff --git a/EdkFatBinPkg/Ebc/Fat.efi b/EdkFatBinPkg/Ebc/Fat.efi
new file mode 100644 (file)
index 0000000..3b2077d
Binary files /dev/null and b/EdkFatBinPkg/Ebc/Fat.efi differ

diff --git a/EdkFatBinPkg/Fat.msa b/EdkFatBinPkg/Fat.msa
index 86a7645d064c4c3b3899e039cc67f9690a2b88df..36249e52d20c4b36452d569569cac89dda717f6f 100644 (file)
--- a/EdkFatBinPkg/Fat.msa
+++ b/EdkFatBinPkg/Fat.msa
@@ -2,7 +2,7 @@
 <ModuleSurfaceArea  xmlns="http://www.TianoCore.org/2006/Edk2.0">\r
   <MsaHeader>\r
     <ModuleName>Fat</ModuleName>\r
 <ModuleSurfaceArea  xmlns="http://www.TianoCore.org/2006/Edk2.0">\r
   <MsaHeader>\r
     <ModuleName>Fat</ModuleName>\r

-    <ModuleType>USER_DEFINED</ModuleType>\r
+    <ModuleType>UEFI_DRIVER</ModuleType>\r

     <GuidValue>961578FE-B6B7-44c3-AF35-6BC705CD2B1F</GuidValue>\r
     <Version>1.0</Version>\r
     <Abstract>Make a FFS section for an FV that contains the FAT driver.*.FFS files are compressed FFS sections.</Abstract>\r
     <GuidValue>961578FE-B6B7-44c3-AF35-6BC705CD2B1F</GuidValue>\r
     <Version>1.0</Version>\r
     <Abstract>Make a FFS section for an FV that contains the FAT driver.*.FFS files are compressed FFS sections.</Abstract>\r


@@ -22,12 +22,14 @@
     <OutputFileBasename>Fat</OutputFileBasename>\r
   </ModuleDefinitions>\r
   <SourceFiles>\r
     <OutputFileBasename>Fat</OutputFileBasename>\r
   </ModuleDefinitions>\r
   <SourceFiles>\r

-    <Filename ToolCode="DUMMY">Fat_build.xml</Filename>\r
-    <Filename SupArchList="IA32">Ia32/Fat.FFS</Filename>\r
-    <Filename SupArchList="IPF">Ipf/Fat.FFS</Filename>\r
-    <Filename SupArchList="X64">X64/Fat.FFS</Filename>\r
-    <Filename SupArchList="EBC">Ebc/Fat.FFS</Filename>\r
+    <Filename SupArchList="IA32">Ia32/Fat.efi</Filename>\r
+    <Filename SupArchList="IPF">Ipf/Fat.efi</Filename>\r
+    <Filename SupArchList="X64">X64/Fat.efi</Filename>\r
+    <Filename SupArchList="EBC">Ebc/Fat.efi</Filename>\r

   </SourceFiles>\r
   </SourceFiles>\r

+  <PackageDependencies>\r
+    <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>\r
+  </PackageDependencies>\r

   <Externs>\r
     <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>\r
     <Specification>EDK_RELEASE_VERSION 0x00020000</Specification>\r
   <Externs>\r
     <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>\r
     <Specification>EDK_RELEASE_VERSION 0x00020000</Specification>\r

diff --git a/EdkFatBinPkg/Fat_build.xml b/EdkFatBinPkg/Fat_build.xml
deleted file mode 100644 (file)
index 74695b8..0000000
--- a/EdkFatBinPkg/Fat_build.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" ?>\r
-<!--\r
-Copyright (c) 2006, Intel Corporation\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 accompanies this distribution.  The full text of the license may be found at\r
-http://opensource.org/licenses/bsd-license.php\r
-\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
-<project name="Fat" default="main" basedir="." >\r
-  <!-- Apply external ANT task -->\r
-  <taskdef resource="frameworktasks.tasks" /> \r
-  <taskdef resource="cpptasks.tasks" /> \r
-  <typedef resource="cpptasks.types" /> \r
-  <taskdef resource="net/sf/antcontrib/antlib.xml" />\r
-  <property environment="env" />\r
-  <!-- All Properties --> \r
-  <property name="BASE_NAME" value="Fat" /> \r
-  \r
-  <!-- Default target -->\r
-  <target name="main">\r
-    <OnDependency>\r
-      <sourcefiles>\r
-        <file name="${MODULE_DIR}/${ARCH}/${BASE_NAME}.FFS"/>\r
-      </sourcefiles>\r
-      <targetfiles>\r
-        <file name="${BIN_DIR}/${FILE_GUID}-${BASE_NAME}.FFS"/>\r
-      </targetfiles>\r
-      <sequential>\r
-        <copy file="${MODULE_DIR}/${ARCH}/${BASE_NAME}.FFS" tofile="${BIN_DIR}/${FILE_GUID}-${BASE_NAME}.FFS" />\r
-      </sequential>\r
-    </OnDependency>\r
-  </target>\r
-\r
-  <target name="clean">\r
-    <delete includeemptydirs="true">\r
-       <fileset dir="${DEST_DIR_OUTPUT}" excludes="*.xml" includes="**/*"/>\r
-    </delete>\r
-  </target>\r
-\r
-  <target name="cleanall">\r
-    <delete includeemptydirs="true">\r
-       <fileset dir="${DEST_DIR_OUTPUT}" excludes="*.xml" includes="**/*"/>\r
-    </delete>\r
-    <delete includeemptydirs="true">\r
-       <fileset dir="${DEST_DIR_DEBUG}" includes="**/*"/>\r
-    </delete>\r
-  </target>\r
-\r
-</project>\r

diff --git a/EdkFatBinPkg/Ia32/Fat.FFS b/EdkFatBinPkg/Ia32/Fat.FFS
deleted file mode 100644 (file)
index 41c64ab..0000000
Binary files a/EdkFatBinPkg/Ia32/Fat.FFS and /dev/null differ

diff --git a/EdkFatBinPkg/Ia32/Fat.efi b/EdkFatBinPkg/Ia32/Fat.efi
new file mode 100644 (file)
index 0000000..d7c08c9
Binary files /dev/null and b/EdkFatBinPkg/Ia32/Fat.efi differ

diff --git a/EdkFatBinPkg/Ipf/Fat.FFS b/EdkFatBinPkg/Ipf/Fat.FFS
deleted file mode 100644 (file)
index 7d08191..0000000
Binary files a/EdkFatBinPkg/Ipf/Fat.FFS and /dev/null differ

diff --git a/EdkFatBinPkg/Ipf/Fat.efi b/EdkFatBinPkg/Ipf/Fat.efi
new file mode 100644 (file)
index 0000000..166a911
Binary files /dev/null and b/EdkFatBinPkg/Ipf/Fat.efi differ

diff --git a/EdkFatBinPkg/X64/Fat.FFS b/EdkFatBinPkg/X64/Fat.FFS
deleted file mode 100644 (file)
index 786c6d3..0000000
Binary files a/EdkFatBinPkg/X64/Fat.FFS and /dev/null differ

diff --git a/EdkFatBinPkg/X64/Fat.efi b/EdkFatBinPkg/X64/Fat.efi
new file mode 100644 (file)
index 0000000..8995512
Binary files /dev/null and b/EdkFatBinPkg/X64/Fat.efi differ

diff --git a/EdkNt32Pkg/Nt32.fpd b/EdkNt32Pkg/Nt32.fpd
index e321c43cde7403d3764cfd764eb7745f08062cc6..07a05c454a713594ca6fc44752df2f3477c62abc 100644 (file)
--- a/EdkNt32Pkg/Nt32.fpd
+++ b/EdkNt32Pkg/Nt32.fpd
@@ -6716,7 +6716,7 @@
     <ModuleSA SupArchList="IA32" PackageGuid="0fd7197b-9bde-44fe-a7e4-d2177a9922e5" ModuleGuid="961578FE-B6B7-44c3-AF35-6BC705CD2B1F">\r
       <ModuleSaBuildOptions>\r
         <FvBinding>FV_RECOVERY</FvBinding>\r
     <ModuleSA SupArchList="IA32" PackageGuid="0fd7197b-9bde-44fe-a7e4-d2177a9922e5" ModuleGuid="961578FE-B6B7-44c3-AF35-6BC705CD2B1F">\r
       <ModuleSaBuildOptions>\r
         <FvBinding>FV_RECOVERY</FvBinding>\r

-        <FfsFormatKey>CUSTOM_BUILD</FfsFormatKey>\r
+        <FfsFormatKey>BS_DRIVER</FfsFormatKey>\r

       </ModuleSaBuildOptions>\r
     </ModuleSA>\r
     <ModuleSA SupArchList="IA32" PackageGuid="68169ab0-d41b-4009-9060-292c253ac43d" ModuleGuid="6987936E-ED34-44db-AE97-1FA5E4ED2116">\r
       </ModuleSaBuildOptions>\r
     </ModuleSA>\r
     <ModuleSA SupArchList="IA32" PackageGuid="68169ab0-d41b-4009-9060-292c253ac43d" ModuleGuid="6987936E-ED34-44db-AE97-1FA5E4ED2116">\r