mirrors/linuxboot
1
0
Fork 0
mirror of https://github.com/linuxboot/linuxboot synced 2024-11-22 17:01:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Allow FFS to request additional alignment padding

Browse Source
This commit is contained in:
Trammell hudson 2018-02-21 17:28:36 -05:00 committed by Trammell Hudson
parent b11a3cd0d1
commit c6247a1dd8
1 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
lib/EFI.pm
View File

@ -43,7 +43,7 @@ my $ffs_hdr_len = 0x18; # FFSv2
#my $ffs_hdr_len = 0x20; # FFSv3 files include a 64-bit length #my $ffs_hdr_len = 0x20; # FFSv3 files include a 64-bit length
my $fv_hdr_len = 0x48; my $fv_hdr_len = 0x48;
my $fv_block_size = 0x1000; # force alignment of files to this spacing my $fv_block_size = 0x20; # force alignment of files to this spacing
@ -467,8 +467,20 @@ sub fv_append
# if the current offset does not align with the block size, # if the current offset does not align with the block size,
# we should add a pad section until the next block # we should add a pad section until the next block
my $block_unaligned = $fv_block_size - (length($$fv_ref) % $fv_block_size); # The firmware files can specify their desired alignment
$block_unaligned += $fv_block_size if $block_unaligned < $ffs_hdr_len; # we just force 4KB is they want anything
my $attr = ord(substr($ffs, 0x13, 1));
my $alignment = ($attr & 0x38) >> 3;
if ($alignment == 0)
{
$alignment = 0x10;
} else {
warn sprintf "alignment attribute %02x\n", $alignment;
$alignment = 0x1000;
}
my $block_unaligned = $alignment - (length($$fv_ref) % $alignment);
$block_unaligned += $alignment if $block_unaligned < $ffs_hdr_len;
$$fv_ref .= EFI::ffs_pad($block_unaligned - $ffs_hdr_len); $$fv_ref .= EFI::ffs_pad($block_unaligned - $ffs_hdr_len);
my $ffs_offset = length($$fv_ref); my $ffs_offset = length($$fv_ref);
@ -676,7 +688,6 @@ sub parse
next => $next, next => $next,
data => $data, data => $data,
}, $class; }, $class;
warn sprintf "%x: %02x len %x\n", $offset, $self->{attr}, $self->length();
return $self; return $self;
} }