Remove dependence check of FD upon FlashMap.fdf

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

diff --git a/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/FlashMapTask.java b/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/FlashMapTask.java
index 5265f7c7d6cd006753deae78281bf1ea37623504..5c3e88920a85a1ae4d058c2fbb5c94fbb5792222 100644 (file)
--- a/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/FlashMapTask.java
+++ b/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/FlashMapTask.java
@@ -98,8 +98,8 @@ public class FlashMapTask extends Task implements EfiDefine {
     private String outStrFile = "";\r
 \r
     //\r
-    // \r
-    // \r
+    //\r
+    //\r
     private FileArg strFile = new FileArg();\r
     //\r
     // Base address\r
@@ -128,15 +128,16 @@ public class FlashMapTask extends Task implements EfiDefine {
 \r
     /**\r
       execute\r
-     \r
+\r
       FlashMapTask execute function is to assemble tool command line & execute\r
       tool command line\r
-     \r
+\r
       @throws BuidException\r
      **/\r
     public void execute() throws BuildException {\r
+        /*\r
         if (isUptodate()) {\r
-            EdkLog.log(this, EdkLog.EDK_VERBOSE, headerFile.toFileList() \r
+            EdkLog.log(this, EdkLog.EDK_VERBOSE, headerFile.toFileList()\r
                                                  + imageOutFile.toFileList()\r
                                                  + mcoFile.toFileList()\r
                                                  + dscFile.toFileList()\r
@@ -145,6 +146,7 @@ public class FlashMapTask extends Task implements EfiDefine {
                                                  + " is/are up-to-date!");\r
             return;\r
         }\r
+        */\r
 \r
         Project project = this.getOwningTarget().getProject();\r
         //\r
@@ -193,19 +195,19 @@ public class FlashMapTask extends Task implements EfiDefine {
             runner.setCommandline(cmdline.getCommandline());\r
 \r
             if (outputDir != null) {\r
-                runner.setWorkingDirectory(new File(outputDir)); \r
+                runner.setWorkingDirectory(new File(outputDir));\r
             }\r
             //\r
             // log command line string.\r
             //\r
             EdkLog.log(this, EdkLog.EDK_VERBOSE, Commandline.toString(cmdline.getCommandline()));\r
-            EdkLog.log(this, flashDefFile.toFileList() \r
+            EdkLog.log(this, flashDefFile.toFileList()\r
                              + mciFile.toFileList()\r
                              + mciFileArray.toFileList()\r
                              + fdImage.toFileList()\r
                              + inStrFile\r
-                             + " => " \r
-                             + headerFile.toFileList() \r
+                             + " => "\r
+                             + headerFile.toFileList()\r
                              + imageOutFile.toFileList()\r
                              + mcoFile.toFileList()\r
                              + dscFile.toFileList()\r
@@ -229,9 +231,9 @@ public class FlashMapTask extends Task implements EfiDefine {
 \r
     /**\r
       getFlashDefFile\r
-     \r
+\r
       This function is to get class member "flashDefFile"\r
-     \r
+\r
       @return flashDeFile Name of flash definition file.\r
      **/\r
     public String getFlashDefFile() {\r
@@ -240,9 +242,9 @@ public class FlashMapTask extends Task implements EfiDefine {
 \r
     /**\r
       setFlashDefFile\r
-     \r
+\r
       This function is to set class member "flashDefFile"\r
-     \r
+\r
       @param flashDefFile\r
                  Name of flash definition file.\r
      **/\r
@@ -252,9 +254,9 @@ public class FlashMapTask extends Task implements EfiDefine {
 \r
     /**\r
       getAligment\r
-     \r
+\r
       This function is to get class member "aligment"\r
-     \r
+\r
       @return aligment String of aligment value.\r
      **/\r
     public String getAligment() {\r
@@ -263,9 +265,9 @@ public class FlashMapTask extends Task implements EfiDefine {
 \r
     /**\r
       setAligment\r
-     \r
+\r
       This function is to set class member "aligment"\r
-     \r
+\r
       @param aligment\r
                  String of aligment value.\r
      **/\r
@@ -275,9 +277,9 @@ public class FlashMapTask extends Task implements EfiDefine {
 \r
     /**\r
       getAsmIncFile\r
-     \r
+\r
       This function is to get class member "asmIncFile"\r
-     \r
+\r
       @return asmIncFile String of ASM include file.\r
      **/\r
     public String getAsmIncFile() {\r
@@ -286,9 +288,9 @@ public class FlashMapTask extends Task implements EfiDefine {
 \r
     /**\r
       setAsmIncFile\r
-     \r
+\r
       This function is to set class member "asmIncFile"\r
-     \r
+\r
       @param asmIncFile\r
                  String of ASM include file.\r
      **/\r
@@ -298,9 +300,9 @@ public class FlashMapTask extends Task implements EfiDefine {
 \r
     /**\r
       getBaseAddr\r
-     \r
+\r
       This function is to get class member "baseAddr"\r
-     \r
+\r
       @return baseAddr String of base address value.\r
      **/\r
     public String getBaseAddr() {\r
@@ -309,9 +311,9 @@ public class FlashMapTask extends Task implements EfiDefine {
 \r
     /**\r
       setBaseAddr\r
-     \r
+\r
       This function is to set class member "baseAddr"\r
-     \r
+\r
       @param baseAddr\r
                  String of base address value.\r
      **/\r
@@ -321,9 +323,9 @@ public class FlashMapTask extends Task implements EfiDefine {
 \r
     /**\r
       getDscFile\r
-     \r
+\r
       This function is to get class member "dscFile"\r
-     \r
+\r
       @return dscFile name of DSC file\r
      **/\r
     public String getDscFile() {\r
@@ -332,9 +334,9 @@ public class FlashMapTask extends Task implements EfiDefine {
 \r
     /**\r
       setDscFile\r
-     \r
+\r
       This function is to set class member "dscFile"\r
-     \r
+\r
       @param dscFile\r
                  name of DSC file\r
      **/\r
@@ -344,9 +346,9 @@ public class FlashMapTask extends Task implements EfiDefine {
 \r
     /**\r
       getFdImage\r
-     \r
+\r
       This function is to get class member "fdImage"\r
-     \r
+\r
       @return fdImage name of input FDI image file.\r
      **/\r
     public String getFdImage() {\r
@@ -355,9 +357,9 @@ public class FlashMapTask extends Task implements EfiDefine {
 \r
     /**\r
       setFdImage\r
-     \r
+\r
       This function is to set class member "fdImage"\r
-     \r
+\r
       @param fdImage\r
                  name of input FDI image file.\r
      **/\r
@@ -367,9 +369,9 @@ public class FlashMapTask extends Task implements EfiDefine {
 \r
     /**\r
       getFlashDevice\r
-     \r
+\r
       This function is to get class member "flashDevice".\r
-     \r
+\r
       @return flashDevice name of flash device.\r
      **/\r
     public String getFlashDevice() {\r
@@ -378,9 +380,9 @@ public class FlashMapTask extends Task implements EfiDefine {
 \r
     /**\r
       setFlashDevice\r
-     \r
+\r
       This function is to set class member "flashDevice"\r
-     \r
+\r
       @param flashDevice\r
                  name of flash device.\r
      **/\r
@@ -390,9 +392,9 @@ public class FlashMapTask extends Task implements EfiDefine {
 \r
     /**\r
       getFlashDeviceImage\r
-     \r
+\r
       This function is to get class member "flashDeviceImage"\r
-     \r
+\r
       @return flashDeviceImage name of flash device image\r
      **/\r
     public String getFlashDeviceImage() {\r
@@ -401,9 +403,9 @@ public class FlashMapTask extends Task implements EfiDefine {
 \r
     /**\r
       setFlashDeviceImage\r
-     \r
+\r
       This function is to set class member "flashDeviceImage"\r
-     \r
+\r
       @param flashDeviceImage\r
                  name of flash device image\r
      **/\r
@@ -414,9 +416,9 @@ public class FlashMapTask extends Task implements EfiDefine {
 \r
     /**\r
       getHeaderFile\r
-     \r
+\r
       This function is to get class member "headerFile"\r
-     \r
+\r
       @return headerFile name of include file\r
      **/\r
     public String getHeaderFile() {\r
@@ -425,9 +427,9 @@ public class FlashMapTask extends Task implements EfiDefine {
 \r
     /**\r
       setHeaderFile\r
-     \r
+\r
       This function is to set class member "headerFile"\r
-     \r
+\r
       @param headerFile\r
                  name of include file\r
      **/\r
@@ -437,9 +439,9 @@ public class FlashMapTask extends Task implements EfiDefine {
 \r
     /**\r
       getImageOutFile\r
-     \r
+\r
       This function is to get class member "imageOutFile"\r
-     \r
+\r
       @return imageOutFile name of output image file\r
      **/\r
     public String getImageOutFile() {\r
@@ -448,9 +450,9 @@ public class FlashMapTask extends Task implements EfiDefine {
 \r
     /**\r
       setImageOutFile\r
-     \r
+\r
       This function is to set class member "ImageOutFile"\r
-     \r
+\r
       @param imageOutFile\r
                  name of output image file\r
      **/\r
@@ -460,9 +462,9 @@ public class FlashMapTask extends Task implements EfiDefine {
 \r
     /**\r
       getInStrFile\r
-     \r
+\r
       This function is to get class member "inStrFile"\r
-     \r
+\r
       @return inStrFile name of input file which used to replace symbol names.\r
      **/\r
     public String getInStrFile() {\r
@@ -471,9 +473,9 @@ public class FlashMapTask extends Task implements EfiDefine {
 \r
     /**\r
       setInStrFile\r
-     \r
+\r
       This function is to set class member "inStrFile"\r
-     \r
+\r
       @param inStrFile\r
                  name of input file which used to replace symbol names.\r
      **/\r
@@ -483,9 +485,9 @@ public class FlashMapTask extends Task implements EfiDefine {
 \r
     /**\r
       getMciFile\r
-     \r
+\r
       This function is to get class member "mciFile"\r
-     \r
+\r
       @return mciFile name of input microcode file\r
      **/\r
     public String getMciFile() {\r
@@ -494,9 +496,9 @@ public class FlashMapTask extends Task implements EfiDefine {
 \r
     /**\r
       setMciFile\r
-     \r
+\r
       This function is to set class member "mciFile"\r
-     \r
+\r
       @param mciFile\r
                  name of input microcode file\r
      **/\r
@@ -506,9 +508,9 @@ public class FlashMapTask extends Task implements EfiDefine {
 \r
     /**\r
       getMcoFile\r
-     \r
+\r
       This function is to get class member "mcoFile"\r
-     \r
+\r
       @return mcoFile name of output binary microcode image\r
      **/\r
     public String getMcoFile() {\r
@@ -517,9 +519,9 @@ public class FlashMapTask extends Task implements EfiDefine {
 \r
     /**\r
       setMcoFile\r
-     \r
+\r
       This function is to set class member "mcoFile"\r
-     \r
+\r
       @param mcoFile\r
                  name of output binary microcode image\r
      **/\r
@@ -529,9 +531,9 @@ public class FlashMapTask extends Task implements EfiDefine {
 \r
     /**\r
       getOutStrFile\r
-     \r
+\r
       This function is to get class member "outStrFile"\r
-     \r
+\r
       @return outStrFile name of output string substitution file\r
      **/\r
     public String getOutStrFile() {\r
@@ -540,9 +542,9 @@ public class FlashMapTask extends Task implements EfiDefine {
 \r
     /**\r
       setOutStrFile\r
-     \r
+\r
       This function is to set class member "outStrFile"\r
-     \r
+\r
       @param outStrFile\r
                  name of output string substitution file\r
      **/\r
@@ -552,9 +554,9 @@ public class FlashMapTask extends Task implements EfiDefine {
 \r
     /**\r
       getPadValue\r
-     \r
+\r
       This function is to get class member "padValue"\r
-     \r
+\r
       @return padValue string of byte value to use as padding\r
      **/\r
     public String getPadValue() {\r
@@ -563,9 +565,9 @@ public class FlashMapTask extends Task implements EfiDefine {
 \r
     /**\r
       setPadValue\r
-     \r
+\r
       This function is to set class member "padValue"\r
-     \r
+\r
       @param padValue\r
                  string of byte value to use as padding\r
      **/\r
@@ -575,9 +577,9 @@ public class FlashMapTask extends Task implements EfiDefine {
 \r
     /**\r
       addMciFile\r
-     \r
+\r
       This function is to add Microcode binary file\r
-     \r
+\r
       @param mciFile\r
                  instance of input class\r
      **/\r
@@ -588,9 +590,9 @@ public class FlashMapTask extends Task implements EfiDefine {
 \r
     /**\r
       getOutputDir\r
-     \r
+\r
       This function is to get class member "outputDir"\r
-     \r
+\r
       @return outputDir string of output directory\r
      **/\r
     public String getOutputDir() {\r
@@ -599,9 +601,9 @@ public class FlashMapTask extends Task implements EfiDefine {
 \r
     /**\r
       setOutputDir\r
-     \r
+\r
       This function is to set class member "outputDir"\r
-     \r
+\r
       @param outputDir\r
                  string of output directory\r
      **/\r
@@ -611,7 +613,7 @@ public class FlashMapTask extends Task implements EfiDefine {
 \r
     //\r
     // Dependency check\r
-    // \r
+    //\r
     private boolean isUptodate() {\r
         long srcTimeStamp = 0;\r
         String srcName = "";\r