IntelFsp2Pkg: FSPI_UPD is not mandatory.
REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3993 FSPI_UPD is required only When platforms implemented FSP_I component. Updated the scripts to allow FSPI_UPD not present scenario. Also fixed FSP_GLOBAL_DATA structure alignment issue and unnecessary non-backward compatibility change in previous FSP_I patch. Cc: Nate DeSimone <nathaniel.l.desimone@intel.com> Cc: Star Zeng <star.zeng@intel.com> Signed-off-by: Chasel Chiu <chasel.chiu@intel.com> Reviewed-by: Star Zeng <star.zeng@intel.com>
This commit is contained in:
committed by
mergify[bot]
parent
0e7add1d75
commit
3eca64f157
@@ -959,8 +959,13 @@ EndList
|
||||
UpdTxtFile = ''
|
||||
FvDir = self._FvDir
|
||||
if GuidList[Index] not in self._MacroDict:
|
||||
self.Error = "%s definition is missing in DSC file" % (GuidList[Index])
|
||||
return 1
|
||||
NoFSPI = False
|
||||
if GuidList[Index] == 'FSP_I_UPD_TOOL_GUID':
|
||||
NoFSPI = True
|
||||
continue
|
||||
else:
|
||||
self.Error = "%s definition is missing in DSC file" % (GuidList[Index])
|
||||
return 1
|
||||
|
||||
if UpdTxtFile == '':
|
||||
UpdTxtFile = os.path.join(FvDir, self._MacroDict[GuidList[Index]] + '.txt')
|
||||
@@ -1296,7 +1301,8 @@ EndList
|
||||
elif '_S' in SignatureStr[6:6+2]:
|
||||
TxtBody.append("#define FSPS_UPD_SIGNATURE %s /* '%s' */\n\n" % (Item['value'], SignatureStr))
|
||||
elif '_I' in SignatureStr[6:6+2]:
|
||||
TxtBody.append("#define FSPI_UPD_SIGNATURE %s /* '%s' */\n\n" % (Item['value'], SignatureStr))
|
||||
if NoFSPI == True:
|
||||
TxtBody.append("#define FSPI_UPD_SIGNATURE %s /* '%s' */\n\n" % (Item['value'], SignatureStr))
|
||||
TxtBody.append("\n")
|
||||
|
||||
for Region in ['UPD']:
|
||||
@@ -1702,7 +1708,7 @@ EndList
|
||||
|
||||
|
||||
def Usage():
|
||||
print ("GenCfgOpt Version 0.58")
|
||||
print ("GenCfgOpt Version 0.59")
|
||||
print ("Usage:")
|
||||
print (" GenCfgOpt UPDTXT PlatformDscFile BuildFvDir [-D Macros]")
|
||||
print (" GenCfgOpt HEADER PlatformDscFile BuildFvDir InputHFile [-D Macros]")
|
||||
|
Reference in New Issue
Block a user