Update firmware section names

utility/load_firmware_test.c

 /* Copyright (c) 2011 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.
  *
  * Routines for verifying a firmware image's signature.
  */
 
 #include <stdio.h>
 
 #include "fmap.h"
@@ skipping 39 matching lines @@
  *
  * [base_of_rom] pointer to firmware image
  * [fmap] pointer to Flash Map of firmware image
  * [gbb_size] GBB size will be stored here if GBB is found
  */
 void* GetFirmwareGBB(const void* base_of_rom, const void* fmap,
                      uint64_t* gbb_size) {
   const FmapHeader* fh = (const FmapHeader*) fmap;
   const FmapAreaHeader* ah = (const FmapAreaHeader*)
     (fmap + sizeof(FmapHeader));
-  int i = FmapAreaIndexOrError(fh, ah, "GBB Area");
+  int i = FmapAreaIndexOrError(fh, ah, "GBB");
 
   if (i < 0)
     return NULL;
 
   *gbb_size = ah[i].area_size;
   return (void*)(base_of_rom + ah[i].area_offset);
 }
 
 /* Get verification block
  *
  * Return zero if succeed, or non-zero if failed
  *
  * [base_of_rom] pointer to firmware image
  * [fmap] pointer to Flash Map of firmware image
  * [index] index of verification block
  * [verification_block_ptr] pointer to storing the found verification block
  * [verification_size_ptr] pointer to store the found verification block size
  */
 int GetVerificationBlock(const void* base_of_rom, const void* fmap, int index,
     void** verification_block_ptr, uint64_t* verification_size_ptr) {
   const char* key_area_name[2] = {
-    "Firmware A Key",
-    "Firmware B Key"
+    "VBLOCK_A",
+    "VBLOCK_B"
   };
   const FmapHeader* fh = (const FmapHeader*) fmap;
   const FmapAreaHeader* ah = (const FmapAreaHeader*)
     (fmap + sizeof(FmapHeader));
   int i = FmapAreaIndexOrError(fh, ah, key_area_name[index]);
   const void* kb;
   const VbKeyBlockHeader* kbh;
   const VbFirmwarePreambleHeader* fph;
 
   if (i < 0)
     return 1;
 
   kb = base_of_rom + ah[i].area_offset;
   *verification_block_ptr = (void*) kb;
 
   kbh = (const VbKeyBlockHeader*) kb;
   fph = (const VbFirmwarePreambleHeader*) (kb + kbh->key_block_size);
 
   *verification_size_ptr = kbh->key_block_size + fph->preamble_size;
 
   return 0;
 }
 
 /* Return non-zero if not found */
 int GetFirmwareData(const void* base_of_rom, const void* fmap, int index,
     void *verification_block, uint8_t** body_ptr, uint64_t *size_ptr) {
   const char* data_area_name[2] = {
-    "Firmware A Data",
-    "Firmware B Data"
+    "FW_MAIN_A",
+    "FW_MAIN_B"
   };
   const FmapHeader* fh = (const FmapHeader*) fmap;
   const FmapAreaHeader* ah = (const FmapAreaHeader*)
     (fmap + sizeof(FmapHeader));
   const VbKeyBlockHeader* kbh = (const VbKeyBlockHeader*) verification_block;
   const VbFirmwarePreambleHeader* fph = (const VbFirmwarePreambleHeader*)
     (verification_block + kbh->key_block_size);
   int i = FmapAreaIndexOrError(fh, ah, data_area_name[index]);
 
   if (i < 0)
@@ skipping 129 matching lines @@
   printf("opened %s\n", image_path);
 
   fmap = FmapFind((char*) base_of_rom, rom_size);
 
   retval = DriveLoadFirmware(base_of_rom, fmap);
 
   Free((void*) base_of_rom);
 
   return retval;
 }