From a6d6818f7823459eb1b66bc8e21cd3e647801385 Mon Sep 17 00:00:00 2001 From: Hsuan Ting Chen Date: Thu, 14 Sep 2023 11:46:20 +0800 Subject: [PATCH] util: Drop flashrom -p host alias which equals to -p internal There is a technical debt in ChromeOS flashrom, `cros_alias.c`, which is to work around ChromeOS calling flashrom with `-p host` instead of `-p internal`. Replace all `-p host` occurrences with `-p internal`. BUG=b:296978620 TEST=none Signed-off-by: Hsuan Ting Chen Change-Id: I81674213b9a21598002f349ced1130f0844841ca Reviewed-on: https://review.coreboot.org/c/coreboot/+/77865 Tested-by: build bot (Jenkins) Reviewed-by: Edward O'Callaghan Reviewed-by: Martin L Roth --- util/cbfstool/flashrom.c | 2 +- util/mma/mma_setup_test.sh | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/util/cbfstool/flashrom.c b/util/cbfstool/flashrom.c index 6e438bfe22..fe3fb7b3d8 100644 --- a/util/cbfstool/flashrom.c +++ b/util/cbfstool/flashrom.c @@ -21,7 +21,7 @@ #include "flashrom.h" #define FLASHROM_EXEC_NAME "flashrom" -#define FLASHROM_PROGRAMMER_INTERNAL_AP "host" +#define FLASHROM_PROGRAMMER_INTERNAL_AP "internal" /** * Helper to create a temporary file. diff --git a/util/mma/mma_setup_test.sh b/util/mma/mma_setup_test.sh index 75bce36178..f07cd900cd 100755 --- a/util/mma/mma_setup_test.sh +++ b/util/mma/mma_setup_test.sh @@ -86,7 +86,7 @@ show_usage() { write_flash() { printf "Writing back flash contents "${flashrom_temp_image}"\n" - flashrom -p host -w "${flashrom_temp_image}" --noverify-all || \ + flashrom -p internal -w "${flashrom_temp_image}" --noverify-all || \ { printf "failed to read flash\n" ; exit -1; @@ -176,7 +176,7 @@ main() { remove_file_if_exists "${flashrom_temp_image}" printf "Reading flash contents to "${flashrom_temp_image}"\n" - flashrom -p host -r "${flashrom_temp_image}" || \ + flashrom -p internal -r "${flashrom_temp_image}" || \ { printf "failed to read flash\n" ; exit -1;