Support new style flashmap labels for firmware signing

scripts/image_signing/resign_firmwarefd.sh

 #!/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.
 
 # Script to resign a firmware image using a different set of keys
 # for use on signing servers.
 #
 # arguments: src_fd, dst_fd, firmware_datakey, and firmware_keyblock
@@ skipping 63 matching lines @@
 VERSION=$6
 
 if [ -z $VERSION ]; then
   VERSION=1
 fi
 echo "Using firmware version: $VERSION"
 
 # Parse offsets and size of firmware data and vblocks
 for i in "A" "B"
 do
-  match_str="$i Key"
-  line=$(mosys -f -k eeprom map $1 | grep "$match_str")
+  line=$(mosys -f -k eeprom map $1 | grep "$i Key") ||
+  line=$(mosys -f -k eeprom map $1 | grep "VBLOCK_$i") ||
+   { echo "Couldn't parse vblock section $i from mosys output";
+     exit 1; }
+
   offset="$(echo $line | sed -e 's/.*area_offset=\"\([a-f0-9x]*\)\".*/\1/')"
   eval fw${i}_vblock_offset=$((offset))
   size="$(echo $line | sed -e 's/.*area_size=\"\([a-f0-9x]*\)\".*/\1/')"
   eval fw${i}_vblock_size=$((size))
 
-  match_str="$i Data"
-  line=$(mosys -f -k eeprom map $1 | grep "$match_str")
+  line=$(mosys -f -k eeprom map $1 | grep "$i Data") ||
+  line=$(mosys -f -k eeprom map $1 | grep "FW_MAIN_$i") ||
+  { echo "Couldn't parse Firmware $i section from mosys output";
+    exit 1; }
+
   offset="$(echo $line | sed -e 's/.*area_offset=\"\([a-f0-9x]*\)\".*/\1/')"
   eval fw${i}_offset=$((offset))
   size="$(echo $line | sed -e 's/.*area_size=\"\([a-f0-9x]*\)\".*/\1/')"
   eval fw${i}_size=$((size))
 done
 
 temp_fwimage=$(make_temp_file)
 temp_out_vb=$(make_temp_file)
 
 # Extract out Firmware A data and generate signature using the right keys
@@ skipping 24 matching lines @@
   --signprivate "${FIRMWARE_DATAKEY}" \
   --version "${VERSION}" \
   --fv "${temp_fwimage}" \
   --kernelkey "${KERNEL_SUBKEY}"
 
 # Destination image has already been created.
 dd if="${temp_out_vb}" of="${DST_FD}" seek="${fwB_vblock_offset}" bs=1 \
   count="${fwB_vblock_size}" conv=notrunc
 
 echo "New signed image was output to ${DST_FD}"