Change in coreboot[master]: util/ifdtool: Fix argument parsing for layout/validate

[Samuel Holland (Code Review)]

Samuel Holland has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/36049 )

Change subject: util/ifdtool: Fix argument parsing for layout/validate
......................................................................

util/ifdtool: Fix argument parsing for layout/validate

When `mode_validate` was added, a second copy of `mode_layout` was
accidentally added to the multiple-mode-argument check instead. This
prevents `-f` from working. Fix the check to reference the correct
variable.

Change-Id: Ibac6f090550ff63ec9158355b0450da204a300a7
Signed-off-by: Samuel Holland 
---
M util/ifdtool/ifdtool.c
1 file changed, 1 insertion(+), 1 deletion(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/49/36049/1

diff --git a/util/ifdtool/ifdtool.c b/util/ifdtool/ifdtool.c
index 0e83c76..24e20e1 100644
--- a/util/ifdtool/ifdtool.c
+++ b/util/ifdtool/ifdtool.c
@@ -1659,7 +1659,7 @@

if ((mode_dump + mode_layout + mode_extract + mode_inject +
    	mode_newlayout + (mode_spifreq | mode_em100 | mode_unlocked |
-		 mode_locked) + mode_altmedisable + mode_layout) > 1) {
+		 mode_locked) + mode_altmedisable + mode_validate) > 1) {
    	fprintf(stderr, "You may not specify more than one mode.\n\n");
    	print_usage(argv[0]);
    	exit(EXIT_FAILURE);

[Nico Huber (Code Review)]

Nico Huber has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/36049 )

Change subject: util/ifdtool: Fix argument parsing for layout/validate
......................................................................

Patch Set 1: Code-Review+2

[Paul Menzel (Code Review)]

Paul Menzel has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/36049 )

Change subject: util/ifdtool: Fix argument parsing for layout/validate
......................................................................

Patch Set 1: Code-Review+1

[Nico Huber (Code Review)]

Nico Huber has submitted this change. ( https://review.coreboot.org/c/coreboot/+/36049 )

Change subject: util/ifdtool: Fix argument parsing for layout/validate
......................................................................

util/ifdtool: Fix argument parsing for layout/validate

When `mode_validate` was added, a second copy of `mode_layout` was
accidentally added to the multiple-mode-argument check instead. This
prevents `-f` from working. Fix the check to reference the correct
variable.

Change-Id: Ibac6f090550ff63ec9158355b0450da204a300a7
Signed-off-by: Samuel Holland 
Reviewed-on: https://review.coreboot.org/c/coreboot/+/36049
Tested-by: build bot (Jenkins) 
Reviewed-by: Nico Huber 
Reviewed-by: Paul Menzel 
---
M util/ifdtool/ifdtool.c
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  build bot (Jenkins): Verified
  Nico Huber: Looks good to me, approved
  Paul Menzel: Looks good to me, but someone else must approve

diff --git a/util/ifdtool/ifdtool.c b/util/ifdtool/ifdtool.c
index 0e83c76..24e20e1 100644
--- a/util/ifdtool/ifdtool.c
+++ b/util/ifdtool/ifdtool.c
@@ -1659,7 +1659,7 @@

if ((mode_dump + mode_layout + mode_extract + mode_inject +
    	mode_newlayout + (mode_spifreq | mode_em100 | mode_unlocked |
-		 mode_locked) + mode_altmedisable + mode_layout) > 1) {
+		 mode_locked) + mode_altmedisable + mode_validate) > 1) {
    	fprintf(stderr, "You may not specify more than one mode.\n\n");
    	print_usage(argv[0]);
    	exit(EXIT_FAILURE);