Change flashrom target selection parameter.
The "-p internal:bus=*" is now deprecated by "-p {host,ec}" because we may have
EC on SPI bus.
BUG=none
TEST=manually executed dev_debug_vboot and see correct output.
BRANCH=none
Original-Change-Id: I6363c09c2ebf57812bf35b7db220303a2786db20
Reviewed-on: https://gerrit.chromium.org/gerrit/66321
Tested-by: Hung-Te Lin <hungte@chromium.org>
Reviewed-by: Yung-Chieh Lo <yjlou@chromium.org>
Commit-Queue: Hung-Te Lin <hungte@chromium.org>
(cherry picked from commit 798cc91de11d5a78e379c67731dcafaf2aae01e1)
Change-Id: I937c21f0334446c959f88770c4272852e721f6cb
Signed-off-by: Duncan Laurie <dlaurie@chromium.org>
Reviewed-on: https://gerrit.chromium.org/gerrit/66654
diff --git a/scripts/image_signing/make_dev_ssd.sh b/scripts/image_signing/make_dev_ssd.sh
index 5be09cb..be9eddb 100755
--- a/scripts/image_signing/make_dev_ssd.sh
+++ b/scripts/image_signing/make_dev_ssd.sh
@@ -329,7 +329,7 @@
local bios_image="$(make_temp_file)"
local rootkey_file="$(make_temp_file)"
echo "INFO: checking system firmware..."
- sudo flashrom -p internal:bus=spi -i GBB -r "$bios_image" >/dev/null 2>&1
+ sudo flashrom -p host -i GBB -r "$bios_image" >/dev/null 2>&1
gbb_utility -g --rootkey="$rootkey_file" "$bios_image" >/dev/null 2>&1
if [ ! -s "$rootkey_file" ]; then
debug_msg "failed to read root key from system firmware..."
diff --git a/scripts/image_signing/set_gbb_flags.sh b/scripts/image_signing/set_gbb_flags.sh
index 5469f1a..e812dba 100755
--- a/scripts/image_signing/set_gbb_flags.sh
+++ b/scripts/image_signing/set_gbb_flags.sh
@@ -43,7 +43,7 @@
Usage: $0 [option_flags] GBB_FLAGS_VALUE
$GBBFLAGS_DESCRIPTION"
-FLASHROM_COMMON_OPT="-p internal:bus=spi"
+FLASHROM_COMMON_OPT="-p host"
FLASHROM_READ_OPT="$FLASHROM_COMMON_OPT -i GBB -r"
FLASHROM_WRITE_OPT="$FLASHROM_COMMON_OPT -i GBB --fast-verify -w"
diff --git a/scripts/image_signing/tofactory.sh b/scripts/image_signing/tofactory.sh
index 1c5f3bd..e972dca 100755
--- a/scripts/image_signing/tofactory.sh
+++ b/scripts/image_signing/tofactory.sh
@@ -40,8 +40,8 @@
set -e
# Flashrom commands with device overrides
-FLASHROM_BIOS="flashrom -p internal:bus=spi"
-FLASHROM_EC="flashrom -p internal:bus=lpc"
+FLASHROM_BIOS="flashrom -p host"
+FLASHROM_EC="flashrom -p ec"
# A log file to keep the output results of executed command
EXEC_LOG="$(make_temp_file)"
diff --git a/utility/dev_debug_vboot b/utility/dev_debug_vboot
index 760d6f8..698a5bd 100755
--- a/utility/dev_debug_vboot
+++ b/utility/dev_debug_vboot
@@ -260,7 +260,7 @@
for d in $devs; do
log cgpt show $d
done
-log flashrom -V -p internal:bus=spi --wp-status
+log flashrom -V -p host --wp-status
tpm_fwver=$(crossystem tpm_fwver) || tpm_fwver="UNKNOWN"
tpm_kernver=$(crossystem tpm_kernver) || tpm_kernver="UNKNOWN"
set -e
@@ -273,14 +273,14 @@
fix_old_names
else
# Read it from the flash
- if log flashrom -p internal:bus=spi -r bios.rom ; then
+ if log flashrom -p host -r bios.rom ; then
# If we can read the whole BIOS at once, great.
log dump_fmap -x bios.rom
fix_old_names
else
# Otherwise pull just the components we want (implying new-style names)
info " ...individually..."
- log flashrom -p internal:bus=spi -r /dev/null \
+ log flashrom -p host -r /dev/null \
-i"GBB":GBB \
-i"VBLOCK_A":VBLOCK_A \
-i"VBLOCK_B":VBLOCK_B \
