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