Patch set updated for coreboot: util/amdfwtool: Fix duplicate long option name

[Marc Jones]

Marc Jones (marc(a)marcjonesconsulting.com) just uploaded a new patch set to gerrit, which
you can find at https://review.coreboot.org/17146

-gerrit

commit a2e27925284232fae967f250c3690a41a1c7ba38
Author: Marshall Dawson <marshalldawson3rd(a)gmail.com>
Date:   Sat Oct 8 14:49:41 2016 -0600

    util/amdfwtool: Fix duplicate long option name
    
    Make the PSP2 smufirmware2 name unique so the command-line option
    gets picked up.
    
    Original-Signed-off-by: Marshall Dawson <marshalldawson3rd(a)gmail.com>
    Original-Reviewed-by: <marcj303(a)gmail.com>
    (cherry picked from commit 98cf3880797f72aeb7169c3f8718a10092af9624)
    
    Change-Id: I5430cf8b81fb03c95e6ee9d7e53455e6224256ff
    Signed-off-by: Marc Jones <marcj303(a)gmail.com>
---
 src/southbridge/amd/pi/hudson/Makefile.inc | 2 +-
 util/amdfwtool/amdfwtool.c                 | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/southbridge/amd/pi/hudson/Makefile.inc
b/src/southbridge/amd/pi/hudson/Makefile.inc
index 291e25f..59e4240 100644
--- a/src/southbridge/amd/pi/hudson/Makefile.inc
+++ b/src/southbridge/amd/pi/hudson/Makefile.inc
@@ -177,7 +177,7 @@ OPT_SMUSCS_FILE=$(call add_opt_prefix, $(CONFIG_SMUSCS_FILE),
--smuscs)
 
 OPT_2AMD_PUBKEY_FILE=$(call add_opt_prefix, $(CONFIG_2AMD_PUBKEY_FILE), --pubkey2)
 OPT_2PSPBTLDR_FILE=$(call add_opt_prefix, $(CONFIG_2PSPBTLDR_FILE), --bootloader2)
-OPT_2SMUFWM_FILE=$(call add_opt_prefix, $(CONFIG_2SMUFWM_FILE), --smufirmware2)
+OPT_2SMUFWM_FILE=$(call add_opt_prefix, $(CONFIG_2SMUFWM_FILE), --smufirmware_2)
 OPT_2PSPRCVR_FILE=$(call add_opt_prefix, $(CONFIG_2PSPRCVR_FILE), --recovery2)
 OPT_2PUBSIGNEDKEY_FILE=$(call add_opt_prefix, $(CONFIG_2PUBSIGNEDKEY_FILE),
--rtmpubkey2)
 OPT_2PSPSCUREOS_FILE=$(call add_opt_prefix, $(CONFIG_2PSPSCUREOS_FILE), --secureos2)
diff --git a/util/amdfwtool/amdfwtool.c b/util/amdfwtool/amdfwtool.c
index 3dff2ac..5f815ab 100644
--- a/util/amdfwtool/amdfwtool.c
+++ b/util/amdfwtool/amdfwtool.c
@@ -1,7 +1,7 @@
 /*
  * This file is part of the coreboot project.
  *
- * Copyright (C) 2015 Advanced Micro Devices, Inc.
+ * Copyright (C) 2015 - 2016 Advanced Micro Devices, Inc.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -323,7 +323,7 @@ static struct option long_options[] = {
 #if PSP2
 	{"pubkey2",       required_argument, 0, 'P' },
 	{"bootloader2",   required_argument, 0, 'B' },
-	{"smufirmware2",  required_argument, 0, 'S' },
+	{"smufirmware_2", required_argument, 0, 'S' },
 	{"recovery2",     required_argument, 0, 'R' },
 	{"rtmpubkey2",    required_argument, 0, 'K' },
 	{"secureos2",     required_argument, 0, 'C' },