scottk/OpenCellular
1
0
Fork 0
mirror of https://github.com/Telecominfraproject/OpenCellular.git synced 2025-12-13 11:27:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

scripts: Add "-p host" to make_dev_firmware.sh.

Browse Source 
Always add "-p host" for flashrom to find right programmer.

BRANCH=None
BUG=chrome-os-partner:60894
TEST=./make_dev_firmware.sh

Change-Id: Iee66e143e77ea258a2a9ff3757d9446b7cf37dbc
Reviewed-on: https://chromium-review.googlesource.com/419860
Commit-Ready: Hung-Te Lin <hungte@chromium.org>
Tested-by: Hung-Te Lin <hungte@chromium.org>
Reviewed-by: Ting Shen <phoenixshen@chromium.org>
This commit is contained in:
Hung-Te Lin
2016-12-14 11:43:16 +08:00
committed by chrome-bot
parent 2a84553d44
commit d140800050
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
scripts/image_signing/make_dev_firmware.sh
View File

@@ -40,6 +40,8 @@ eval set -- "$FLAGS_ARGV"
# ---------------------------------------------------------------------------- # ----------------------------------------------------------------------------
set -e set -e
FLASHROM="flashrom -p host"
# the image we are (temporary) working with # the image we are (temporary) working with
IMAGE="$(make_temp_file)" IMAGE="$(make_temp_file)"
IMAGE="$(readlink -f "$IMAGE")" IMAGE="$(readlink -f "$IMAGE")"
@@ -60,7 +62,7 @@ disable_write_protection() {
# --wp-disable command may return success even if WP is still enabled, # --wp-disable command may return success even if WP is still enabled,
# so we should use --wp-status to verify the results. # so we should use --wp-status to verify the results.
echo "Disabling system software write protection status..." echo "Disabling system software write protection status..."
(flashrom --wp-disable && flashrom --wp-status) 2>&1 | (${FLASHROM} --wp-disable && ${FLASHROM} --wp-status) 2>&1 |
tee "$EXEC_LOG" | tee "$EXEC_LOG" |
grep -q '^WP: .* is disabled\.$' grep -q '^WP: .* is disabled\.$'
} }
@@ -70,9 +72,9 @@ read_image() {
if [ -z "$FLAGS_from" ]; then if [ -z "$FLAGS_from" ]; then
echo "Reading system live firmware..." echo "Reading system live firmware..."
if is_debug_mode; then if is_debug_mode; then
flashrom -V -r "$IMAGE" ${FLASHROM} -V -r "$IMAGE"
else else
flashrom -r "$IMAGE" >"$EXEC_LOG" 2>&1 ${FLASHROM} -r "$IMAGE" >"$EXEC_LOG" 2>&1
fi fi
else else
debug_msg "reading from file: $FLAGS_from" debug_msg "reading from file: $FLAGS_from"
@@ -86,9 +88,9 @@ write_image() {
echo "Writing system live firmware..." echo "Writing system live firmware..."
# TODO(hungte) we can enable partial write to make this faster # TODO(hungte) we can enable partial write to make this faster
if is_debug_mode; then if is_debug_mode; then
flashrom -V -w "$IMAGE" ${FLASHROM} -w "$IMAGE" -V
else else
flashrom -w "$IMAGE" >"$EXEC_LOG" 2>&1 ${FLASHROM} -w "$IMAGE" >"$EXEC_LOG" 2>&1
fi fi
else else
debug_msg "writing to file: $FLAGS_to" debug_msg "writing to file: $FLAGS_to"
@@ -329,8 +331,8 @@ main() {
Please copy the backup file to a safe place ASAP. Please copy the backup file to a safe place ASAP.
To stop using devkeys and restore original firmware, execute command: To stop using devkeys and restore original firmware, execute command:
flashrom -w [PATH_TO_BACKUP_IMAGE] ${FLASHROM} -w [PATH_TO_BACKUP_IMAGE]
Ex: flashrom -w $backup_file_path Ex: ${FLASHROM} -w $backup_file_path
" "
else else
echo "WARNING: Cannot create file in $FLAGS_backup_dir... Ignore backups." echo "WARNING: Cannot create file in $FLAGS_backup_dir... Ignore backups."