dasharo/slimbootloader
0
0
Fork 0
mirror of https://github.com/Dasharo/slimbootloader.git synced 2026-03-06 15:26:20 -08:00
Code Issues Packages Projects Releases Wiki Activity

Enhance GenCfgData tool

Browse Source 
Currently GenCfgData.py tool could open generated
CfgDataDef.dsc, but could not open CfgDataDef.dsc
in the source code since it includes other DSC files
in CommonBoardPkg. The files could not be found by
default if SBL_SOURCE is not defined.
This patch would search DSC in CommonBoardPkg, so
even SBL_SOURCE is not defined, it could still open
CfgDataDef.dsc.

Signed-off-by: Guo Dong <guo.dong@intel.com>
This commit is contained in:
Guo Dong
2018-10-26 12:05:48 -07:00
committed by Maurice Ma
parent 03385ca8a7
commit 3fe37921b1
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
BootloaderCorePkg/Tools/GenCfgData.py
+8 -5
View File
@@ -638,17 +638,20 @@ EndList
Handle = True
if Handle:
if Keyword == 'include':
IncludeFilePath1 = Remaining
IncludeFilePath1 = self.ExpandMacros(IncludeFilePath1)
Remaining = self.ExpandMacros(Remaining)
# Relative to DSC filepath
IncludeFilePath = os.path.join(os.path.dirname(DscFile), IncludeFilePath1)
IncludeFilePath = os.path.join(os.path.dirname(DscFile), Remaining)
if not os.path.exists(IncludeFilePath):
IncludeFilePath = os.path.join(os.environ['SBL_SOURCE'], IncludeFilePath1)
# Relative to repository to find dsc in common platform
IncludeFilePath = os.path.join(os.path.dirname(DscFile), "../../..", Remaining)
if (not os.path.exists(IncludeFilePath)) and ('SBL_SOURCE' in os.environ):
# Relative to SBL_SOURCE if it is defined.
IncludeFilePath = os.path.join(os.environ['SBL_SOURCE'], Remaining)
try:
IncludeDsc = open(IncludeFilePath, "r")
except:
raise Exception ("ERROR: Cannot open file '%s'" % IncludeFilePath)
raise Exception ("ERROR: Cannot open file '%s',\n Please check if env variable SBL_SOURCE is set correctly." % IncludeFilePath)
NewDscLines = IncludeDsc.readlines()
IncludeDsc.close()
DscLines = NewDscLines + DscLines