uefi-ref/edk2
1
0
Fork 0
mirror of https://github.com/tianocore/edk2 synced 2026-08-27 00:23:19 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

BaseTools/GenFv: Parse ,XIP suffix for per-file rebase control

Browse source 
Update ParseFvInf() to detect and strip ",XIP" suffix from
EFI_FILE_NAME values in the FV INF file. Store the per-file XIP
flag in the new XipFile[] array in the FV_INFO structure.

Add FileIndex parameter to FfsRebase() so it can look up the XIP
flag for the current file. When ForceRebase is TRUE, only rebase
files that have their XipFile[] entry set to TRUE.

Signed-off-by: Michael D Kinney <michael.d.kinney@intel.com>
This commit is contained in:
Michael D Kinney 2026-05-05 19:10:45 -07:00 • committed by mergify[bot]
parent adc5e8d009
commit 3ee3b60eb8
2 changed files with 24 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

24
BaseTools/Source/C/GenFv/GenFvInternalLib.c
View file

@ -142,6 +142,7 @@ Returns:
UINTN Number;
EFI_STATUS Status;
EFI_GUID GuidValue;
CHAR8 *XipFlag;
//
// Read the FV base address
@ -325,6 +326,16 @@ Returns:
Status = FindToken (InfFile, FILES_SECTION_STRING, EFI_FILE_NAME_STRING, Index, Value);
if (Status == EFI_SUCCESS) {
//
// Check for ,XIP suffix indicating this file should be rebased
//
XipFlag = strrchr (Value, ',');
if (XipFlag != NULL && stricmp (XipFlag, ",XIP") == 0) {
*XipFlag = '\0';
FvInfo->XipFile[Number + Index] = TRUE;
} else {
FvInfo->XipFile[Number + Index] = FALSE;
}
//
// Add the file
//
@ -1289,7 +1300,7 @@ Returns:
// Rebase the PE or TE image in FileBuffer of FFS file for XIP
// Rebase for the debug genfvmap tool
//
Status = FfsRebase (FvInfo, FvInfo->FvFiles[Index], (EFI_FFS_FILE_HEADER *) FileBuffer, (UINTN) *VtfFileImage - (UINTN) FvImage->FileImage, FvMapFile);
Status = FfsRebase (FvInfo, Index, FvInfo->FvFiles[Index], (EFI_FFS_FILE_HEADER *) FileBuffer, (UINTN) *VtfFileImage - (UINTN) FvImage->FileImage, FvMapFile);
if (EFI_ERROR (Status)) {
Error (NULL, 0, 3000, "Invalid", "Could not rebase %s.", FvInfo->FvFiles[Index]);
return Status;
@ -1335,7 +1346,7 @@ Returns:
// Rebase the PE or TE image in FileBuffer of FFS file for XIP.
// Rebase Bs and Rt drivers for the debug genfvmap tool.
//
Status = FfsRebase (FvInfo, FvInfo->FvFiles[Index], (EFI_FFS_FILE_HEADER *) FileBuffer, (UINTN) FvImage->CurrentFilePointer - (UINTN) FvImage->FileImage, FvMapFile);
Status = FfsRebase (FvInfo, Index, FvInfo->FvFiles[Index], (EFI_FFS_FILE_HEADER *) FileBuffer, (UINTN) FvImage->CurrentFilePointer - (UINTN) FvImage->FileImage, FvMapFile);
if (EFI_ERROR (Status)) {
Error (NULL, 0, 3000, "Invalid", "Could not rebase %s.", FvInfo->FvFiles[Index]);
return Status;
@ -3377,6 +3388,7 @@ Returns:
EFI_STATUS
FfsRebase (
IN OUT FV_INFO *FvInfo,
IN UINTN FileIndex,
IN CHAR8 *FileName,
IN OUT EFI_FFS_FILE_HEADER *FfsFile,
IN UINTN XipOffset,
@ -3451,6 +3463,14 @@ Returns:
return EFI_SUCCESS;
}
//
// If ForceRebase Flag specified to TRUE, only rebase files marked with XIP.
//
if (FvInfo->ForceRebase == 1) {
if (!FvInfo->XipFile[FileIndex]) {
return EFI_SUCCESS;
}
}
XipBase = FvInfo->BaseAddress + XipOffset;

2
BaseTools/Source/C/GenFv/GenFvInternalLib.h
View file

@ -209,6 +209,7 @@ typedef struct {
CHAR8 FvName[MAX_LONG_FILE_PATH];
EFI_FV_BLOCK_MAP_ENTRY FvBlocks[MAX_NUMBER_OF_FV_BLOCKS];
CHAR8 FvFiles[MAX_NUMBER_OF_FILES_IN_FV][MAX_LONG_FILE_PATH];
BOOLEAN XipFile[MAX_NUMBER_OF_FILES_IN_FV];
UINT32 SizeofFvFiles[MAX_NUMBER_OF_FILES_IN_FV];
BOOLEAN IsPiFvImage;
INT8 ForceRebase;
@ -329,6 +330,7 @@ CalculateFvSize (
EFI_STATUS
FfsRebase (
IN OUT FV_INFO *FvInfo,
IN UINTN FileIndex,
IN CHAR8 *FileName,
IN OUT EFI_FFS_FILE_HEADER *FfsFile,
IN UINTN XipOffset,