summaryrefslogtreecommitdiffstats
path: root/src/util
diff options
context:
space:
mode:
authorMichael Brown2012-06-11 20:27:23 +0200
committerMichael Brown2012-06-12 16:15:06 +0200
commita3cba84bab36fe39abd853f0cfdcb3cfd744df41 (patch)
treeb95276e13740736c08cb2e20058932b696773cdd /src/util
parent[romprefix] Allow .mrom image to be placed anywhere within the BAR (diff)
downloadipxe-a3cba84bab36fe39abd853f0cfdcb3cfd744df41.tar.gz
ipxe-a3cba84bab36fe39abd853f0cfdcb3cfd744df41.tar.xz
ipxe-a3cba84bab36fe39abd853f0cfdcb3cfd744df41.zip
[util] Update mergerom.pl to handle .mrom images
Signed-off-by: Michael Brown <mcb30@ipxe.org>
Diffstat (limited to 'src/util')
-rwxr-xr-xsrc/util/mergerom.pl9
1 files changed, 6 insertions, 3 deletions
diff --git a/src/util/mergerom.pl b/src/util/mergerom.pl
index f9c52502..a1b456e2 100755
--- a/src/util/mergerom.pl
+++ b/src/util/mergerom.pl
@@ -87,12 +87,15 @@ foreach my $rom ( @roms ) {
# Fix checksum for this ROM segment
$rom->fix_checksum();
+ # Add this ROM to base ROM
+ my $data = substr ( $baserom->get(), 0, $baserom->length() );
+ $data .= $rom->get();
+ $data .= $baserom->next_image()->get() if $baserom->next_image();
+ $baserom->set ( $data );
+
$offset += $rom->length;
}
$baserom->pnp_header->fix_checksum() if $baserom->pnp_header;
$baserom->fix_checksum();
$baserom->save ( "-" );
-foreach my $rom ( @roms ) {
- $rom->save ( "-" );
-}