X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=blobdiff_plain;f=Tools%2FSource%2FFrameworkTasks%2Forg%2Ftianocore%2Fframework%2Ftasks%2FPeiReBaseTask.java;h=c479e0d3344198c81dd91cd5b6d107b908abd769;hp=c033c0d199d881f4a0c2cc33f5c874c303e56281;hb=d7506e116ace59bd37165137a6de1aa6d0fb50fa;hpb=a15bb0d31f5345dd81dde0e978a3cbdc54fa27e7

diff --git a/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/PeiReBaseTask.java b/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/PeiReBaseTask.java
index c033c0d199..c479e0d334 100644
--- a/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/PeiReBaseTask.java
+++ b/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/PeiReBaseTask.java
@@ -40,7 +40,7 @@ public class PeiReBaseTask extends Task implements EfiDefine {
     // / Input file
     // /
     private String inputFile = "";
-
+    private String inputFileName = "";
     // /
     // / Output file
     // /
@@ -104,9 +104,10 @@ public class PeiReBaseTask extends Task implements EfiDefine {
         File file = new File(outputFile);
         if (!file.isAbsolute() && (!this.outputDir.equalsIgnoreCase(""))) {
             argument = inputFile + " " +  "-O " + outputDir + File.separatorChar
-                    + outputFile + " " + this.baseAddr;
+                    + outputFile + " " + this.baseAddr + " "
+                    + "-M " + outputDir + + File.separatorChar + outputFile + ".map";
         } else {
-            argument = inputFile + " " + "-O " + outputFile + " " + this.baseAddr;
+            argument = inputFile + " " + "-O " + outputFile + " " + this.baseAddr+ " " + "-M " + outputFile + ".map";
         }
         
         //
@@ -128,7 +129,8 @@ public class PeiReBaseTask extends Task implements EfiDefine {
             //
             // Set debug log information.
             //
-            EdkLog.log(EdkLog.EDK_INFO, Commandline.toString(cmdline.getCommandline()));
+            EdkLog.log(EdkLog.EDK_VERBOSE, Commandline.toString(cmdline.getCommandline()));
+            EdkLog.log(EdkLog.EDK_INFO, this.inputFileName);
             
             revl = runner.execute();
             
@@ -136,16 +138,13 @@ public class PeiReBaseTask extends Task implements EfiDefine {
                 //
                 // command execution success
                 //
-                EdkLog.log(EdkLog.EDK_INFO,"PeiBase succeeded!");
+                EdkLog.log(EdkLog.EDK_VERBOSE, "PeiReBase succeeded!");
             } else {
                 //
                 // command execution fail
                 //
-                EdkLog.log(EdkLog.EDK_ERROR, "PeiBase failed. (error="
-                        + Integer.toHexString(revl) + ")");
-                throw new BuildException("PeiBase failed. (error="
-                        + Integer.toHexString(revl) + ")");
-
+                EdkLog.log(EdkLog.EDK_INFO, "ERROR = " + Integer.toHexString(revl));
+                throw new BuildException("PeiReBase failed!");
             }
         } catch (Exception e) {
             throw new BuildException(e.getMessage());
@@ -172,6 +171,7 @@ public class PeiReBaseTask extends Task implements EfiDefine {
      *            string of input file name.
      */
     public void setInputFile(String inputFile) {
+        this.inputFileName = (new File(inputFile)).getName();
         this.inputFile = "-I " + inputFile;
     }