commit f5603d7d2a772e7842e64ec8e9e5c4b558566adf
author philipchen <philipchen@google.com> Tue May 09 16:45:27 2017 -0700
committer chrome-bot <chrome-bot@chromium.org> Wed May 10 20:58:07 2017 -0700
tree 5dc887e9956e7282b340300a64e316d35329ec52
parent d9d6bfddd67c566de1f500539976dc8e00004470

uprev_firmware.sh: Add an option to use image.dev.bin

Before we mark stable firmware, we usually need to debug a board
through AP console. So we should optionally use image.dev.bin,
which enables AP serial input/output, as the main firmware binary.

BUG=None
TEST=build an updater with '--dev', update a DUT, and see AP
serial input/output work.

Change-Id: I2aec2f3a6bc53812684b8fa152b4ed50914c1d62
Reviewed-on: https://chromium-review.googlesource.com/501168
Commit-Ready: Philip Chen <philipchen@chromium.org>
Tested-by: Philip Chen <philipchen@chromium.org>
Reviewed-by: Julius Werner <jwerner@chromium.org>

uprev_firmware.sh

diff --git a/uprev_firmware.sh b/uprev_firmware.sh
index 595fba2..b10f9ed 100755
--- a/uprev_firmware.sh
+++ b/uprev_firmware.sh
@@ -19,6 +19,7 @@
 DEFINE_string fw_version "" "Firmware version of the new firmware" v
 DEFINE_string output_dir "" "Output directory" o
 DEFINE_boolean rw_only "${FLAGS_FALSE}" "Only update RW image"
+DEFINE_boolean dev "${FLAGS_FALSE}" "Use image.dev.bin as the main firmware binary"
 
 FLAGS_HELP="Update chromeos-firmware-${board} ebuild file and tarball in BCS for the new firmware.
 
@@ -83,7 +84,12 @@
       "${EBUILD_FILE}"
   fi
 
-  MAIN_FW_TAR_NAME="${BOARD_NAME}.${FLAGS_fw_version}.tbz2"
+  if [[ "${FLAGS_dev}" -eq "${FLAGS_TRUE}" ]]; then
+    MAIN_FW_TAR_NAME="${BOARD_NAME}.${FLAGS_fw_version}.DEV_IMAGE_DO_NOT_SHIP\
+.tbz2"
+  else
+    MAIN_FW_TAR_NAME="${BOARD_NAME}.${FLAGS_fw_version}.tbz2"
+  fi
   EC_FW_TAR_NAME="${BOARD_NAME}_EC.${FLAGS_fw_version}.tbz2"
   PD_FW_TAR_NAME="${BOARD_NAME}_PD.${FLAGS_fw_version}.tbz2"
 }
@@ -107,6 +113,14 @@
   # Download the firmware tarball.
   gsutil cp "${build_fw_tar_path}" "${TMP}/."
   tar -xvf "${TMP}/${build_fw_tar_name}" -C "${TMP}"
+  if [[ "${FLAGS_dev}" -eq "${FLAGS_TRUE}" ]]; then
+    mv "${TMP}/image.dev.bin" "${TMP}/image.bin"
+    warn "You are uploading a developer image with serial output." \
+      "Please only do this during early bring-up. Dogfooding should always be" \
+      "done with production images since timing differences in developer"\
+      "images can hide bugs and the production image must be sufficiently" \
+      "tested before shipping.\n"
+  fi
   # Make new tarballs for EC/AP FW binaries.
   tar -jcvf "${TMP}/${MAIN_FW_TAR_NAME}" -C "${TMP}" image.bin
   if [[ "${FLAGS_rw_only}" -eq "${FLAGS_FALSE}" ]]; then
@@ -137,10 +151,10 @@
     fi
   fi
 
-  info "Your tarballs are ready at\n"\
-  "${file_list}"\
-  "To continue, please upload them to BCS manually through CPFE:\n"\
-  "https://www.google.com/chromeos/partner/fe/#bcUpload:type=PRIVATE\n"
+  info "Your tarballs are ready at\n" \
+    "${file_list}" \
+    "To continue, please upload them to BCS manually through CPFE:\n" \
+    "https://www.google.com/chromeos/partner/fe/#bcUpload:type=PRIVATE\n"
 }
 
 # Update the firmware ebuild file in the device private overlay