Cleanup: DEFAULT.yaml should include locale_names section.

bmpblk_utility correctly supports this field, which can be used by the
factory process to map the localization to the correct locale. We forgot to
put the entries in the DEFAULT.yaml file. This change corrects that for
future releases.

BUG=none
TEST=none

Change-Id: Iea65d7439e6ef8cc8730ec1b862abba87041d93f
Reviewed-on: http://gerrit.chromium.org/gerrit/6424
Reviewed-by: Randall Spangler <rspangler@chromium.org>
Reviewed-by: Bill Richardson <wfrichar@chromium.org>
Tested-by: Bill Richardson <wfrichar@chromium.org>

4 files changed, 64 insertions, 4 deletions

diff --git a/firmware/include/bmpblk_header.h b/firmware/include/bmpblk_header.h
index 9007fe2b..9d42123a 100644
--- a/firmware/include/bmpblk_header.h
+++ b/firmware/include/bmpblk_header.h
@@ -38,6 +38,8 @@
  *  +-----------------------------------------+
  *  |              Image Content              |
  *  +-----------------------------------------+
+ *  |        List of locale names             |
+ *  +-----------------------------------------+
  *
  */
 
@@ -101,9 +103,8 @@ typedef struct ImageInfo {
   uint32_t compressed_size;  /* Size of the compressed image; if image is not
                               * compressed, this will be the same as the
                               * original size. */
-
   uint32_t reserved;
-  /* NOTE: actual image content follows immediately */
+  /* NOTE: The actual image content (if any) follows immediately. */
 } __attribute__((packed)) ImageInfo;
 
 /* Constants for ImageInfo.tag */
diff --git a/scripts/newbitmaps/images/DEFAULT.yaml b/scripts/newbitmaps/images/DEFAULT.yaml
index b5d52baa..3aa9677c 100644
--- a/scripts/newbitmaps/images/DEFAULT.yaml
+++ b/scripts/newbitmaps/images/DEFAULT.yaml
@@ -1399,3 +1399,51 @@ localizations:
   - [ zh_TW_devel, zh_TW_remove, zh_TW_yuck, zh_TW_insert ]
   - [ ko_devel, ko_remove, ko_yuck, ko_insert ]
   - [ ja_devel, ja_remove, ja_yuck, ja_insert ]
+
+locale_index:
+
+  # List the locale names in order so we can choose the default at the factory
+
+  - en
+  - es_419
+  - pt_BR
+  - en_GB
+  - fr
+  - es
+  - pt_PT
+  - ca
+  - it
+  - de
+  - el
+  - nl
+  - da
+  - no
+  - sv
+  - fi
+  - et
+  - lv
+  - lt
+  - ru
+  - pl
+  - cs
+  - sk
+  - hu
+  - sl
+  - sr
+  - hr
+  - bg
+  - ro
+  - uk
+  - tr
+  - iw
+  - ar
+  - fa
+  - hi
+  - th
+  - vi
+  - id
+  - fil
+  - zh_CN
+  - zh_TW
+  - ko
+  - ja
diff --git a/scripts/newbitmaps/images/make_default_yaml b/scripts/newbitmaps/images/make_default_yaml
index ce9212f8..93178f51 100755
--- a/scripts/newbitmaps/images/make_default_yaml
+++ b/scripts/newbitmaps/images/make_default_yaml
@@ -218,6 +218,18 @@ EOF2
       "$yaml_file"
   done
 
+  cat >>"$yaml_file" <<EOF3
+
+locale_index:
+
+  # List the locale names in order so we can choose the default at the factory
+
+EOF3
+
+  for lc in $newlocales; do
+    echo "  - ${lc}" >> "$yaml_file"
+  done
+
 done
 
 # Now replace the 'hwid' string with '$HWID'.
diff --git a/utility/bmpblk_utility.cc b/utility/bmpblk_utility.cc
index ba3f04fb..f4bde7c7 100644
--- a/utility/bmpblk_utility.cc
+++ b/utility/bmpblk_utility.cc
@@ -109,7 +109,7 @@ namespace vboot_reference {
     fclose(fp);
 
 
-    // HEY: Check the yaml file for self-consistency now. Warn on any problems.
+    // TODO: Check the yaml file for self-consistency. Warn on any problems.
     // All images should be used somewhere in the screens.
     // All images referenced in the screens should be defined.
     // All screens should be used somewhere in the localizations.
@@ -145,7 +145,6 @@ namespace vboot_reference {
                  it->second.data.images[k].image_info_offset);
         }
       }
-      // TODO(wfrichar): print debugging info about locale_names
     }
   }