diff options
| author | Edward O'Callaghan <quasisec@google.com> | 2022-02-10 15:02:19 +1100 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2022-03-01 09:42:32 +0000 |
| commit | c31013768eb4ed052c54df50c398f70f2d7ef36d (patch) | |
| tree | 2ef2be6db7746b10beaf42e9a60b3706d653f9b6 | |
| parent | 37055cfb165e233a83820fd561b476edf966d2b0 (diff) | |
| download | vboot-c31013768eb4ed052c54df50c398f70f2d7ef36d.tar.gz | |
vboot_ref/cgpt: Use defines for region consts
BUG=b:207808292,b:220079643
BRANCH=none
TEST=`make cgpt`
Signed-off-by: Edward O'Callaghan <quasisec@google.com>
Change-Id: I367e44eed18c79a807bd428e50a3faf926833719
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/vboot_reference/+/3461097
Auto-Submit: Edward O'Callaghan <quasisec@chromium.org>
Reviewed-by: Nikolai Artemiev <nartemiev@google.com>
Tested-by: Edward O'Callaghan <quasisec@chromium.org>
Commit-Queue: Edward O'Callaghan <quasisec@chromium.org>
| -rw-r--r-- | cgpt/cgpt_nor.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/cgpt/cgpt_nor.c b/cgpt/cgpt_nor.c index 4450adbe..15302715 100644 --- a/cgpt/cgpt_nor.c +++ b/cgpt/cgpt_nor.c @@ -199,6 +199,10 @@ int RemoveDir(const char *dir) { return nftw(dir, remove_file_or_dir, 20, FTW_DEPTH | FTW_PHYS); } +#define FLASHROM_RW_GPT_PRI "RW_GPT_PRIMARY:rw_gpt_1", +#define FLASHROM_RW_GPT_SEC "RW_GPT_SECONDARY:rw_gpt_2" +#define FLASHROM_RW_GPT "RW_GPT:rw_gpt" + // Read RW_GPT from NOR flash to "rw_gpt" in a temp dir |temp_dir_template|. // |temp_dir_template| is passed to mkdtemp() so it must satisfy all // requirements by mkdtemp. @@ -225,7 +229,7 @@ int ReadNorFlash(char *temp_dir_template) { Error("Cannot change directory.\n"); goto out_free; } - const char *const argv[] = {FLASHROM_PATH, "-i", "RW_GPT:rw_gpt", "-r"}; + const char *const argv[] = {FLASHROM_PATH, "-i", FLASHROM_RW_GPT, "-r"}; // Redirect stdout to /dev/null so that flashrom does not muck up cgpt's // output. if (subprocess_run(argv, &subprocess_null, &subprocess_null, NULL) != 0) { @@ -266,7 +270,7 @@ int WriteNorFlash(const char *dir) { Error("Cannot change directory.\n"); goto out_free; } - const char *const argv1[] = {FLASHROM_PATH, "-i", "RW_GPT_PRIMARY:rw_gpt_1", + const char *const argv1[] = {FLASHROM_PATH, "-i", FLASHROM_RW_GPT_PRI, "-w", "--noverify-all"}; // Redirect stdout to /dev/null so that flashrom does not muck up cgpt's // output. @@ -274,7 +278,7 @@ int WriteNorFlash(const char *dir) { Warning("Cannot write the 1st half of rw_gpt back with flashrom.\n"); nr_fails++; } - const char *const argv2[] = {FLASHROM_PATH, "-i", "RW_GPT_SECONDARY:rw_gpt_2", + const char *const argv2[] = {FLASHROM_PATH, "-i", FLASHROM_RW_GPT_SEC, "-w", "--noverify-all"}; // Redirect stdout to /dev/null so that flashrom does not muck up cgpt's // output. |