From 4c50c885441c6406bb8a82f8b4e6106ce0706544 Mon Sep 17 00:00:00 2001
From: lgao4 <lgao4@6f19259b-4bc3-4df7-8a09-765794883524>
Date: Mon, 20 Nov 2006 09:29:14 +0000
Subject: Enhance peirebase tool to get base address from the corresponding
 fv.inf file, which don't need one base address parameter for this tool any
 longer. We can reduce base address duplicated definition in fv.inf and fpd
 file.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@1986 6f19259b-4bc3-4df7-8a09-765794883524
---
 .../tianocore/framework/tasks/PeiReBaseTask.java   | 24 +++++++++++++++++++++-
 1 file changed, 23 insertions(+), 1 deletion(-)

(limited to 'Tools/Java/Source/FrameworkTasks/org')

diff --git a/Tools/Java/Source/FrameworkTasks/org/tianocore/framework/tasks/PeiReBaseTask.java b/Tools/Java/Source/FrameworkTasks/org/tianocore/framework/tasks/PeiReBaseTask.java
index 1f8a4d1f3c..07154921d2 100644
--- a/Tools/Java/Source/FrameworkTasks/org/tianocore/framework/tasks/PeiReBaseTask.java
+++ b/Tools/Java/Source/FrameworkTasks/org/tianocore/framework/tasks/PeiReBaseTask.java
@@ -50,7 +50,11 @@ public class PeiReBaseTask extends Task implements EfiDefine {
     //
     private ToolArg baseAddr = new ToolArg();
     //
+    // Fv.inf file
     // 
+    private FileArg fvinfFile = new FileArg();
+    //
+    // map file
     // 
     private FileArg mapFile = new FileArg();
     //
@@ -99,7 +103,7 @@ public class PeiReBaseTask extends Task implements EfiDefine {
         if (mapFile.getValue().length() == 0) {
             mapFile.setArg(" -M ", outputFile.getValue() + ".map");
         }
-        argument = "" + inputFile + outputFile + baseAddr + mapFile;
+        argument = "" + inputFile + outputFile + baseAddr + fvinfFile + mapFile;
 
         //
         // return value of fwimage execution
@@ -234,6 +238,24 @@ public class PeiReBaseTask extends Task implements EfiDefine {
         this.arch = arch;
     }
 
+    /**
+       Get the value of fv.inf file
+
+       @return String   The fv.inf file path
+     **/
+    public String getFvInfFile() {
+        return fvinfFile.getValue();
+    }
+
+    /**
+       Set "-F FvinfFile" argument
+
+       @param fvinfFile   The path of fv.inf file
+     **/
+    public void setFvInfFile(String fvinfFile) {
+        this.fvinfFile.setArg(" -F ", fvinfFile);
+    }
+
     /**
        Get the value of map file
 
-- 
cgit v1.2.3