One GenFvImage can handle all archs now.

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

1 files changed, 1 insertions, 42 deletions

diff --git a/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/GenFvImageTask.java b/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/GenFvImageTask.java
index f9340758b3..ae47ec7ff4 100644
--- a/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/GenFvImageTask.java
+++ b/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/GenFvImageTask.java
@@ -34,10 +34,6 @@ public class GenFvImageTask extends Task implements EfiDefine{
     /// The name of input inf file

     ///

     private String infFile="";

-    ///

-    /// The target architecture.

-    ///

-    private String arch="";

     

     /**

       execute

@@ -56,25 +52,8 @@ public class GenFvImageTask extends Task implements EfiDefine{
             path = path + File.separatorChar;

         }

         

-        // FIXME arch should be passed via schema attributes.

-        arch=System.getenv("ARCH");

-        if (arch == null) {

-          arch = "";

-        }

-        // FIXME end

+        command = path + "GenFvImage";

 

-        if (arch.equalsIgnoreCase("IA32")){

-            command = path + "GenFvImage_Ia32";

-        }   

-        else if (arch.equalsIgnoreCase("X64")){

-            command = path + "GenFvImage_X64";

-        }

-        else if (arch.equalsIgnoreCase("IPF")){

-            command = path + "GenFvImage_Ipf";

-        }

-        else {

-            command = path + "GenFvImage";

-        }

         String argument = infFile;

         

         try {

@@ -138,24 +117,4 @@ public class GenFvImageTask extends Task implements EfiDefine{
         this.infFile = "-I " + infFile;

     }

     

-    /**

-      getArch

-      

-      This function is to get class member of arch.

-      @return           The target architecture.

-    **/

-    public String getArch() {

-        return arch;

-    }

-    

-    /**

-      setArch

-      

-      This function is to set class member of arch. 

-      

-      @param arch       The target architecture.

-    **/

-    public void setArch(String arch) {

-        this.arch = arch;

-    }   

 }