From a3cba84bab36fe39abd853f0cfdcb3cfd744df41 Mon Sep 17 00:00:00 2001
From: Michael Brown
Date: Mon, 11 Jun 2012 19:27:23 +0100
Subject: [util] Update mergerom.pl to handle .mrom images

Signed-off-by: Michael Brown <mcb30@ipxe.org>
---
 src/util/mergerom.pl | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'src/util')

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 ( "-" );
-}
-- 
cgit v1.2.3-55-g7522