OrgACRN
/
slimbootloader
mirror of https://github.com/slimbootloader/slimbootloader.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Leverage EDKII Build System to Perform uCode Slotting 

Signed-off-by: Sean McGinn <sean.mcginn@intel.com>
This commit is contained in:
Sean McGinn 2022-05-18 11:10:33 -07:00 committed by Guo Dong
parent 0a332af102
commit ca305b89bf
2 changed files with 13 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
BootloaderCorePkg/BootloaderCorePkg.dsc
View File

@ -440,7 +440,14 @@
!endif
!if $(UCODE_SIZE) > 0
$(MICROCODE_INF_FILE)
!if $(UCODE_SLOT_SIZE) > 0
$(MICROCODE_INF_FILE) {
<BuildOptions>
*_*_*_GENFW_FLAGS = --align $(UCODE_SLOT_SIZE)
}
!else
$(MICROCODE_INF_FILE)
!endif
!endif
[BuildOptions.Common.EDKII]

48
BuildLoader.py
View File

@ -348,9 +348,9 @@ class Build(object):
num_fit_entries = 0
if self._board.UCODE_SIZE > 0:
ucode_base = self._board.UCODE_BASE
ucode_offset = ucode_base - base;
if (ucode_offset < 0):
raise Exception (' UCODE %x\n UCODE address (0x%08X) out of range' % (base, ucode_base))
ucode_offset = ucode_base - base
if ucode_offset < 0:
raise Exception ('UCODE %x\n UCODE address (0x%08X) out of range' % (base, ucode_base))
# Collect all CPU uCode images
u_code_images = []
@ -361,6 +361,8 @@ class Build(object):
u_code_images.append(ucode_offset)
num_fit_entries += 1
if (hasattr (self._board, "UCODE_SLOT_SIZE")):
if ucode_hdr.total_size > self._board.UCODE_SLOT_SIZE:
raise Exception ('UCODE total size (0x%08X) greater than UCODE slot size' % (ucode_hdr.total_size, self._board.UCODE_SLOT_SIZE))
ucode_offset += self._board.UCODE_SLOT_SIZE
elif ucode_hdr.total_size:
ucode_offset += ucode_hdr.total_size
@ -1072,18 +1074,6 @@ class Build(object):
out_file = os.path.join("Outputs", self._board.BOARD_NAME, 'Stitch_Components.zip')
copy_images_to_output (self._fv_dir, out_file, self._img_list, rgn_name_list, extra_list)
def pad_file(self, file, size):
with open(file, "rb") as fd:
binary = fd.read()
if len(binary) > size:
print(("Microcode patch %s is larger than slot size(%d)\n") % (file, size))
assert (False)
elif len(binary) < size:
binary = binary + b'\xff' * (size - len(binary))
with open(file, "wb") as fd:
fd.write(binary)
def pre_build(self):
# Update search path
sbl_dir = os.environ['SBL_SOURCE']
@ -1152,34 +1142,6 @@ class Build(object):
if ret:
raise Exception ('Failed to prepare build component binaries !')
# if slot size exists, pad the uCode files before they are combined
if hasattr(self._board, 'UCODE_SLOT_SIZE'):
microcode_inf = os.path.join(os.environ['PLT_SOURCE'], self._board.MICROCODE_INF_FILE)
microcode_dir = os.path.dirname(microcode_inf)
microcode_rel_paths = []
# get relevant uCode files
fd = open(microcode_inf, 'r')
lines = fd.readlines()
fd.close()
has_sources_section = False
for line in lines:
line = line.strip()
if line.startswith('['):
if line.startswith('[Sources]'):
has_sources_section = True
else:
has_sources_section = False
if has_sources_section:
match = re.match(".+\.mcb", line)
if match:
microcode_rel_paths.append(match.group(0).strip())
# perform the padding
for microcode_rel_path in microcode_rel_paths:
microcode_abs_path = os.path.join(microcode_dir, microcode_rel_path)
self.pad_file(microcode_abs_path, self._board.UCODE_SLOT_SIZE)
# create FSP size and UPD size can be known
fsp_list = ['FSP_T', 'FSP_M', 'FSP_S']
if self._board.HAVE_FSP_BIN: