From: Michael Brown <mcb30@ipxe.org>
Date: Mon, 11 Jun 2012 18:27:23 +0000 (+0100)
Subject: [util] Update mergerom.pl to handle .mrom images
X-Git-Tag: v1.20.1~1753
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a3cba84bab36fe39abd853f0cfdcb3cfd744df41;p=thirdparty%2Fipxe.git

[util] Update mergerom.pl to handle .mrom images

Signed-off-by: Michael Brown <mcb30@ipxe.org>
---

diff --git a/src/util/mergerom.pl b/src/util/mergerom.pl
index f9c52502d..a1b456e25 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 ( "-" );
-}