Enhance peirebase tool to get base address from the corresponding fv.inf file, which...

[mirror_edk2.git] / Tools / Java / Source / FrameworkTasks / org / tianocore / framework / tasks / PeiReBaseTask.java

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 1f8a4d1f3c899286a0b07d4b3496173994c91ec4..07154921d22564404f9104418ea0242a3e96bad8 100644 (file)
--- 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 {
     //\r
     private ToolArg baseAddr = new ToolArg();\r
     //\r
     //\r
     private ToolArg baseAddr = new ToolArg();\r
     //\r

+    // Fv.inf file\r

     // \r
     // \r

+    private FileArg fvinfFile = new FileArg();\r
+    //\r
+    // map file\r

     // \r
     private FileArg mapFile = new FileArg();\r
     //\r
     // \r
     private FileArg mapFile = new FileArg();\r
     //\r


@@ -99,7 +103,7 @@ public class PeiReBaseTask extends Task implements EfiDefine {
         if (mapFile.getValue().length() == 0) {\r
             mapFile.setArg(" -M ", outputFile.getValue() + ".map");\r
         }\r
         if (mapFile.getValue().length() == 0) {\r
             mapFile.setArg(" -M ", outputFile.getValue() + ".map");\r
         }\r

-        argument = "" + inputFile + outputFile + baseAddr + mapFile;\r
+        argument = "" + inputFile + outputFile + baseAddr + fvinfFile + mapFile;\r

 \r
         //\r
         // return value of fwimage execution\r
 \r
         //\r
         // return value of fwimage execution\r


@@ -234,6 +238,24 @@ public class PeiReBaseTask extends Task implements EfiDefine {
         this.arch = arch;\r
     }\r
 \r
         this.arch = arch;\r
     }\r
 \r

+    /**\r
+       Get the value of fv.inf file\r
+\r
+       @return String   The fv.inf file path\r
+     **/\r
+    public String getFvInfFile() {\r
+        return fvinfFile.getValue();\r
+    }\r
+\r
+    /**\r
+       Set "-F FvinfFile" argument\r
+\r
+       @param fvinfFile   The path of fv.inf file\r
+     **/\r
+    public void setFvInfFile(String fvinfFile) {\r
+        this.fvinfFile.setArg(" -F ", fvinfFile);\r
+    }\r
+\r

     /**\r
        Get the value of map file\r
 \r
     /**\r
        Get the value of map file\r
 \r