From 90099b68036f89991af7d31f478e9c6b08c7ac93 Mon Sep 17 00:00:00 2001 From: Marc Jones Date: Tue, 20 Sep 2016 21:05:45 -0600 Subject: util/amdfwtool: Add PSP2 options to optstring Original-Signed-off-by: Marc Jones Original-Signed-off-by: Marshall Dawson (cherry picked from commit 482b65c219b932fd374f2ac469a023db219a66de) Change-Id: I0a24a0aa4c7d9f4a8cc3ee9b7da60ea7704e6f17 Signed-off-by: Marc Jones Reviewed-on: https://review.coreboot.org/17147 Tested-by: build bot (Jenkins) Reviewed-by: Paul Menzel Reviewed-by: Martin Roth Reviewed-by: Zheng Bao --- util/amdfwtool/amdfwtool.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/util/amdfwtool/amdfwtool.c b/util/amdfwtool/amdfwtool.c index 5f815ab074..3af0078ae3 100644 --- a/util/amdfwtool/amdfwtool.c +++ b/util/amdfwtool/amdfwtool.c @@ -300,7 +300,12 @@ uint32_t integrate_psp_firmwares(void *base, uint32_t pos, uint32_t *pspdir, amd return pos; } -static const char *optstring = "x:i:g:p:b:s:r:k:o:n:d:t:u:w:m:h"; +#if PSP2 +static const char *optstring = "x:i:g:p:b:s:r:k:c:n:d:t:u:w:m:P:B:S:R:K:C:N:D:T:U:W:M:o:h"; +#else +static const char *optstring = "x:i:g:p:b:s:r:k:c:n:d:t:u:w:m:o:h"; +#endif + static struct option long_options[] = { {"xhci", required_argument, 0, 'x' }, {"imc", required_argument, 0, 'i' }, -- cgit v1.2.3