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

11 files changed, 9 insertions, 59 deletions

diff --git a/EdkFatBinPkg/Ebc/Fat.FFS b/EdkFatBinPkg/Ebc/Fat.FFS
deleted file mode 100644
index e9419189b0..0000000000
--- a/EdkFatBinPkg/Ebc/Fat.FFS
+++ /dev/null
diff --git a/EdkFatBinPkg/Ebc/Fat.efi b/EdkFatBinPkg/Ebc/Fat.efi
new file mode 100644
index 0000000000..3b2077df32
--- /dev/null
+++ b/EdkFatBinPkg/Ebc/Fat.efi
diff --git a/EdkFatBinPkg/Fat.msa b/EdkFatBinPkg/Fat.msa
index 86a7645d06..36249e52d2 100644
--- a/EdkFatBinPkg/Fat.msa
+++ b/EdkFatBinPkg/Fat.msa
@@ -2,7 +2,7 @@
 <ModuleSurfaceArea  xmlns="http://www.TianoCore.org/2006/Edk2.0">

   <MsaHeader>

     <ModuleName>Fat</ModuleName>

-    <ModuleType>USER_DEFINED</ModuleType>

+    <ModuleType>UEFI_DRIVER</ModuleType>

     <GuidValue>961578FE-B6B7-44c3-AF35-6BC705CD2B1F</GuidValue>

     <Version>1.0</Version>

     <Abstract>Make a FFS section for an FV that contains the FAT driver.*.FFS files are compressed FFS sections.</Abstract>

@@ -22,12 +22,14 @@
     <OutputFileBasename>Fat</OutputFileBasename>

   </ModuleDefinitions>

   <SourceFiles>

-    <Filename ToolCode="DUMMY">Fat_build.xml</Filename>

-    <Filename SupArchList="IA32">Ia32/Fat.FFS</Filename>

-    <Filename SupArchList="IPF">Ipf/Fat.FFS</Filename>

-    <Filename SupArchList="X64">X64/Fat.FFS</Filename>

-    <Filename SupArchList="EBC">Ebc/Fat.FFS</Filename>

+    <Filename SupArchList="IA32">Ia32/Fat.efi</Filename>

+    <Filename SupArchList="IPF">Ipf/Fat.efi</Filename>

+    <Filename SupArchList="X64">X64/Fat.efi</Filename>

+    <Filename SupArchList="EBC">Ebc/Fat.efi</Filename>

   </SourceFiles>

+  <PackageDependencies>

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

+  </PackageDependencies>

   <Externs>

     <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>

     <Specification>EDK_RELEASE_VERSION 0x00020000</Specification>

diff --git a/EdkFatBinPkg/Fat_build.xml b/EdkFatBinPkg/Fat_build.xml
deleted file mode 100644
index 74695b83f4..0000000000
--- a/EdkFatBinPkg/Fat_build.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" ?>

-<!--

-Copyright (c) 2006, Intel Corporation

-All rights reserved. This program and the accompanying materials

-are licensed and made available under the terms and conditions of the BSD License

-which accompanies this distribution.  The full text of the license may be found at

-http://opensource.org/licenses/bsd-license.php

-

-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,

-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.

--->

-<project name="Fat" default="main" basedir="." >

-  <!-- Apply external ANT task -->

-  <taskdef resource="frameworktasks.tasks" /> 

-  <taskdef resource="cpptasks.tasks" /> 

-  <typedef resource="cpptasks.types" /> 

-  <taskdef resource="net/sf/antcontrib/antlib.xml" />

-  <property environment="env" />

-  <!-- All Properties --> 

-  <property name="BASE_NAME" value="Fat" /> 

-  

-  <!-- Default target -->

-  <target name="main">

-    <OnDependency>

-      <sourcefiles>

-        <file name="${MODULE_DIR}/${ARCH}/${BASE_NAME}.FFS"/>

-      </sourcefiles>

-      <targetfiles>

-        <file name="${BIN_DIR}/${FILE_GUID}-${BASE_NAME}.FFS"/>

-      </targetfiles>

-      <sequential>

-        <copy file="${MODULE_DIR}/${ARCH}/${BASE_NAME}.FFS" tofile="${BIN_DIR}/${FILE_GUID}-${BASE_NAME}.FFS" />

-      </sequential>

-    </OnDependency>

-  </target>

-

-  <target name="clean">

-    <delete includeemptydirs="true">

-       <fileset dir="${DEST_DIR_OUTPUT}" excludes="*.xml" includes="**/*"/>

-    </delete>

-  </target>

-

-  <target name="cleanall">

-    <delete includeemptydirs="true">

-       <fileset dir="${DEST_DIR_OUTPUT}" excludes="*.xml" includes="**/*"/>

-    </delete>

-    <delete includeemptydirs="true">

-       <fileset dir="${DEST_DIR_DEBUG}" includes="**/*"/>

-    </delete>

-  </target>

-

-</project>

diff --git a/EdkFatBinPkg/Ia32/Fat.FFS b/EdkFatBinPkg/Ia32/Fat.FFS
deleted file mode 100644
index 41c64abe2f..0000000000
--- a/EdkFatBinPkg/Ia32/Fat.FFS
+++ /dev/null
diff --git a/EdkFatBinPkg/Ia32/Fat.efi b/EdkFatBinPkg/Ia32/Fat.efi
new file mode 100644
index 0000000000..d7c08c97d7
--- /dev/null
+++ b/EdkFatBinPkg/Ia32/Fat.efi
diff --git a/EdkFatBinPkg/Ipf/Fat.FFS b/EdkFatBinPkg/Ipf/Fat.FFS
deleted file mode 100644
index 7d081911e8..0000000000
--- a/EdkFatBinPkg/Ipf/Fat.FFS
+++ /dev/null
diff --git a/EdkFatBinPkg/Ipf/Fat.efi b/EdkFatBinPkg/Ipf/Fat.efi
new file mode 100644
index 0000000000..166a91147e
--- /dev/null
+++ b/EdkFatBinPkg/Ipf/Fat.efi
diff --git a/EdkFatBinPkg/X64/Fat.FFS b/EdkFatBinPkg/X64/Fat.FFS
deleted file mode 100644
index 786c6d3c96..0000000000
--- a/EdkFatBinPkg/X64/Fat.FFS
+++ /dev/null
diff --git a/EdkFatBinPkg/X64/Fat.efi b/EdkFatBinPkg/X64/Fat.efi
new file mode 100644
index 0000000000..89955124c3
--- /dev/null
+++ b/EdkFatBinPkg/X64/Fat.efi
diff --git a/EdkNt32Pkg/Nt32.fpd b/EdkNt32Pkg/Nt32.fpd
index e321c43cde..07a05c454a 100644
--- 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">

       <ModuleSaBuildOptions>

         <FvBinding>FV_RECOVERY</FvBinding>

-        <FfsFormatKey>CUSTOM_BUILD</FfsFormatKey>

+        <FfsFormatKey>BS_DRIVER</FfsFormatKey>

       </ModuleSaBuildOptions>

     </ModuleSA>

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