summaryrefslogtreecommitdiff
path: root/Tools
diff options
context:
space:
mode:
authorbbahnsen <bbahnsen@6f19259b-4bc3-4df7-8a09-765794883524>2006-06-09 17:07:09 +0000
committerbbahnsen <bbahnsen@6f19259b-4bc3-4df7-8a09-765794883524>2006-06-09 17:07:09 +0000
commit8742c000dc639af1d7eb49b5791315298869d191 (patch)
tree914ddd3506d1d9235fa2700f9079246f8f9e4525 /Tools
parent302e0e4a1f98cb3b79647c38baef456311bd4798 (diff)
downloadedk2-platforms-8742c000dc639af1d7eb49b5791315298869d191.tar.xz
Temporary workaround--determine the target architecture from an environment variable ARCH. Optionally, you can set the variable to IA32, X64 or IPF so that the correct GenFvImage will be called.
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@457 6f19259b-4bc3-4df7-8a09-765794883524
Diffstat (limited to 'Tools')
-rw-r--r--Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/GenFvImageTask.java23
1 files changed, 15 insertions, 8 deletions
diff --git a/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/GenFvImageTask.java b/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/GenFvImageTask.java
index 1f5e4ecf6d..f9340758b3 100644
--- a/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/GenFvImageTask.java
+++ b/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/GenFvImageTask.java
@@ -56,17 +56,24 @@ public class GenFvImageTask extends Task implements EfiDefine{
path = path + File.separatorChar;
}
- if (arch.equalsIgnoreCase("")){
- command = path + "GenFvImage";
+ // FIXME arch should be passed via schema attributes.
+ arch=System.getenv("ARCH");
+ if (arch == null) {
+ arch = "";
}
- if (arch.equalsIgnoreCase("ia32")){
- command = path + "GenFvImage_IA32";
+ // FIXME end
+
+ if (arch.equalsIgnoreCase("IA32")){
+ command = path + "GenFvImage_Ia32";
}
- if (arch.equalsIgnoreCase("x64")){
+ else if (arch.equalsIgnoreCase("X64")){
command = path + "GenFvImage_X64";
}
- if (arch.equalsIgnoreCase("ipf")){
- command = path + "GenFvImage_IPF";
+ else if (arch.equalsIgnoreCase("IPF")){
+ command = path + "GenFvImage_Ipf";
+ }
+ else {
+ command = path + "GenFvImage";
}
String argument = infFile;
@@ -151,4 +158,4 @@ public class GenFvImageTask extends Task implements EfiDefine{
public void setArch(String arch) {
this.arch = arch;
}
-} \ No newline at end of file
+}