Write images to the bmpblock in the order they appear in the yaml.

utility/bmpblk_utility.cc

 // Copyright (c) 2010 The Chromium OS Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 //
 // Utility for manipulating firmware screen block (BMPBLOCK) in GBB.
 //
 
 #include "bmpblk_utility.h"
 
 #include <assert.h>
@@ skipping 170 matching lines @@
     yaml_parser_parse(parser, &event);
     switch (event.type) {
       case YAML_SCALAR_EVENT:
         image_name = (char*)event.data.scalar.value;
         yaml_event_delete(&event);
         yaml_parser_parse(parser, &event);
         if (event.type != YAML_SCALAR_EVENT) {
           error("Syntax error in parsing images.\n");
         }
         image_filename = (char*)event.data.scalar.value;
+        config_.image_names.push_back(image_name);
         config_.images_map[image_name] = ImageConfig();
         config_.images_map[image_name].filename = image_filename;
         break;
       case YAML_MAPPING_END_EVENT:
         yaml_event_delete(&event);
         return;
       default:
         error("Syntax error in parsing images.\n");
     }
     yaml_event_delete(&event);
@@ skipping 235 matching lines @@
   }
   config_.header.number_of_imageinfos = config_.images_map.size();
 }
 
 void BmpBlockUtil::pack_bmpblock() {
   bmpblock_.clear();
 
   /* Compute the ImageInfo offsets from start of BMPBLOCK. */
   uint32_t current_offset = sizeof(BmpBlockHeader) +
                             sizeof(ScreenLayout) * config_.screens_map.size();
-  for (StrImageConfigMap::iterator it = config_.images_map.begin();
-       it != config_.images_map.end();
-       ++it) {
-    it->second.offset = current_offset;
-    current_offset += sizeof(ImageInfo) + it->second.data.compressed_size;
+  for (unsigned int i = 0; i < config_.image_names.size(); ++i) {
+    string image_name = config_.image_names[i];
+    ImageConfig &img = config_.images_map[image_name];
+    img.offset = current_offset;
+    current_offset += sizeof(ImageInfo) +
+      config_.images_map[image_name].data.compressed_size;
     /* Make it 4-byte aligned. */
     if ((current_offset & 3) > 0) {
       current_offset = (current_offset & ~3) + 4;
     }
   }
   bmpblock_.resize(current_offset);
 
   /* Fill BmpBlockHeader struct. */
   string::iterator current_filled = bmpblock_.begin();
   std::copy(reinterpret_cast<char*>(&config_.header),
@@ skipping 184 matching lines @@
   else if (extract_mode) {
     return dump_bmpblock(bmpblock_fn, 1, extract_dir, overwrite);
   } else {
     return dump_bmpblock(bmpblock_fn, show_as_yaml, 0, 0);
   }
 
   return 0;
 }
 
 #endif  // WITH_UTIL_MAIN