Don't prepend 'fmap.' to section names. It will break the Cr-48 installer.

utility/dev_debug_vboot

 #!/bin/sh
 # 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.
 #
 # Usage:  dev_debug_vboot [ --cleanup | DIRECTORY ]
 #
 # This extracts some useful debugging information about verified boot. A short
 # summary is printed on stdout, more detailed information and working files are
 # left in a log directory.
@@ skipping 29 matching lines @@
 
 log() {
   echo "+" "$@" >> "$LOGFILE"
   "$@" >> "$LOGFILE" 2>&1
 }
 
 loghead() {
   echo "+" "$@" "| head" >> "$LOGFILE"
   "$@" | head >> "$LOGFILE" 2>&1
 }
+
 logdie() {
   echo "+" "$@" >> "$LOGFILE"
-  "$@" >> "$LOGFILE" 2>&1
   die "$@"
 }
 
 result() {
   if [ "$?" = "0" ]; then
     info "OK"
   else
     info "FAILED"
   fi
 }
 
 require_chromeos_bios() {
   log cgpt show "${HD}"
   log rootdev -s
   if [ ! -e "${ACPI}/HWID" ]; then
     info "Not running Chrome OS BIOS, no further information available"
     exit 0
   fi
   # including /dev/null just to get final "\n"
   log head "${ACPI}"/*ID "${ACPI}"/BINF* "${ACPI}"/CHSW /dev/null
   log reboot_mode
   log ls -la /mnt/stateful_partition/.need_firmware_update
   log ls -la /root/.force_update_firmware
 }
 
+# Search for files from the FMAP, in the order listed. Return the first one
+# found or die if none are there.
+find_name() {
+  for fn in "$@"; do
+    if [ -e "$fn" ]; then
+      echo "$fn"
+      return
+    fi
+  done
+  echo "+ no files named $@" >> "$LOGFILE"
+  exit 1
+}
+
 # Here we go...
 umask 022
 trap cleanup EXIT
 
 # Parse args
 if [ -n "$1" ]; then
   if [ "$1" = "--cleanup" ]; then
     CLEANUP=1
   else
     TMPDIR="$1"
@@ skipping 34 matching lines @@
   fi
 fi
 
 # Make sure we have something to work on
 [ -f "$BIOS" ] || logdie "no BIOS image found"
 ls *kern*.blob >/dev/null 2>&1 || logdie "no kernel images found"
 
 info "Extracting BIOS components..."
 log dump_fmap -x ${BIOS} || logdie "Unable to extract BIOS components"
 
+# Find the FMAP regions we're interested in. Look first for the new names, then
+# the old names.
+area_gbb=$(find_name       GBB       GBB_Area) || \
+  logdie "no area_gbb"
+area_vblock_a=$(find_name  VBLOCK_A  Firmware_A_Key) || \
+  logdie "no area_vblock_a"
+area_vblock_b=$(find_name  VBLOCK_B  Firmware_B_Key) || \
+  logdie "no area_vblock_b"
+area_fw_main_a=$(find_name FW_MAIN_A Firmware_A_Data) || \
+  logdie "no area_fw_main_a"
+area_fw_main_b=$(find_name FW_MAIN_B Firmware_B_Data) || \
+  logdie "no area_fw_main_a"
+
 info "Pulling root and recovery keys from GBB..."
 log gbb_utility -g --rootkey rootkey.vbpubk --recoverykey recoverykey.vbpubk \
-  GBB_Area || logdie "Unable to extract keys from GBB"
+  "$area_gbb" || logdie "Unable to extract keys from GBB"
 log vbutil_key --unpack rootkey.vbpubk
 log vbutil_key --unpack recoverykey.vbpubk
 
 infon "Verify firmware A with root key... "
-log vbutil_firmware --verify Firmware_A_Key --signpubkey rootkey.vbpubk \
-  --fv Firmware_A_Data --kernelkey kernel_subkey_a.vbpubk ; result
+log vbutil_firmware --verify "$area_vblock_a" --signpubkey rootkey.vbpubk \
+  --fv "$area_fw_main_a" --kernelkey kernel_subkey_a.vbpubk ; result
 infon "Verify firmware B with root key... "
-log vbutil_firmware --verify Firmware_B_Key --signpubkey rootkey.vbpubk \
-  --fv Firmware_B_Data --kernelkey kernel_subkey_b.vbpubk ; result
+log vbutil_firmware --verify "$area_vblock_b" --signpubkey rootkey.vbpubk \
+  --fv "$area_fw_main_b" --kernelkey kernel_subkey_b.vbpubk ; result
 
 for key in kernel_subkey_a.vbpubk kernel_subkey_b.vbpubk; do
   infon "Test $key... "
   log vbutil_key --unpack $key ; result
 done
 
 for keyblock in *kern*.blob; do
   infon "Test $keyblock... "
   log vbutil_keyblock --unpack $keyblock ; result
   loghead od -Ax -tx1 $keyblock
 done
 
 # Test each kernel with each key
 for key in kernel_subkey_a.vbpubk kernel_subkey_b.vbpubk recoverykey.vbpubk; do
   for kern in *kern*.blob; do
     infon "Verify $kern with $key... "
     log vbutil_kernel --verify $kern --signpubkey $key ; result
   done
 done