On 8/12/21 4:59 PM, Sean Brogan wrote:

This seems like a bad place for a general purpose lib that many other platforms may take a dependency on.

In v1 this was SecurityPkg.  OvmfPkg is a platform package and therefore not a good place to define broad interfaces.

What caused this to move here?

Option 2 from this message: https://listman.redhat.com/archives/edk2-devel-archive/2021-August/msg00398.html   Stefan

Thanks
Sean

REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3562
Create a new build option to enable vfrcompile to generate Json
format EFI variable information file and read it to generate
the EFI variable default value binary file.
Signed-off-by: Bob Feng <bob.c.feng@...>
Cc: Liming Gao <gaoliming@...>
Cc: Yuwei Chen <yuwei.chen@...>
---
BaseTools/Source/Python/AutoGen/DataPipe.py | 2 +
.../Source/Python/AutoGen/GenDefaultVar.py | 498 ++++++++++++++++++
.../Source/Python/AutoGen/ModuleAutoGen.py | 9 +
.../Python/AutoGen/ModuleAutoGenHelper.py | 4 +
BaseTools/Source/Python/Common/GlobalData.py | 5 +
BaseTools/Source/Python/build/build.py | 18 +
BaseTools/Source/Python/build/buildoptions.py | 1 +
7 files changed, 537 insertions(+)
create mode 100644 BaseTools/Source/Python/AutoGen/GenDefaultVar.py
diff --git a/BaseTools/Source/Python/AutoGen/DataPipe.py b/BaseTools/Source/Python/AutoGen/DataPipe.py
index 86ac2b928d9c..fa0c36b98f21 100755
--- a/BaseTools/Source/Python/AutoGen/DataPipe.py
+++ b/BaseTools/Source/Python/AutoGen/DataPipe.py
@@ -165,5 +165,7 @@ class MemoryDataPipe(DataPipe):
self.DataContainer = {"BinCacheSource":GlobalData.gBinCacheSource}
self.DataContainer = {"BinCacheDest":GlobalData.gBinCacheDest}
self.DataContainer = {"EnableGenfdsMultiThread":GlobalData.gEnableGenfdsMultiThread}
+
+ self.DataContainer = {"GenDefaultVarBin": GlobalData.gGenDefaultVarBin}
diff --git a/BaseTools/Source/Python/AutoGen/GenDefaultVar.py b/BaseTools/Source/Python/AutoGen/GenDefaultVar.py
new file mode 100644
index 000000000000..b82cce18ed26
--- /dev/null
+++ b/BaseTools/Source/Python/AutoGen/GenDefaultVar.py
@@ -0,0 +1,498 @@
+import json
+from ctypes import *
+import re
+import copy
+from struct import unpack
+import os
+
+class GUID(Structure):
+ _fields_ = [
+ ('Guid1', c_uint32),
+ ('Guid2', c_uint16),
+ ('Guid3', c_uint16),
+ ('Guid4', ARRAY(c_uint8, 8)),
+ ]
+
+ def from_list(self, listformat):
+ self.Guid1 = listformat[0]
+ self.Guid2 = listformat[1]
+ self.Guid3 = listformat[2]
+ for i in range(8):
+ self.Guid4[i] = listformat[i+3]
+
+ def __cmp__(self, otherguid):
+ if isinstance(otherguid, GUID):
+ return 1
+ rt = False
+ if self.Guid1 == otherguid.Guid1 and self.Guid2 == otherguid.Guid2 and self.Guid3 == otherguid.Guid3:
+ rt = True
+ for i in range(8):
+ rt = rt & (self.Guid4[i] == otherguid.Guid4[i])
+ return rt
+
+
+class TIME(Structure):
+ _fields_ = [
+ ('Year', c_uint16),
+ ('Month', c_uint8),
+ ('Day', c_uint8),
+ ('Hour', c_uint8),
+ ('Minute', c_uint8),
+ ('Second', c_uint8),
+ ('Pad1', c_uint8),
+ ('Nanosecond', c_uint32),
+ ('TimeZone', c_uint16),
+ ('Daylight', c_uint8),
+ ('Pad2', c_uint8),
+ ]
+ def __init__(self):
+ self.Year = 0x0
+ self.Month = 0x0
+ self.Day = 0x0
+ self.Hour = 0x0
+ self.Minute = 0x0
+ self.Second = 0x0
+ self.Pad1 = 0x0
+ self.Nanosecond = 0x0
+ self.TimeZone = 0x0
+ self.Daylight = 0x0
+ self.Pad2 = 0x0
+
+
+EFI_VARIABLE_GUID = [0xddcf3616, 0x3275, 0x4164,
+ 0x98, 0xb6, 0xfe, 0x85, 0x70, 0x7f, 0xfe, 0x7d]
+EFI_AUTHENTICATED_VARIABLE_GUID = [
+ 0xaaf32c78, 0x947b, 0x439a, 0xa1, 0x80, 0x2e, 0x14, 0x4e, 0xc3, 0x77, 0x92]
+
+AuthVarGuid = GUID()
+AuthVarGuid.from_list(EFI_AUTHENTICATED_VARIABLE_GUID)
+VarGuid = GUID()
+VarGuid.from_list(EFI_VARIABLE_GUID)
+
+# Variable Store Header Format.
+VARIABLE_STORE_FORMATTED = 0x5a
+# Variable Store Header State.
+VARIABLE_STORE_HEALTHY = 0xfe
+
+
+class VARIABLE_STORE_HEADER(Structure):
+ _fields_ = [
+ ('Signature', GUID),
+ ('Size', c_uint32),
+ ('Format', c_uint8),
+ ('State', c_uint8),
+ ('Reserved', c_uint16),
+ ('Reserved1', c_uint32),
+ ]
+
+
+# Variable data start flag.
+VARIABLE_DATA = 0x55AA
+
+# Variable State flags.
+VAR_IN_DELETED_TRANSITION = 0xfe
+VAR_DELETED = 0xfd
+VAR_HEADER_VALID_ONLY = 0x7f
+VAR_ADDED = 0x3f
+
+
+class VARIABLE_HEADER(Structure):
+ _fields_ = [
+ ('StartId', c_uint16),
+ ('State', c_uint8),
+ ('Reserved', c_uint8),
+ ('Attributes', c_uint32),
+ ('NameSize', c_uint32),
+ ('DataSize', c_uint32),
+ ('VendorGuid', GUID),
+ ]
+
+
+class AUTHENTICATED_VARIABLE_HEADER(Structure):
+ _fields_ = [
+ ('StartId', c_uint16),
+ ('State', c_uint8),
+ ('Reserved', c_uint8),
+ ('Attributes', c_uint32),
+ ('MonotonicCount', c_uint64),
+ ('TimeStamp', TIME),
+ ('PubKeyIndex', c_uint32),
+ ('NameSize', c_uint32),
+ ('DataSize', c_uint32),
+ ('VendorGuid', GUID),
+ ]
+ _pack_ = 1
+
+
+# Alignment of Variable Data Header in Variable Store region.
+HEADER_ALIGNMENT = 4
+
+
+class DEFAULT_INFO(Structure):
+ _fields_ = [
+ ('DefaultId', c_uint16),
+ ('BoardId', c_uint16),
+ ]
+
+
+class DEFAULT_DATA(Structure):
+ _fields_ = [
+ ('HeaderSize', c_uint16),
+ ('DefaultInfo', DEFAULT_INFO),
+ ]
+
+class DELTA_DATA(Structure):
+ _fields_ = [
+ ('Offset', c_uint16),
+ ('Value', c_uint8),
+ ]
+ _pack_ = 1
+
+array_re = re.compile(
+ "(?P<mType>[a-z_A-Z][a-z_A-Z0-9]*)\[(?P<mSize>[1-9][0-9]*)\]")
+
+
+class VarField():
+ def __init__(self):
+ self.Offset = 0
+ self.Value = 0
+ self.Size = 0
+
+ @property
+ def Type(self):
+ if self.Size == 1:
+ return "UINT8"
+ if self.Size == 2:
+ return "UINT16"
+ if self.Size == 4:
+ return "UINT32"
+ if self.Size == 8:
+ return "UINT64"
+
+ return "UINT8"
+
+
+BASIC_TYPE = {
+ "BOOLEAN": 1,
+ "UINT8": 1,
+ "UINT16": 2,
+ "UINT32": 4,
+ "UINT64": 8
+}
+class CStruct():
+
+
+ def __init__(self, typedefs):
+ self.TypeDefs = typedefs
+ self.TypeStack = copy.deepcopy(typedefs)
+ self.finalDefs = {}
+
+ def CalStuctSize(self, sType):
+ rt = 0
+ if sType in BASIC_TYPE:
+ return BASIC_TYPE[sType]
+
+ ma = array_re.match(sType)
+ if ma:
+ mType = ma.group('mType')
+ mSize = ma.group('mSize')
+ rt += int(mSize) * self.CalStuctSize(mType)
+ else:
+ for subType in self.TypeDefs[sType]:
+ rt += self.CalStuctSize(subType['Type'])
+
+ return rt
+
+ def expend(self, fielditem):
+ fieldname = fielditem['Name']
+ fieldType = fielditem['Type']
+ fieldOffset = fielditem['Offset']
+
+ ma = array_re.match(fieldType)
+ if ma:
+ mType = ma.group('mType')
+ mSize = ma.group('mSize')
+ return [{"Name": "%s[%d]" % (fieldname, i), "Type": mType, "Offset": (fieldOffset + i*self.CalStuctSize(mType))} for i in range(int(mSize))]
+ else:
+ return [{"Name": "%s.%s" % (fieldname, item['Name']), "Type":item['Type'], "Offset": (fieldOffset + item['Offset'])} for item in self.TypeDefs[fielditem['Type']]]
+
+ def ExpandTypes(self):
+ if not self.finalDefs:
+ for datatype in self.TypeStack:
+ result = []
+ mTypeStack = self.TypeStack[datatype]
+ while len(mTypeStack) > 0:
+ item = mTypeStack.pop()
+ if item['Type'] in self.BASIC_TYPE:
+ result.append(item)
+ elif item['Type'] == '(null)':
+ continue
+ else:
+ for expand_item in self.expend(item):
+ mTypeStack.append(expand_item)
+ self.finalDefs[datatype] = result
+ self.finalDefs
+ return self.finalDefs
+
+def Get_Occupied_Size(FileLength, alignment):
+ if FileLength % alignment == 0:
+ return FileLength
+ return FileLength + (alignment-(FileLength % alignment))
+
+def Occupied_Size(buffer, alignment):
+ FileLength = len(buffer)
+ if FileLength % alignment != 0:
+ buffer += b'\0' * (alignment-(FileLength % alignment))
+ return buffer
+
+def PackStruct(cStruct):
+ length = sizeof(cStruct)
+ p = cast(pointer(cStruct), POINTER(c_char * length))
+ return p.contents.raw
+
+def calculate_delta(default, theother):
+
+ if len(default) - len(theother) != 0:
+ return []
+
+ data_delta = []
+ for i in range(len(default)):
+ if default[i] != theother[i]:
+ data_delta.append([i, theother[i]])
+ return data_delta
+
+class Variable():
+ def __init__(self):
+ self.mAlign = 1
+ self.mTotalSize = 1
+ self.mValue = {} # {defaultstore: value}
+ self.mBin = {}
+ self.fields = {} # {defaultstore: fileds}
+ self.delta = {}
+ self.attributes = 0
+ self.mType = ''
+ self.guid = ''
+ self.mName = ''
+ self.cDefs = None
+
+ @property
+ def GuidArray(self):
+
+ guid_array = []
+ guid = self.guid.strip().strip("{").strip("}")
+ for item in guid.split(","):
+ field = item.strip().strip("{").strip("}")
+ guid_array.append(int(field,16))
+ return guid_array
+
+ def update_delta_offset(self,base):
+ for default_id in self.delta:
+ for delta_list in self.delta[default_id]:
+ delta_list[0] += base
+
+ def pack(self):
+
+ for defaultid in self.mValue:
+ var_value = self.mValue[defaultid]
+ auth_var = AUTHENTICATED_VARIABLE_HEADER()
+ auth_var.StartId = VARIABLE_DATA
+ auth_var.State = VAR_ADDED
+ auth_var.Reserved = 0x00
+ auth_var.Attributes = 0x00000007
+ auth_var.MonotonicCount = 0x0
+ auth_var.TimeStamp = TIME()
+ auth_var.PubKeyIndex = 0x0
+ var_name_buffer = self.mName.encode('utf-16le') + b'\0\0'
+ auth_var.NameSize = len(var_name_buffer)
+ auth_var.DataSize = len(var_value)
+ vendor_guid = GUID()
+ vendor_guid.from_list(self.GuidArray)
+ auth_var.VendorGuid = vendor_guid
+
+ self.mBin[defaultid] = PackStruct(auth_var) + Occupied_Size(var_name_buffer + var_value, 4)
+
+ def TypeCheck(self,data_type, data_size):
+ if BASIC_TYPE[data_type] == data_size:
+ return True
+ return False
+
+ def ValueToBytes(self,data_type,data_value,data_size):
+
+ rt = b''
+ if not self.TypeCheck(data_type, data_size):
+ print(data_type,data_value,data_size)
+
+ if data_type == "BOOLEAN" or data_type == 'UINT8':
+ p = cast(pointer(c_uint8(int(data_value,16))), POINTER(c_char * 1))
+ rt = p.contents.raw
+ elif data_type == 'UINT16':
+ p = cast(pointer(c_uint16(int(data_value,16))), POINTER(c_char * 2))
+ rt = p.contents.raw
+ elif data_type == 'UINT32':
+ p = cast(pointer(c_uint32(int(data_value,16))), POINTER(c_char * 4))
+ rt = p.contents.raw
+ elif data_type == 'UINT64':
+ p = cast(pointer(c_uint64(int(data_value,16))), POINTER(c_char * 8))
+ rt = p.contents.raw
+
+ return rt
+
+ def serial(self):
+ for defaultstore in self.fields:
+ vValue = b''
+ vfields = {vf.Offset: vf for vf in self.fields[defaultstore]}
+ i = 0
+ while i < self.mTotalSize:
+ if i in vfields:
+ vfield = vfields[i]
+ vValue += self.ValueToBytes(vfield.Type, vfield.Value,vfield.Size)
+ i += vfield.Size
+ else:
+ vValue += self.ValueToBytes('UINT8','0x00',1)
+ i += 1
+
+ self.mValue[defaultstore] = vValue
+ standard_default = self.mValue[0]
+
+ for defaultid in self.mValue:
+ if defaultid == 0:
+ continue
+ others_default = self.mValue[defaultid]
+
+ self.delta.setdefault(defaultid, []).extend(calculate_delta(
+ standard_default, others_default))
+
+class DefaultVariableGenerator():
+ def __init__(self):
+ self.NvVarInfo = []
+
+ def LoadNvVariableInfo(self, VarInfoFilelist):
+
+ VarDataDict = {}
+ DataStruct = {}
+ VarDefine = {}
+ VarAttributes = {}
+ for VarInfoFile in VarInfoFilelist:
+ with open(VarInfoFile.strip(), "r") as fd:
+ data = json.load(fd)
+
+ DataStruct.update(data.get("DataStruct", {}))
+ Data = data.get("Data")
+ VarDefine.update(data.get("VarDefine"))
+ VarAttributes.update(data.get("DataStructAttribute"))
+
+ for vardata in Data:
+ if vardata['VendorGuid'] == 'NA':
+ continue
+ VarDataDict.setdefault(
+ (vardata['VendorGuid'], vardata["VarName"]), []).append(vardata)
+
+ cStructDefs = CStruct(DataStruct)
+ for guid, varname in VarDataDict:
+ v = Variable()
+ v.guid = guid
+ vardef = VarDefine.get(varname)
+ if vardef is None:
+ for var in VarDefine:
+ if VarDefine[var]['Type'] == varname:
+ vardef = VarDefine[var]
+ break
+ else:
+ continue
+ v.attributes = vardef['Attributes']
+ v.mType = vardef['Type']
+ v.mAlign = VarAttributes[v.mType]['Alignment']
+ v.mTotalSize = VarAttributes[v.mType]['TotalSize']
+ v.Struct = DataStruct[v.mType]
+ v.mName = varname
+ v.cDefs = cStructDefs
+ for fieldinfo in VarDataDict.get((guid, varname), []):
+ vf = VarField()
+ vf.Offset = fieldinfo['Offset']
+ vf.Value = fieldinfo['Value']
+ vf.Size = fieldinfo['Size']
+ v.fields.setdefault(
+ int(fieldinfo['DefaultStore'], 10), []).append(vf)
+ v.serial()
+ v.pack()
+ self.NvVarInfo.append(v)
+
+ def PackDeltaData(self):
+
+ default_id_set = set()
+ for v in self.NvVarInfo:
+ default_id_set |= set(v.mBin.keys())
+
+ if default_id_set:
+ default_id_set.remove(0)
+ delta_buff_set = {}
+ for defaultid in default_id_set:
+ delta_buff = b''
+ for v in self.NvVarInfo:
+ delta_list = v.delta.get(defaultid,[])
+ for delta in delta_list:
+ delta_data = DELTA_DATA()
+ delta_data.Offset, delta_data.Value = delta
+ delta_buff += PackStruct(delta_data)
+ delta_buff_set[defaultid] = delta_buff
+
+ return delta_buff_set
+
+ def PackDefaultData(self):
+
+ default_data_header = DEFAULT_DATA()
+ default_data_header.HeaderSize = sizeof(DEFAULT_DATA)
+ default_data_header.DefaultInfo.DefaultId = 0x0
+ default_data_header.DefaultInfo.BoardId = 0x0
+ default_data_header_buffer = PackStruct(default_data_header)
+
+
+ variable_store = VARIABLE_STORE_HEADER()
+ variable_store.Signature = AuthVarGuid
+
+ variable_store_size = Get_Occupied_Size(sizeof(DEFAULT_DATA) + sizeof(VARIABLE_STORE_HEADER), 4)
+ for v in self.NvVarInfo:
+ variable_store_size += Get_Occupied_Size(len(v.mBin[0]), 4)
+
+ variable_store.Size = variable_store_size
+ variable_store.Format = VARIABLE_STORE_FORMATTED
+ variable_store.State = VARIABLE_STORE_HEALTHY
+ variable_store.Reserved = 0x0
+ variable_store.Reserved2 = 0x0
+
+ variable_storage_header_buffer = PackStruct(variable_store)
+
+ variable_data = b''
+ v_offset = 0
+ for v in self.NvVarInfo:
+ v.update_delta_offset(v_offset)
+ variable_data += Occupied_Size(v.mBin[0],4)
+ v_offset += Get_Occupied_Size(len(v.mBin[0]),4)
+
+
+ final_buff = Occupied_Size(default_data_header_buffer + variable_storage_header_buffer,4) + variable_data
+
+ return final_buff
+
+ def generate(self, jsonlistfile,output_folder):
+ if not os.path.exists(jsonlistfile):
+ return
+ if not os.path.exists(output_folder):
+ os.makedirs(output_folder)
+ try:
+ with open(jsonlistfile,"r") as fd:
+ filelist = fd.readlines()
+ genVar = DefaultVariableGenerator()
+ genVar.LoadNvVariableInfo(filelist)
+ with open(os.path.join(output_folder, "default.bin"), "wb") as fd:
+ fd.write(genVar.PackDefaultData())
+
+ delta_set = genVar.PackDeltaData()
+ for default_id in delta_set:
+ with open(os.path.join(output_folder, "defaultdelta_%s.bin" % default_id), "wb") as fd:
+ fd.write(delta_set[default_id])
+ except:
+ print("generate varbin file failed")
+
+
+
diff --git a/BaseTools/Source/Python/AutoGen/ModuleAutoGen.py b/BaseTools/Source/Python/AutoGen/ModuleAutoGen.py
index d70b0d7ae828..0daf3352f91b 100755
--- a/BaseTools/Source/Python/AutoGen/ModuleAutoGen.py
+++ b/BaseTools/Source/Python/AutoGen/ModuleAutoGen.py
@@ -433,10 +433,19 @@ class ModuleAutoGen(AutoGen):
## Return the directory to store auto-gened source files of the module
@cached_property
def DebugDir(self):
return _MakeDir((self.BuildDir, "DEBUG"))
+
+ @cached_property
+ def DefaultVarJsonFiles(self):
+ rt = []
+ for SrcFile in self.SourceFileList:
+ if SrcFile.Ext.lower() == '.vfr':
+ rt.append(os.path.join(self.DebugDir,os.path.join(os.path.dirname(SrcFile.File), "{}_var.json".format(SrcFile.BaseName))))
+ return rt
+
## Return the path of custom file
@cached_property
def CustomMakefile(self):
RetVal = {}
for Type in self.Module.CustomMakefile:
diff --git a/BaseTools/Source/Python/AutoGen/ModuleAutoGenHelper.py b/BaseTools/Source/Python/AutoGen/ModuleAutoGenHelper.py
index 036fdac3d7df..b46d041f58ab 100644
--- a/BaseTools/Source/Python/AutoGen/ModuleAutoGenHelper.py
+++ b/BaseTools/Source/Python/AutoGen/ModuleAutoGenHelper.py
@@ -644,10 +644,14 @@ class PlatformInfo(AutoGenInfo):
if Attr != 'PATH':
BuildOptions[ExpandedTool][Attr] += " " + mws.handleWsMacro(Value)
else:
BuildOptions[ExpandedTool][Attr] = mws.handleWsMacro(Value)
+ if self.DataPipe.Get("GenDefaultVarBin"):
+ if BuildOptions.get('VFR',{}).get('FLAGS'):
+ BuildOptions['VFR']['FLAGS'] += " " + "--variable"
+
return BuildOptions, BuildRuleOrder
def ApplyLibraryInstance(self,module):
alldeps = self.DataPipe.Get("DEPS")
if alldeps is None:
diff --git a/BaseTools/Source/Python/Common/GlobalData.py b/BaseTools/Source/Python/Common/GlobalData.py
index 61ab3f7e24cd..c68ca8fbb3f7 100755
--- a/BaseTools/Source/Python/Common/GlobalData.py
+++ b/BaseTools/Source/Python/Common/GlobalData.py
@@ -88,10 +88,15 @@ gIgnoreSource = False
#
gFdfParser = None
BuildOptionPcd = []
+#
+# Build flag for generate default variable binary file
+#
+gGenDefaultVarBin = False
+
#
# Mixed PCD name dict
#
MixedPcd = {}
diff --git a/BaseTools/Source/Python/build/build.py b/BaseTools/Source/Python/build/build.py
index 02b489892422..2f6fc6b20faf 100755
--- a/BaseTools/Source/Python/build/build.py
+++ b/BaseTools/Source/Python/build/build.py
@@ -750,10 +750,11 @@ class Build():
GlobalData.gUseHashCache = BuildOptions.UseHashCache
GlobalData.gBinCacheDest = BuildOptions.BinCacheDest
GlobalData.gBinCacheSource = BuildOptions.BinCacheSource
GlobalData.gEnableGenfdsMultiThread = not BuildOptions.NoGenfdsMultiThread
GlobalData.gDisableIncludePathCheck = BuildOptions.DisableIncludePathCheck
+ GlobalData.gGenDefaultVarBin = BuildOptions.GenDefaultVarBin
if GlobalData.gBinCacheDest and not GlobalData.gUseHashCache:
EdkLogger.error("build", OPTION_NOT_SUPPORTED, ExtraData="--binary-destination must be used together with --hash.")
if GlobalData.gBinCacheSource and not GlobalData.gUseHashCache:
@@ -1459,10 +1460,14 @@ class Build():
self.BuildModules = []
return True
# genfds
if Target == 'fds':
+ if GlobalData.gGenDefaultVarBin:
+ from AutoGen.GenDefaultVar import DefaultVariableGenerator
+ variable_info_filelist = os.path.join(AutoGenObject.BuildDir,"variable_info_filelist.txt")
+ DefaultVariableGenerator().generate(variable_info_filelist,AutoGenObject.FvDir)
if GenFdsApi(AutoGenObject.GenFdsCommandDict, self.Db):
EdkLogger.error("build", COMMAND_FAILURE)
Threshold = self.GetFreeSizeThreshold()
if Threshold:
self.CheckFreeSizeThreshold(Threshold, AutoGenObject.FvDir)
@@ -2247,10 +2252,19 @@ class Build():
AutoGenIdFile = os.path.join(GlobalData.gConfDirectory,".AutoGenIdFile.txt")
with open(AutoGenIdFile,"w") as fw:
fw.write("Arch=%s\n" % "|".join((Wa.ArchList)))
fw.write("BuildDir=%s\n" % Wa.BuildDir)
fw.write("PlatformGuid=%s\n" % str(Wa.AutoGenObjectList[0].Guid))
+ variable_info_filelist = os.path.join(Wa.BuildDir,"variable_info_filelist.txt")
+ vfr_var_json = []
+ if GlobalData.gGenDefaultVarBin:
+ for ma in self.AllModules:
+ vfr_var_json.extend(ma.DefaultVarJsonFiles)
+ SaveFileOnChange(variable_info_filelist, "\n".join(vfr_var_json), False)
+ else:
+ if os.path.exists(variable_info_filelist):
+ os.remove(variable_info_filelist)
if GlobalData.gBinCacheSource:
BuildModules.extend(self.MakeCacheMiss)
elif GlobalData.gUseHashCache and not GlobalData.gBinCacheDest:
BuildModules.extend(self.PreMakeCacheMiss)
@@ -2359,10 +2373,14 @@ class Build():
if self.Fdf:
#
# Generate FD image if there's a FDF file found
#
+ if GlobalData.gGenDefaultVarBin:
+ from AutoGen.GenDefaultVar import DefaultVariableGenerator
+ variable_info_filelist = os.path.join(Wa.BuildDir,"variable_info_filelist.txt")
+ DefaultVariableGenerator().generate(variable_info_filelist,Wa.FvDir)
GenFdsStart = time.time()
if GenFdsApi(Wa.GenFdsCommandDict, self.Db):
EdkLogger.error("build", COMMAND_FAILURE)
Threshold = self.GetFreeSizeThreshold()
if Threshold:
diff --git a/BaseTools/Source/Python/build/buildoptions.py b/BaseTools/Source/Python/build/buildoptions.py
index 39d92cff209d..6886ba7f8eb6 100644
--- a/BaseTools/Source/Python/build/buildoptions.py
+++ b/BaseTools/Source/Python/build/buildoptions.py
@@ -99,7 +99,8 @@ class MyOptionParser():
Parser.add_option("--hash", action="store_true", dest="UseHashCache", default=False, help="Enable hash-based caching during build process.")
Parser.add_option("--binary-destination", action="store", type="string", dest="BinCacheDest", help="Generate a cache of binary files in the specified directory.")
Parser.add_option("--binary-source", action="store", type="string", dest="BinCacheSource", help="Consume a cache of binary files from the specified directory.")
Parser.add_option("--genfds-multi-thread", action="store_true", dest="GenfdsMultiThread", default=True, help="Enable GenFds multi thread to generate ffs file.")
Parser.add_option("--no-genfds-multi-thread", action="store_true", dest="NoGenfdsMultiThread", default=False, help="Disable GenFds multi thread to generate ffs file.")
+ Parser.add_option("--gen-default-variable-bin", action="store_true", dest="GenDefaultVarBin", default=False, help="Generate default variable binary file.")
Parser.add_option("--disable-include-path-check", action="store_true", dest="DisableIncludePathCheck", default=False, help="Disable the include path check for outside of package.")
self.BuildOption, self.BuildTarget = Parser.parse_args()

Good day everyone,
Good day Michael,

The commit that introduced T-RAM evacuation [1] also introduced the function "MigrateSecModulesInFv()". It also is explicitly mentioned as part of the control flow in the commit message. As far as I can see, since then till today this function has never been called anywhere. Was this some draft function that accidentally made it into the patch, or did the caller get lost somewhere? The description makes sense to me and I'm not experienced enough with the PeiCore control flow to tell whether the PEIM migration somehow covers SecCore implicitly. Also I noticed it only supports SecCore in a PE/COFF section, not a TE section. Is there a rationale for that?

Thank you for your time!

Best regards,
Marvin


[1] https://github.com/tianocore/edk2/commit/9bedaec05b7b8ba9aee248361bb61a85a26726cb

-----Original Message-----
From: Marcin Wojtas <mw@...>
Sent: Friday, August 13, 2021 10:42 AM
To: devel@edk2.groups.io
Cc: leif@...; ardb+tianocore@...; Samer El-Haj-Mahmoud
<Samer.El-Haj-Mahmoud@...>; Sunny Wang
<Sunny.Wang@...>; gjb@...; upstream@...;
pete@...; Marcin Wojtas <mw@...>
Subject: [edk2-platforms PATCH] Platform/RaspberryPi: Remove
unnecessary files

Commit 2f0188b56ef4 ("Revert "Platform/RaspberryPi: Setup option for...")
mistakenly introduced to files which are residues from a
conflict resolution. Fix that.

Signed-off-by: Marcin Wojtas <mw@...>
---
Platform/RaspberryPi/RPi4/RPi4.dsc.orig | 760 --------------------
Platform/RaspberryPi/RPi4/RPi4.dsc.rej | 29 -
2 files changed, 789 deletions(-)
delete mode 100644 Platform/RaspberryPi/RPi4/RPi4.dsc.orig
delete mode 100644 Platform/RaspberryPi/RPi4/RPi4.dsc.rej

diff --git a/Platform/RaspberryPi/RPi4/RPi4.dsc.orig
b/Platform/RaspberryPi/RPi4/RPi4.dsc.orig
deleted file mode 100644
index 2c05c31118..0000000000
--- a/Platform/RaspberryPi/RPi4/RPi4.dsc.orig
+++ /dev/null
@@ -1,760 +0,0 @@
-# @file

-#

-# Copyright (c) 2011 - 2020, ARM Limited. All rights reserved.

-# Copyright (c) 2017 - 2018, Andrei Warkentin
<andrey.warkentin@...>

-# Copyright (c) 2015 - 2021, Intel Corporation. All rights reserved.

-# Copyright (c) 2014, Linaro Limited. All rights reserved.

-#

-# SPDX-License-Identifier: BSD-2-Clause-Patent

-#

-##

-

-
##########################################################
######################

-#

-# Defines Section - statements that will be processed to create a Makefile.

-#

-
##########################################################
######################

-[Defines]

- PLATFORM_NAME = RPi4

- PLATFORM_GUID = a7eca3b4-21b0-4989-8c18-c08f3ae87837

- PLATFORM_VERSION = 1.0

- DSC_SPECIFICATION = 0x0001001A

- OUTPUT_DIRECTORY = Build/$(PLATFORM_NAME)

- SUPPORTED_ARCHITECTURES = AARCH64

- BUILD_TARGETS = DEBUG|RELEASE|NOOPT

- SKUID_IDENTIFIER = DEFAULT

- FLASH_DEFINITION =
Platform/RaspberryPi/$(PLATFORM_NAME)/$(PLATFORM_NAME).fdf

-

- #

- # Defines for default states. These can be changed on the command line.

- # -D FLAG=VALUE

- #

- DEFINE SECURE_BOOT_ENABLE = FALSE

- DEFINE INCLUDE_TFTP_COMMAND = FALSE

- DEFINE DEBUG_PRINT_ERROR_LEVEL = 0x8000004F

-

-!ifndef TFA_BUILD_ARTIFACTS

- #

- # Default TF-A binary checked into edk2-non-osi.

- #

- DEFINE TFA_BUILD_BL31 =
Platform/RaspberryPi/$(PLATFORM_NAME)/TrustedFirmware/bl31.bin

-!else

- #

- # Usually we use the checked-in binaries, but for developers working

- # on the firmware, being able to use a local TF-A build without extra copy

- # operations ends up being very helpful.

- #

- DEFINE TFA_BUILD_BL31 = $(TFA_BUILD_ARTIFACTS)/bl31.bin

-!endif

-

-
##########################################################
######################

-#

-# Library Class section - list of all Library Classes needed by this Platform.

-#

-
##########################################################
######################

-

-!include MdePkg/MdeLibs.dsc.inc

-

-[LibraryClasses.common]

-!if $(TARGET) == RELEASE

- DebugLib|MdePkg/Library/BaseDebugLibNull/BaseDebugLibNull.inf

-!else

-
DebugLib|MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPort.
inf

-!endif

-
DebugPrintErrorLevelLib|MdePkg/Library/BaseDebugPrintErrorLevelLib/Bas
eDebugPrintErrorLevelLib.inf

-

- BaseLib|MdePkg/Library/BaseLib/BaseLib.inf

- SafeIntLib|MdePkg/Library/BaseSafeIntLib/BaseSafeIntLib.inf

-
BmpSupportLib|MdeModulePkg/Library/BaseBmpSupportLib/BaseBmpSupp
ortLib.inf

-
SynchronizationLib|MdePkg/Library/BaseSynchronizationLib/BaseSynchroniz
ationLib.inf

-
PerformanceLib|MdePkg/Library/BasePerformanceLibNull/BasePerformanc
eLibNull.inf

-
ReportStatusCodeLib|MdePkg/Library/BaseReportStatusCodeLibNull/BaseR
eportStatusCodeLibNull.inf

- PrintLib|MdePkg/Library/BasePrintLib/BasePrintLib.inf

-
PeCoffGetEntryPointLib|MdePkg/Library/BasePeCoffGetEntryPointLib/Base
PeCoffGetEntryPointLib.inf

- PeCoffLib|MdePkg/Library/BasePeCoffLib/BasePeCoffLib.inf

- IoLib|MdePkg/Library/BaseIoLibIntrinsic/BaseIoLibIntrinsic.inf

-
UefiDecompressLib|MdePkg/Library/BaseUefiDecompressLib/BaseUefiDeco
mpressLib.inf

- CpuLib|MdePkg/Library/BaseCpuLib/BaseCpuLib.inf

-

- UefiLib|MdePkg/Library/UefiLib/UefiLib.inf

- HobLib|MdePkg/Library/DxeHobLib/DxeHobLib.inf

-
UefiRuntimeServicesTableLib|MdePkg/Library/UefiRuntimeServicesTableLib
/UefiRuntimeServicesTableLib.inf

- DevicePathLib|MdePkg/Library/UefiDevicePathLib/UefiDevicePathLib.inf

-
UefiBootServicesTableLib|MdePkg/Library/UefiBootServicesTableLib/UefiBo
otServicesTableLib.inf

-
DxeServicesTableLib|MdePkg/Library/DxeServicesTableLib/DxeServicesTabl
eLib.inf

- DxeServicesLib|MdePkg/Library/DxeServicesLib/DxeServicesLib.inf

-
UefiDriverEntryPoint|MdePkg/Library/UefiDriverEntryPoint/UefiDriverEntry
Point.inf

-
UefiApplicationEntryPoint|MdePkg/Library/UefiApplicationEntryPoint/UefiA
pplicationEntryPoint.inf

- HiiLib|MdeModulePkg/Library/UefiHiiLib/UefiHiiLib.inf

-
UefiHiiServicesLib|MdeModulePkg/Library/UefiHiiServicesLib/UefiHiiService
sLib.inf

- SortLib|MdeModulePkg/Library/UefiSortLib/UefiSortLib.inf

-

- UefiRuntimeLib|MdePkg/Library/UefiRuntimeLib/UefiRuntimeLib.inf

-
OrderedCollectionLib|MdePkg/Library/BaseOrderedCollectionRedBlackTreeL
ib/BaseOrderedCollectionRedBlackTreeLib.inf

-

- #

- # Ramdisk Requirements

- #

- FileExplorerLib|MdeModulePkg/Library/FileExplorerLib/FileExplorerLib.inf

-

- # Allow dynamic PCDs

- #

- PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf

-

- # use the accelerated BaseMemoryLibOptDxe by default, overrides for
SEC/PEI below

-
BaseMemoryLib|MdePkg/Library/BaseMemoryLibOptDxe/BaseMemoryLib
OptDxe.inf

-

- #

- # It is not possible to prevent the ARM compiler from inserting calls to
intrinsic functions.

- # This library provides the instrinsic functions such a compiler may generate
calls to.

- #

- NULL|ArmPkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.inf

-

- # Add support for GCC stack protector

- NULL|MdePkg/Library/BaseStackCheckLib/BaseStackCheckLib.inf

-

- # ARM Architectural Libraries

-
CacheMaintenanceLib|ArmPkg/Library/ArmCacheMaintenanceLib/ArmCach
eMaintenanceLib.inf

-
DefaultExceptionHandlerLib|ArmPkg/Library/DefaultExceptionHandlerLib/D
efaultExceptionHandlerLib.inf

-
CpuExceptionHandlerLib|ArmPkg/Library/ArmExceptionLib/ArmExceptionLib
.inf

-
ArmDisassemblerLib|ArmPkg/Library/ArmDisassemblerLib/ArmDisassembler
Lib.inf

- ArmGicLib|ArmPkg/Drivers/ArmGic/ArmGicLib.inf

- ArmGicArchLib|ArmPkg/Library/ArmGicArchLib/ArmGicArchLib.inf

-
DmaLib|EmbeddedPkg/Library/NonCoherentDmaLib/NonCoherentDmaLib.i
nf

- TimeBaseLib|EmbeddedPkg/Library/TimeBaseLib/TimeBaseLib.inf

-
ArmPlatformStackLib|ArmPlatformPkg/Library/ArmPlatformStackLib/ArmPla
tformStackLib.inf

- ArmSmcLib|ArmPkg/Library/ArmSmcLib/ArmSmcLib.inf

- ArmHvcLib|ArmPkg/Library/ArmHvcLib/ArmHvcLib.inf

-
ArmGenericTimerCounterLib|ArmPkg/Library/ArmGenericTimerPhyCounter
Lib/ArmGenericTimerPhyCounterLib.inf

-

- # Dual serial port library

-
PL011UartClockLib|ArmPlatformPkg/Library/PL011UartClockLib/PL011UartClo
ckLib.inf

- PL011UartLib|ArmPlatformPkg/Library/PL011UartLib/PL011UartLib.inf

-
SerialPortLib|Platform/RaspberryPi/Library/DualSerialPortLib/DebugDualSeri
alPortLib.inf

-

- # Cryptographic libraries

- RngLib|MdePkg/Library/DxeRngLib/DxeRngLib.inf

- IntrinsicLib|CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf

- BaseCryptLib|CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf

- OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLib.inf

- TlsLib|CryptoPkg/Library/TlsLib/TlsLib.inf

-

- #

- # Uncomment (and comment out the next line) For RealView Debugger.
The Standard IO window

- # in the debugger will show load and unload commands for symbols. You
can cut and paste this

- # into the command window to load symbols. We should be able to use a
script to do this, but

- # the version of RVD I have does not support scripts accessing system
memory.

- #

-
#PeCoffExtraActionLib|ArmPkg/Library/RvdPeCoffExtraActionLib/RvdPeCoff
ExtraActionLib.inf

-
PeCoffExtraActionLib|ArmPkg/Library/DebugPeCoffExtraActionLib/DebugPe
CoffExtraActionLib.inf

-
#PeCoffExtraActionLib|MdePkg/Library/BasePeCoffExtraActionLibNull/Base
PeCoffExtraActionLibNull.inf

-

-
DebugAgentLib|MdeModulePkg/Library/DebugAgentLibNull/DebugAgentLi
bNull.inf

-
DebugAgentTimerLib|EmbeddedPkg/Library/DebugAgentTimerLibNull/Debu
gAgentTimerLibNull.inf

-

- # Flattened Device Tree (FDT) access library

- FdtLib|EmbeddedPkg/Library/FdtLib/FdtLib.inf

-

- # USB Libraries

- UefiUsbLib|MdePkg/Library/UefiUsbLib/UefiUsbLib.inf

-

- #

- # Secure Boot dependencies

- #

-!if $(SECURE_BOOT_ENABLE) == TRUE

-
TpmMeasurementLib|SecurityPkg/Library/DxeTpmMeasurementLib/DxeTp
mMeasurementLib.inf

- AuthVariableLib|SecurityPkg/Library/AuthVariableLib/AuthVariableLib.inf

-

- # re-use the UserPhysicalPresent() dummy implementation from the ovmf
tree

-
PlatformSecureLib|OvmfPkg/Library/PlatformSecureLib/PlatformSecureLib.i
nf

-!else

-
TpmMeasurementLib|MdeModulePkg/Library/TpmMeasurementLibNull/Tp
mMeasurementLibNull.inf

-
AuthVariableLib|MdeModulePkg/Library/AuthVariableLibNull/AuthVariableL
ibNull.inf

-!endif

- VarCheckLib|MdeModulePkg/Library/VarCheckLib/VarCheckLib.inf

-
VariablePolicyLib|MdeModulePkg/Library/VariablePolicyLib/VariablePolicyLi
b.inf

-
VariablePolicyHelperLib|MdeModulePkg/Library/VariablePolicyHelperLib/Va
riablePolicyHelperLib.inf

- GpioLib|Silicon/Broadcom/Bcm283x/Library/GpioLib/GpioLib.inf

-

- #

- # PCI dependencies

- #

- # PCI root port configuation and description

-
PciHostBridgeLib|Silicon/Broadcom/Bcm27xx/Library/Bcm2711PciHostBridge
Lib/Bcm2711PciHostBridgeLib.inf

- # The "segment lib" provides the CAM accessors/etc when they aren't
ECAM standard

-
PciSegmentLib|Silicon/Broadcom/Bcm27xx/Library/Bcm2711PciSegmentLib/
PciSegmentLib.inf

-

-[LibraryClasses.common.SEC]

- PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf

- BaseMemoryLib|MdePkg/Library/BaseMemoryLib/BaseMemoryLib.inf

-
MemoryInitPeiLib|Platform/RaspberryPi/Library/MemoryInitPeiLib/Memory
InitPeiLib.inf

- PlatformPeiLib|ArmPlatformPkg/PlatformPei/PlatformPeiLib.inf

-
ExtractGuidedSectionLib|EmbeddedPkg/Library/PrePiExtractGuidedSectionL
ib/PrePiExtractGuidedSectionLib.inf

-
LzmaDecompressLib|MdeModulePkg/Library/LzmaCustomDecompressLib/L
zmaCustomDecompressLib.inf

- PrePiLib|EmbeddedPkg/Library/PrePiLib/PrePiLib.inf

- HobLib|EmbeddedPkg/Library/PrePiHobLib/PrePiHobLib.inf

-
PrePiHobListPointerLib|ArmPlatformPkg/Library/PrePiHobListPointerLib/Pre
PiHobListPointerLib.inf

-
MemoryAllocationLib|EmbeddedPkg/Library/PrePiMemoryAllocationLib/Pre
PiMemoryAllocationLib.inf

-

-[LibraryClasses.common.DXE_CORE]

- HobLib|MdePkg/Library/DxeCoreHobLib/DxeCoreHobLib.inf

-
MemoryAllocationLib|MdeModulePkg/Library/DxeCoreMemoryAllocationLi
b/DxeCoreMemoryAllocationLib.inf

-
DxeCoreEntryPoint|MdePkg/Library/DxeCoreEntryPoint/DxeCoreEntryPoint
.inf

-
ExtractGuidedSectionLib|MdePkg/Library/DxeExtractGuidedSectionLib/DxeE
xtractGuidedSectionLib.inf

-
PerformanceLib|MdeModulePkg/Library/DxeCorePerformanceLib/DxeCore
PerformanceLib.inf

-

-[LibraryClasses.common.DXE_DRIVER]

-
SecurityManagementLib|MdeModulePkg/Library/DxeSecurityManagementL
ib/DxeSecurityManagementLib.inf

-
PerformanceLib|MdeModulePkg/Library/DxePerformanceLib/DxePerforma
nceLib.inf

-
MemoryAllocationLib|MdePkg/Library/UefiMemoryAllocationLib/UefiMemo
ryAllocationLib.inf

-!if $(INCLUDE_TFTP_COMMAND) == TRUE

- ShellLib|ShellPkg/Library/UefiShellLib/UefiShellLib.inf

- FileHandleLib|MdePkg/Library/UefiFileHandleLib/UefiFileHandleLib.inf

-!endif

-

-[LibraryClasses.common.UEFI_APPLICATION]

-
PerformanceLib|MdeModulePkg/Library/DxePerformanceLib/DxePerforma
nceLib.inf

-
MemoryAllocationLib|MdePkg/Library/UefiMemoryAllocationLib/UefiMemo
ryAllocationLib.inf

- HiiLib|MdeModulePkg/Library/UefiHiiLib/UefiHiiLib.inf

- ShellLib|ShellPkg/Library/UefiShellLib/UefiShellLib.inf

- FileHandleLib|MdePkg/Library/UefiFileHandleLib/UefiFileHandleLib.inf

-

-[LibraryClasses.common.UEFI_DRIVER]

-
ExtractGuidedSectionLib|MdePkg/Library/DxeExtractGuidedSectionLib/DxeE
xtractGuidedSectionLib.inf

-
PerformanceLib|MdeModulePkg/Library/DxePerformanceLib/DxePerforma
nceLib.inf

-
MemoryAllocationLib|MdePkg/Library/UefiMemoryAllocationLib/UefiMemo
ryAllocationLib.inf

-

-[LibraryClasses.common.DXE_RUNTIME_DRIVER]

- # Runtime debug messages may crash an OS unless serial output to MMIO
mapped UARTs is inhibited

-
DebugLib|MdePkg/Library/DxeRuntimeDebugLibSerialPort/DxeRuntimeDeb
ugLibSerialPort.inf

-
MemoryAllocationLib|MdePkg/Library/UefiMemoryAllocationLib/UefiMemo
ryAllocationLib.inf

-
CapsuleLib|MdeModulePkg/Library/DxeCapsuleLibNull/DxeCapsuleLibNull.i
nf

- EfiResetSystemLib|Platform/RaspberryPi/Library/ResetLib/ResetLib.inf

- ArmSmcLib|ArmPkg/Library/ArmSmcLib/ArmSmcLib.inf

-
VariablePolicyLib|MdeModulePkg/Library/VariablePolicyLib/VariablePolicyLi
bRuntimeDxe.inf

-

-!if $(SECURE_BOOT_ENABLE) == TRUE

- BaseCryptLib|CryptoPkg/Library/BaseCryptLib/RuntimeCryptLib.inf

-!endif

-

-
##########################################################
#########################################

-# BuildOptions Section - Define the module specific tool chain flags that
should be used as

-# the default flags for a module. These flags are appended to any

-# standard flags that are defined by the build process.

-
##########################################################
#########################################

-

-[BuildOptions]

- GCC:*_*_*_CC_FLAGS = -DRPI_MODEL=4

- GCC:*_*_*_PP_FLAGS = -DRPI_MODEL=4

- GCC:*_*_*_ASLPP_FLAGS = -DRPI_MODEL=4

- GCC:*_*_*_ASLCC_FLAGS = -DRPI_MODEL=4

- GCC:*_*_*_VFRPP_FLAGS = -DRPI_MODEL=4

- GCC:RELEASE_*_*_CC_FLAGS = -DMDEPKG_NDEBUG -DNDEBUG

-

-[BuildOptions.common.EDKII.DXE_RUNTIME_DRIVER]

- GCC:*_*_AARCH64_DLINK_FLAGS = -z common-page-size=0x10000

-

-
##########################################################
######################

-#

-# Pcd Section - list of all EDK II PCD Entries defined by this Platform

-#

-
##########################################################
######################

-

-[PcdsFeatureFlag.common]

- # Use the Vector Table location in CpuDxe. We will not copy the Vector
Table at PcdCpuVectorBaseAddress

- gArmTokenSpaceGuid.PcdRelocateVectorTable|FALSE

-

-
gEmbeddedTokenSpaceGuid.PcdPrePiProduceMemoryTypeInformationHob
|TRUE

- gEfiMdeModulePkgTokenSpaceGuid.PcdTurnOffUsbLegacySupport|TRUE

-

- ## If TRUE, Graphics Output Protocol will be installed on virtual handle
created by ConsplitterDxe.

- # It could be set FALSE to save size.

- gEfiMdeModulePkgTokenSpaceGuid.PcdConOutGopSupport|TRUE

- gEfiMdeModulePkgTokenSpaceGuid.PcdConOutUgaSupport|FALSE

- gEfiMdePkgTokenSpaceGuid.PcdUgaConsumeSupport|FALSE

-

-[PcdsFixedAtBuild.common]

- gEfiMdePkgTokenSpaceGuid.PcdMaximumUnicodeStringLength|1000000

- gEfiMdePkgTokenSpaceGuid.PcdMaximumAsciiStringLength|1000000

- gEfiMdePkgTokenSpaceGuid.PcdMaximumLinkedListLength|1000000

- gEfiMdePkgTokenSpaceGuid.PcdSpinLockTimeout|10000000

- gEfiMdePkgTokenSpaceGuid.PcdDebugClearMemoryValue|0xAF

- gEfiMdePkgTokenSpaceGuid.PcdPerformanceLibraryPropertyMask|1

- gEfiMdePkgTokenSpaceGuid.PcdPostCodePropertyMask|0

- gEfiMdePkgTokenSpaceGuid.PcdUefiLibMaxPrintBufferSize|320

-

- # DEBUG_ASSERT_ENABLED 0x01

- # DEBUG_PRINT_ENABLED 0x02

- # DEBUG_CODE_ENABLED 0x04

- # CLEAR_MEMORY_ENABLED 0x08

- # ASSERT_BREAKPOINT_ENABLED 0x10

- # ASSERT_DEADLOOP_ENABLED 0x20

-!if $(TARGET) == RELEASE

- gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0x21

-!else

- gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0x2f

-!endif

-

- # DEBUG_INIT 0x00000001 // Initialization

- # DEBUG_WARN 0x00000002 // Warnings

- # DEBUG_LOAD 0x00000004 // Load events

- # DEBUG_FS 0x00000008 // EFI File system

- # DEBUG_POOL 0x00000010 // Alloc & Free (pool)

- # DEBUG_PAGE 0x00000020 // Alloc & Free (page)

- # DEBUG_INFO 0x00000040 // Informational debug messages

- # DEBUG_DISPATCH 0x00000080 // PEI/DXE/SMM Dispatchers

- # DEBUG_VARIABLE 0x00000100 // Variable

- # DEBUG_BM 0x00000400 // Boot Manager

- # DEBUG_BLKIO 0x00001000 // BlkIo Driver

- # DEBUG_NET 0x00004000 // SNP Driver

- # DEBUG_UNDI 0x00010000 // UNDI Driver

- # DEBUG_LOADFILE 0x00020000 // LoadFile

- # DEBUG_EVENT 0x00080000 // Event messages

- # DEBUG_GCD 0x00100000 // Global Coherency Database changes

- # DEBUG_CACHE 0x00200000 // Memory range cachability changes

- # DEBUG_VERBOSE 0x00400000 // Detailed debug messages that may

- # // significantly impact boot performance

- # DEBUG_ERROR 0x80000000 // Error

-
gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|$(DEBUG_PRINT_ER
ROR_LEVEL)

-

- gEfiMdePkgTokenSpaceGuid.PcdReportStatusCodePropertyMask|0x07

-

- #

- # Optional feature to help prevent EFI memory map fragments

- # Turned on and off via: PcdPrePiProduceMemoryTypeInformationHob

- # Values are in EFI Pages (4K). DXE Core will make sure that

- # at least this much of each type of memory can be allocated

- # from a single memory range. This way you only end up with

- # maximum of two fragments for each type in the memory map

- # (the memory used, and the free memory that was prereserved

- # but not used).

- #

- gEmbeddedTokenSpaceGuid.PcdMemoryTypeEfiACPIReclaimMemory|0

- gEmbeddedTokenSpaceGuid.PcdMemoryTypeEfiACPIMemoryNVS|0

- gEmbeddedTokenSpaceGuid.PcdMemoryTypeEfiReservedMemoryType|0

-!if $(SECURE_BOOT_ENABLE) == TRUE

- gEmbeddedTokenSpaceGuid.PcdMemoryTypeEfiRuntimeServicesData|600

-
gEmbeddedTokenSpaceGuid.PcdMemoryTypeEfiRuntimeServicesCode|400

- gEmbeddedTokenSpaceGuid.PcdMemoryTypeEfiBootServicesCode|1500

-!else

- gEmbeddedTokenSpaceGuid.PcdMemoryTypeEfiRuntimeServicesData|300

-
gEmbeddedTokenSpaceGuid.PcdMemoryTypeEfiRuntimeServicesCode|150

- gEmbeddedTokenSpaceGuid.PcdMemoryTypeEfiBootServicesCode|1000

-!endif

- gEmbeddedTokenSpaceGuid.PcdMemoryTypeEfiBootServicesData|12000

- gEmbeddedTokenSpaceGuid.PcdMemoryTypeEfiLoaderCode|20

- gEmbeddedTokenSpaceGuid.PcdMemoryTypeEfiLoaderData|0

-

- gEmbeddedTokenSpaceGuid.PcdDmaDeviceOffset|0xc0000000

- gEmbeddedTokenSpaceGuid.PcdDmaDeviceLimit|0xffffffff

-

- gEfiMdeModulePkgTokenSpaceGuid.PcdFirmwareVersionString|L"EDK2-
DEV"

-

-!if $(SECURE_BOOT_ENABLE) == TRUE

- # override the default values from SecurityPkg to ensure images from all
sources are verified in secure boot

-
gEfiSecurityPkgTokenSpaceGuid.PcdOptionRomImageVerificationPolicy|0x04

-
gEfiSecurityPkgTokenSpaceGuid.PcdFixedMediaImageVerificationPolicy|0x0
4

-
gEfiSecurityPkgTokenSpaceGuid.PcdRemovableMediaImageVerificationPolic
y|0x04

-!endif

-

- gEfiNetworkPkgTokenSpaceGuid.PcdAllowHttpConnections|TRUE

-

- # Default platform supported RFC 4646 languages: (American) English

-
gEfiMdePkgTokenSpaceGuid.PcdUefiVariableDefaultPlatformLangCodes|"e
n-US"

-

-[LibraryClasses.common]

- ArmLib|ArmPkg/Library/ArmLib/ArmBaseLib.inf

- ArmMmuLib|ArmPkg/Library/ArmMmuLib/ArmMmuBaseLib.inf

- ArmPlatformLib|Platform/RaspberryPi/Library/PlatformLib/PlatformLib.inf

- TimerLib|ArmPkg/Library/ArmArchTimerLib/ArmArchTimerLib.inf

-
CapsuleLib|MdeModulePkg/Library/DxeCapsuleLibNull/DxeCapsuleLibNull.i
nf

-
UefiBootManagerLib|MdeModulePkg/Library/UefiBootManagerLib/UefiBoo
tManagerLib.inf

- BootLogoLib|MdeModulePkg/Library/BootLogoLib/BootLogoLib.inf

-
PlatformBootManagerLib|Platform/RaspberryPi/Library/PlatformBootManag
erLib/PlatformBootManagerLib.inf

-
CustomizedDisplayLib|MdeModulePkg/Library/CustomizedDisplayLib/Custo
mizedDisplayLib.inf

- FileExplorerLib|MdeModulePkg/Library/FileExplorerLib/FileExplorerLib.inf

- AcpiLib|EmbeddedPkg/Library/AcpiLib/AcpiLib.inf

-

-[LibraryClasses.common.UEFI_DRIVER]

- UefiScsiLib|MdePkg/Library/UefiScsiLib/UefiScsiLib.inf

-

-
##########################################################
######################

-#

-# Pcd Section - list of all EDK II PCD Entries defined by this Platform

-#

-
##########################################################
######################

-

-[PcdsFeatureFlag.common]

- gEfiMdeModulePkgTokenSpaceGuid.PcdConOutGopSupport|TRUE

- gEfiMdeModulePkgTokenSpaceGuid.PcdConOutUgaSupport|FALSE

- gEfiMdeModulePkgTokenSpaceGuid.PcdInstallAcpiSdtProtocol|TRUE

-

-[PcdsFixedAtBuild.common]

- gArmPlatformTokenSpaceGuid.PcdCoreCount|4

- gArmTokenSpaceGuid.PcdVFPEnabled|1

-

- gArmPlatformTokenSpaceGuid.PcdCPUCorePrimaryStackSize|0x4000

- gEfiMdeModulePkgTokenSpaceGuid.PcdMaxVariableSize|0x2000

- gEfiMdeModulePkgTokenSpaceGuid.PcdMaxAuthVariableSize|0x2800

-

- # Size of the region used by UEFI in permanent memory (Reserved 64MB)

-
gArmPlatformTokenSpaceGuid.PcdSystemMemoryUefiRegionSize|0x040000
00

- #

- # 0x00000000 - 0x001F0000 FD (PcdFdBaseAddress, PcdFdSize)

- # 0x001F0000 - 0x00200000 DTB (PcdFdtBaseAddress, PcdFdtSize)

- # 0x00200000 - ... RAM (PcdSystemMemoryBase,
PcdSystemMemorySize)

- #

- # This matches PcdFvBaseAddress, since everything less is the FD, and

- # will be reserved away.

- #

- gArmTokenSpaceGuid.PcdSystemMemoryBase|0x00200000

- gArmTokenSpaceGuid.PcdSystemMemorySize|0x3fe00000

-

- #

- # Device specific addresses

- #

- gBcm27xxTokenSpaceGuid.PcdBcm27xxRegistersAddress|0xfc000000

- gBcm27xxTokenSpaceGuid.PcdBcmGenetRegistersAddress|0xfd580000

- gBcm283xTokenSpaceGuid.PcdBcm283xRegistersAddress|0xfe000000

-

- # PCIe specific addresses

- gBcm27xxTokenSpaceGuid.PcdBcm27xxPciRegBase|0xfd500000

- gBcm27xxTokenSpaceGuid.PcdBcm27xxPciBusMmioAdr|0xf8000000

- gBcm27xxTokenSpaceGuid.PcdBcm27xxPciBusMmioLen|0x3ffffff

- gBcm27xxTokenSpaceGuid.PcdBcm27xxPciCpuMmioAdr|0x600000000

-

- # UARTs

- gArmPlatformTokenSpaceGuid.PL011UartInteger|0

- gArmPlatformTokenSpaceGuid.PL011UartFractional|0

- gArmPlatformTokenSpaceGuid.PL011UartClkInHz|48000000

- gEfiMdeModulePkgTokenSpaceGuid.PcdSerialUseMmio|TRUE

- gEfiMdeModulePkgTokenSpaceGuid.PcdSerialRegisterStride|4

- gEfiMdeModulePkgTokenSpaceGuid.PcdSerialClockRate|1000000000

- gEfiMdeModulePkgTokenSpaceGuid.PcdSerialFifoControl|0x27

- gEfiMdeModulePkgTokenSpaceGuid.PcdSerialExtendedTxFifoSize|8

- gEfiMdePkgTokenSpaceGuid.PcdUartDefaultBaudRate|115200

- gEfiMdePkgTokenSpaceGuid.PcdUartDefaultReceiveFifoDepth|0

-

- #

- # ARM General Interrupt Controller

- #

- gArmTokenSpaceGuid.PcdGicDistributorBase|0xFF841000

- gArmTokenSpaceGuid.PcdGicInterruptInterfaceBase|0xFF842000

- gRaspberryPiTokenSpaceGuid.PcdGicInterruptInterfaceHBase|0xFF844000

- gRaspberryPiTokenSpaceGuid.PcdGicInterruptInterfaceVBase|0xFF846000

- gRaspberryPiTokenSpaceGuid.PcdGicGsivId|0x19

- gRaspberryPiTokenSpaceGuid.PcdGicPmuIrq0|0x30

- gRaspberryPiTokenSpaceGuid.PcdGicPmuIrq1|0x31

- gRaspberryPiTokenSpaceGuid.PcdGicPmuIrq2|0x32

- gRaspberryPiTokenSpaceGuid.PcdGicPmuIrq3|0x33

-

- #

- # Fixed CPU settings.

- #

- gRaspberryPiTokenSpaceGuid.PcdCpuLowSpeedMHz|800

- gRaspberryPiTokenSpaceGuid.PcdCpuDefSpeedMHz|1500

- gRaspberryPiTokenSpaceGuid.PcdCpuMaxSpeedMHz|2200

-

- ## Default Terminal Type

- ## 0-PCANSI, 1-VT100, 2-VT00+, 3-UTF8, 4-TTYTERM

- gEfiMdePkgTokenSpaceGuid.PcdDefaultTerminalType|4

-

-
gEfiMdeModulePkgTokenSpaceGuid.PcdResetOnMemoryTypeInformationC
hange|FALSE

- gEfiMdeModulePkgTokenSpaceGuid.PcdBootManagerMenuFile|{ 0x21,
0xaa, 0x2c, 0x46, 0x14, 0x76, 0x03, 0x45, 0x83, 0x6e, 0x8a, 0xb6, 0xf4, 0x66,
0x23, 0x31 }

-

- gEfiMdeModulePkgTokenSpaceGuid.PcdFirmwareVendor|L"EDK2"

- gEfiMdeModulePkgTokenSpaceGuid.PcdSetNxForStack|TRUE

-

-[PcdsDynamicHii.common.DEFAULT]

-

- #

- # Clock overrides.

- #

-

-
gRaspberryPiTokenSpaceGuid.PcdCpuClock|L"CpuClock"|gConfigDxeFormSe
tGuid|0x0|1

-
gRaspberryPiTokenSpaceGuid.PcdCustomCpuClock|L"CustomCpuClock"|gCo
nfigDxeFormSetGuid|0x0|gRaspberryPiTokenSpaceGuid.PcdCpuDefSpeedM
Hz

-

- #

- # SD-related.

- #

-

-
gRaspberryPiTokenSpaceGuid.PcdSdIsArasan|L"SdIsArasan"|gConfigDxeFor
mSetGuid|0x0|0

-
gRaspberryPiTokenSpaceGuid.PcdMmcForce1Bit|L"MmcForce1Bit"|gConfig
DxeFormSetGuid|0x0|0

-
gRaspberryPiTokenSpaceGuid.PcdMmcForceDefaultSpeed|L"MmcForceDef
aultSpeed"|gConfigDxeFormSetGuid|0x0|0

-
gRaspberryPiTokenSpaceGuid.PcdMmcSdDefaultSpeedMHz|L"MmcSdDefau
ltSpeedMHz"|gConfigDxeFormSetGuid|0x0|25

-
gRaspberryPiTokenSpaceGuid.PcdMmcSdHighSpeedMHz|L"MmcSdHighSpe
edMHz"|gConfigDxeFormSetGuid|0x0|50

-
gRaspberryPiTokenSpaceGuid.PcdMmcDisableMulti|L"MmcDisableMulti"|gC
onfigDxeFormSetGuid|0x0|0

-
gRaspberryPiTokenSpaceGuid.PcdMmcEnableDma|L"MmcEnableDma"|gCo
nfigDxeFormSetGuid|0x0|0

-

- #

- # Debug-related.

- #

-

-
gRaspberryPiTokenSpaceGuid.PcdDebugEnableJTAG|L"DebugEnableJTAG"|
gConfigDxeFormSetGuid|0x0|0

-

- #

- # Display-related.

- #

-

- #

- # Just enable native resolution by default.

- #

-
gRaspberryPiTokenSpaceGuid.PcdDisplayEnableScaledVModes|L"DisplayEna
bleScaledVModes"|gConfigDxeFormSetGuid|0x0|0x20

-
gRaspberryPiTokenSpaceGuid.PcdDisplayEnableSShot|L"DisplayEnableSShot
"|gConfigDxeFormSetGuid|0x0|1

-

- #

- # Supporting > 3GB of memory.

- #

-
gRaspberryPiTokenSpaceGuid.PcdRamMoreThan3GB|L"RamMoreThan3GB"
|gConfigDxeFormSetGuid|0x0|0

-
gRaspberryPiTokenSpaceGuid.PcdRamLimitTo3GB|L"RamLimitTo3GB"|gConf
igDxeFormSetGuid|0x0|1

-

- #

- # Device Tree and ACPI selection.

- #

- # 0 - SYSTEM_TABLE_MODE_ACPI (default)

- # 1 - SYSTEM_TABLE_MODE_BOTH

- # 2 - SYSTEM_TABLE_MODE_DT

- #

-
gRaspberryPiTokenSpaceGuid.PcdSystemTableMode|L"SystemTableMode"
|gConfigDxeFormSetGuid|0x0|0

-

- #

- # Enable a fan in the ACPI thermal zone on GPIO pin #

- #

- # 0 - DISABLED

- # 19 - Enabled on pin 19

- #

-
gRaspberryPiTokenSpaceGuid.PcdFanOnGpio|L"FanOnGpio"|gConfigDxeFor
mSetGuid|0x0|0

-
gRaspberryPiTokenSpaceGuid.PcdFanTemp|L"FanTemp"|gConfigDxeFormS
etGuid|0x0|60

-

- #

- # Reset-related.

- #

-

-
gRaspberryPiTokenSpaceGuid.PcdPlatformResetDelay|L"ResetDelay"|gRasp
berryPiTokenSpaceGuid|0x0|0

-

- #

- # Common UEFI ones.

- #

-

-
gEfiMdePkgTokenSpaceGuid.PcdPlatformBootTimeOut|L"Timeout"|gEfiGlo
balVariableGuid|0x0|5

- #

- # This is silly, but by pointing SetupConXXX and ConXXX PCDs to

- # the same variables, I can use the graphical configuration to

- # change the mode used by ConSplitter.

- #

-
gEfiMdeModulePkgTokenSpaceGuid.PcdSetupConOutColumn|L"Columns"|
gRaspberryPiTokenSpaceGuid|0x0|80

-
gEfiMdeModulePkgTokenSpaceGuid.PcdConOutColumn|L"Columns"|gRasp
berryPiTokenSpaceGuid|0x0|80

-
gEfiMdeModulePkgTokenSpaceGuid.PcdSetupConOutRow|L"Rows"|gRaspb
erryPiTokenSpaceGuid|0x0|25

-
gEfiMdeModulePkgTokenSpaceGuid.PcdConOutRow|L"Rows"|gRaspberryPi
TokenSpaceGuid|0x0|25

-

-[PcdsDynamicDefault.common]

- #

- # Set video resolution for boot options and for text setup.

- #

- gEfiMdeModulePkgTokenSpaceGuid.PcdVideoHorizontalResolution|0

- gEfiMdeModulePkgTokenSpaceGuid.PcdVideoVerticalResolution|0

-
gEfiMdeModulePkgTokenSpaceGuid.PcdSetupVideoHorizontalResolution|64
0

-
gEfiMdeModulePkgTokenSpaceGuid.PcdSetupVideoVerticalResolution|480

- gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableBase64|0

-
gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingBase|0

- gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareBase|0

-

-
##########################################################
######################

-#

-# Components Section - list of all EDK II Modules needed by this Platform

-#

-
##########################################################
######################

-[Components.common]

- #

- # PEI Phase modules

- #

- ArmPlatformPkg/PrePi/PeiUniCore.inf {

- <LibraryClasses>

-
SerialPortLib|Platform/RaspberryPi/Library/DualSerialPortLib/DualSerialPortL
ib.inf

- }

-

- #

- # DXE

- #

- MdeModulePkg/Core/Dxe/DxeMain.inf {

- <LibraryClasses>

-
NULL|MdeModulePkg/Library/DxeCrc32GuidedSectionExtractLib/DxeCrc32G
uidedSectionExtractLib.inf

- }

- MdeModulePkg/Universal/PCD/Dxe/Pcd.inf {

- <LibraryClasses>

- PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf

- }

-

- #

- # Architectural Protocols

- #

- ArmPkg/Drivers/CpuDxe/CpuDxe.inf

- MdeModulePkg/Core/RuntimeDxe/RuntimeDxe.inf

- Platform/RaspberryPi/Drivers/VarBlockServiceDxe/VarBlockServiceDxe.inf

-
MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteDxe.in
f

- MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxe.inf
{

- <LibraryClasses>

- NULL|MdeModulePkg/Library/VarCheckUefiLib/VarCheckUefiLib.inf

- DebugLib|MdePkg/Library/BaseDebugLibNull/BaseDebugLibNull.inf

- }

-!if $(SECURE_BOOT_ENABLE) == TRUE

- MdeModulePkg/Universal/SecurityStubDxe/SecurityStubDxe.inf {

- <LibraryClasses>

-
NULL|SecurityPkg/Library/DxeImageVerificationLib/DxeImageVerificationLib
.inf

- }

-
SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfi
gDxe.inf

-!else

- MdeModulePkg/Universal/SecurityStubDxe/SecurityStubDxe.inf

-!endif

- MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleRuntimeDxe.inf

-
MdeModulePkg/Universal/MonotonicCounterRuntimeDxe/MonotonicCoun
terRuntimeDxe.inf

- EmbeddedPkg/ResetRuntimeDxe/ResetRuntimeDxe.inf

- EmbeddedPkg/RealTimeClockRuntimeDxe/RealTimeClockRuntimeDxe.inf {

- <LibraryClasses>

-
RealTimeClockLib|EmbeddedPkg/Library/VirtualRealTimeClockLib/VirtualRea
lTimeClockLib.inf

- }

- EmbeddedPkg/MetronomeDxe/MetronomeDxe.inf

-

- MdeModulePkg/Universal/Console/ConPlatformDxe/ConPlatformDxe.inf

- MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitterDxe.inf

-
MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsoleD
xe.inf

- MdeModulePkg/Universal/Console/TerminalDxe/TerminalDxe.inf

- MdeModulePkg/Universal/SerialDxe/SerialDxe.inf {

- <LibraryClasses>

-
SerialPortLib|Platform/RaspberryPi/Library/DualSerialPortLib/DualSerialPortL
ib.inf

- }

- Platform/RaspberryPi/Drivers/DisplayDxe/DisplayDxe.inf

- EmbeddedPkg/Drivers/ConsolePrefDxe/ConsolePrefDxe.inf

-

- MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseDxe.inf

-

- ArmPkg/Drivers/ArmGic/ArmGicDxe.inf

- Platform/RaspberryPi/Drivers/RpiFirmwareDxe/RpiFirmwareDxe.inf

- Platform/RaspberryPi/Drivers/FdtDxe/FdtDxe.inf

- Platform/RaspberryPi/Drivers/ConfigDxe/ConfigDxe.inf

- ArmPkg/Drivers/TimerDxe/TimerDxe.inf

- MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimer.inf

- MdeModulePkg/Universal/EbcDxe/EbcDxe.inf

-

- #

- # FAT filesystem + GPT/MBR partitioning

- #

- MdeModulePkg/Universal/Disk/DiskIoDxe/DiskIoDxe.inf

- MdeModulePkg/Universal/Disk/PartitionDxe/PartitionDxe.inf

-
MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf

- FatPkg/EnhancedFatDxe/Fat.inf

-

- #

- # ACPI Support

- #

- MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiTableDxe.inf

-
MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraph
icsResourceTableDxe.inf

- Platform/RaspberryPi/AcpiTables/AcpiTables.inf

-

- #

- # SMBIOS Support

- #

- Platform/RaspberryPi/Drivers/PlatformSmbiosDxe/PlatformSmbiosDxe.inf

- MdeModulePkg/Universal/SmbiosDxe/SmbiosDxe.inf

-

- #

- # RAM Disk Support

- #

- MdeModulePkg/Universal/Disk/RamDiskDxe/RamDiskDxe.inf

-

- #

- # Bds

- #

- MdeModulePkg/Universal/DevicePathDxe/DevicePathDxe.inf

- MdeModulePkg/Universal/DisplayEngineDxe/DisplayEngineDxe.inf

- MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf

-
MdeModulePkg/Universal/DriverHealthManagerDxe/DriverHealthManager
Dxe.inf

- MdeModulePkg/Universal/BdsDxe/BdsDxe.inf

- Platform/RaspberryPi/Drivers/LogoDxe/LogoDxe.inf

- MdeModulePkg/Application/UiApp/UiApp.inf {

- <LibraryClasses>

-
NULL|MdeModulePkg/Library/DeviceManagerUiLib/DeviceManagerUiLib.inf

- NULL|MdeModulePkg/Library/BootManagerUiLib/BootManagerUiLib.inf

-
NULL|Platform/RaspberryPi/Library/PlatformUiAppLib/PlatformUiAppLib.inf

-
NULL|MdeModulePkg/Library/BootMaintenanceManagerUiLib/BootMainte
nanceManagerUiLib.inf

- }

-

- #

- # SCSI Bus and Disk Driver

- #

- MdeModulePkg/Bus/Scsi/ScsiBusDxe/ScsiBusDxe.inf

- MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDiskDxe.inf

-

- #

- # USB Support

- #

- MdeModulePkg/Bus/Pci/XhciDxe/XhciDxe.inf

- Platform/RaspberryPi/Drivers/DwUsbHostDxe/DwUsbHostDxe.inf

- MdeModulePkg/Bus/Usb/UsbBusDxe/UsbBusDxe.inf

- MdeModulePkg/Bus/Usb/UsbKbDxe/UsbKbDxe.inf

- MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassStorageDxe.inf

-

- #

- # SD/MMC support

- #

- # Platform/RaspberryPi/Drivers/SdHostDxe/SdHostDxe.inf

-
Platform/RaspberryPi/Drivers/ArasanMmcHostDxe/ArasanMmcHostDxe.inf

- Platform/RaspberryPi/Drivers/MmcDxe/MmcDxe.inf

-

- #

- # Networking stack

- #

-!include NetworkPkg/Network.dsc.inc

- Silicon/Broadcom/Drivers/Net/BcmGenetDxe/BcmGenetDxe.inf {

- <PcdsFixedAtBuild>

- gEmbeddedTokenSpaceGuid.PcdDmaDeviceOffset|0x00000000

- gEmbeddedTokenSpaceGuid.PcdDmaDeviceLimit|0xffffffff

- }

-

- #

- # RNG

- #

- Silicon/Broadcom/Bcm283x/Drivers/Bcm2838RngDxe/Bcm2838RngDxe.inf

-

- #

- # PCI Support

- #

- ArmPkg/Drivers/ArmPciCpuIo2Dxe/ArmPciCpuIo2Dxe.inf

- MdeModulePkg/Bus/Pci/PciHostBridgeDxe/PciHostBridgeDxe.inf

- MdeModulePkg/Bus/Pci/PciBusDxe/PciBusDxe.inf

-
EmbeddedPkg/Drivers/NonCoherentIoMmuDxe/NonCoherentIoMmuDxe.i
nf {

- <PcdsFixedAtBuild>

- gEmbeddedTokenSpaceGuid.PcdDmaDeviceOffset|0x00000000

- gEmbeddedTokenSpaceGuid.PcdDmaDeviceLimit|0xbfffffff

- }

-

- #

- # UEFI application (Shell Embedded Boot Loader)

- #

- ShellPkg/Application/Shell/Shell.inf {

- <LibraryClasses>

-
ShellCommandLib|ShellPkg/Library/UefiShellCommandLib/UefiShellComma
ndLib.inf

-
NULL|ShellPkg/Library/UefiShellLevel2CommandsLib/UefiShellLevel2Comma
ndsLib.inf

-
NULL|ShellPkg/Library/UefiShellLevel1CommandsLib/UefiShellLevel1Comma
ndsLib.inf

-
NULL|ShellPkg/Library/UefiShellLevel3CommandsLib/UefiShellLevel3Comma
ndsLib.inf

-
NULL|ShellPkg/Library/UefiShellDriver1CommandsLib/UefiShellDriver1Com
mandsLib.inf

-
NULL|ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1Com
mandsLib.inf

-
NULL|ShellPkg/Library/UefiShellInstall1CommandsLib/UefiShellInstall1Com
mandsLib.inf

-
NULL|ShellPkg/Library/UefiShellNetwork1CommandsLib/UefiShellNetwork1
CommandsLib.inf

-
NULL|ShellPkg/Library/UefiShellAcpiViewCommandLib/UefiShellAcpiViewCo
mmandLib.inf

-
HandleParsingLib|ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingL
ib.inf

- PrintLib|MdePkg/Library/BasePrintLib/BasePrintLib.inf

-
BcfgCommandLib|ShellPkg/Library/UefiShellBcfgCommandLib/UefiShellBcfg
CommandLib.inf

-

- <PcdsFixedAtBuild>

- gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0xFF

- gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE

- gEfiMdePkgTokenSpaceGuid.PcdUefiLibMaxPrintBufferSize|8000

- gEfiShellPkgTokenSpaceGuid.PcdShellFileOperationSize|0x200000

- }

-!if $(INCLUDE_TFTP_COMMAND) == TRUE

-
ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.
inf {

- <PcdsFixedAtBuild>

- gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE

- }

-!endif

diff --git a/Platform/RaspberryPi/RPi4/RPi4.dsc.rej
b/Platform/RaspberryPi/RPi4/RPi4.dsc.rej
deleted file mode 100644
index 0b40df6896..0000000000
--- a/Platform/RaspberryPi/RPi4/RPi4.dsc.rej
+++ /dev/null
@@ -1,29 +0,0 @@
---- Platform/RaspberryPi/RPi4/RPi4.dsc
-+++ Platform/RaspberryPi/RPi4/RPi4.dsc
-@@ -429,7 +429,6 @@ [PcdsFixedAtBuild.common]
- gArmPlatformTokenSpaceGuid.PL011UartClkInHz|48000000
- gEfiMdeModulePkgTokenSpaceGuid.PcdSerialUseMmio|TRUE
- gEfiMdeModulePkgTokenSpaceGuid.PcdSerialRegisterStride|4
-- gEfiMdeModulePkgTokenSpaceGuid.PcdSerialClockRate|1000000000
- gEfiMdeModulePkgTokenSpaceGuid.PcdSerialFifoControl|0x27
- gEfiMdeModulePkgTokenSpaceGuid.PcdSerialExtendedTxFifoSize|8
- gEfiMdePkgTokenSpaceGuid.PcdUartDefaultBaudRate|115200
-@@ -465,6 +464,9 @@ [PcdsFixedAtBuild.common]
- gEfiMdeModulePkgTokenSpaceGuid.PcdFirmwareVendor|L"EDK2"
- gEfiMdeModulePkgTokenSpaceGuid.PcdSetNxForStack|TRUE
-
-+[PcdsPatchableInModule]
-+ gEfiMdeModulePkgTokenSpaceGuid.PcdSerialClockRate|500000000
-+
- [PcdsDynamicHii.common.DEFAULT]
-
- #
-@@ -621,7 +623,7 @@ [Components.common]
- MdeModulePkg/Universal/Console/TerminalDxe/TerminalDxe.inf
- MdeModulePkg/Universal/SerialDxe/SerialDxe.inf {
- <LibraryClasses>
--
SerialPortLib|Platform/RaspberryPi/Library/DualSerialPortLib/DualSerialPortL
ib.inf
-+
SerialPortLib|Platform/RaspberryPi/Library/DualSerialPortLib/DualSerialPort
DxeLib.inf
- }
- Platform/RaspberryPi/Drivers/DisplayDxe/DisplayDxe.inf
- EmbeddedPkg/Drivers/ConsolePrefDxe/ConsolePrefDxe.inf
--
2.29.0

Yuqi:

 On Windows, can Clang + make combination drop the dependency of Visual studio? If I don’t install Visual studio 2015 or 2017, I only install LLVM, can I fully compile BaseTools and Edk2 code?

Thanks

Liming

This series imports code from the edk2-platforms project related to
changing the password of the TPM2 platform hierarchy and uses it to
disable the TPM2 platform hierarchy in Ovmf and ArmVirtPkg. It
addresses the Ovmf aspects of the following bugs:

https://bugzilla.tianocore.org/show_bug.cgi?id=3510
https://bugzilla.tianocore.org/show_bug.cgi?id=3499

I have patched the .dsc files and successfully test-built with most of
them. Some I could not build because they failed for other reasons
unrelated to this series.

I tested the changes with QEMU on x86 following the build of
ArmVirtQemu.dsc and OvmfPkgX64.dsc.

The disablement of the platform hierarchy is done after possibly
handling PPI. Following TPM 2 logs on Arm, only PCR extensions are
following afterwards until GRUB takes over.

Neither one of the following commands should work anymore on first
try:

With IBM tss2 tools:
tsshierarchychangeauth -hi p -pwdn newpass

With Intel tss2 tools:
tpm2_changeauth -c platform newpass

Regards,
Stefan

v4:
- Fixed and simplified code imported from edk2-platforms

v3:
- Referencing Null implementation on Bhyve and Xen platforms
- Add support in ArmVirtPkg

Stefan Berger (6):
OvmfPkg/TPM: Import PeiDxeTpmPlatformHierarchyLib.c from
edk2-platforms
OvmfPkg/TPM: Add a NULL implementation of TpmPlatformHierarchyLib
OvmfPkg: Reference new TPM classes in the build system for compilation
OvmfPkg: Disable the TPM2 platform hierarchy
ArmVirtPkg: Reference new TPM classes in the build system for
compilation
ArmVirtPkg: Disable the TPM2 platform hierarchy

ArmVirtPkg/ArmVirtCloudHv.dsc | 1 +
ArmVirtPkg/ArmVirtQemu.dsc | 3 +
ArmVirtPkg/ArmVirtQemuKernel.dsc | 1 +
ArmVirtPkg/ArmVirtXen.dsc | 1 +
.../PlatformBootManagerLib/PlatformBm.c | 6 +
.../PlatformBootManagerLib.inf | 1 +
OvmfPkg/AmdSev/AmdSevX64.dsc | 3 +
OvmfPkg/Bhyve/BhyveX64.dsc | 1 +
.../Include/Library/TpmPlatformHierarchyLib.h | 27 +++
.../PeiDxeTpmPlatformHierarchyLib.c | 200 ++++++++++++++++++
.../PeiDxeTpmPlatformHierarchyLib.inf | 40 ++++
.../PeiDxeTpmPlatformHierarchyLib.c | 19 ++
.../PeiDxeTpmPlatformHierarchyLib.inf | 31 +++
.../PlatformBootManagerLib/BdsPlatform.c | 6 +
.../PlatformBootManagerLib.inf | 1 +
.../PlatformBootManagerLibBhyve/BdsPlatform.c | 7 +
.../PlatformBootManagerLibGrub/BdsPlatform.c | 7 +
OvmfPkg/OvmfPkgIa32.dsc | 3 +
OvmfPkg/OvmfPkgIa32X64.dsc | 3 +
OvmfPkg/OvmfPkgX64.dsc | 3 +
OvmfPkg/OvmfXen.dsc | 1 +
21 files changed, 365 insertions(+)
create mode 100644 OvmfPkg/Include/Library/TpmPlatformHierarchyLib.h
create mode 100644 OvmfPkg/Library/PeiDxeTpmPlatformHierarchyLib/PeiDxeTpmPlatformHierarchyLib.c
create mode 100644 OvmfPkg/Library/PeiDxeTpmPlatformHierarchyLib/PeiDxeTpmPlatformHierarchyLib.inf
create mode 100644 OvmfPkg/Library/PeiDxeTpmPlatformHierarchyLibNull/PeiDxeTpmPlatformHierarchyLib.c
create mode 100644 OvmfPkg/Library/PeiDxeTpmPlatformHierarchyLibNull/PeiDxeTpmPlatformHierarchyLib.inf