From 67bbb6db4145c660a989e9434a6a87897cc9ae6b Mon Sep 17 00:00:00 2001 From: Marshall Dawson Date: Mon, 4 Mar 2019 12:11:00 -0700 Subject: util/amdfwtool: Remove fanless SMU options Complete the removal of the fanless command line options. The only soc using them has been converted to use the subprogram option instead. TEST=Verify amdfw.rom is unchanged before and after the conversion BUG=b:126691068 Change-Id: I187f17743cc98cc136b0df61caf8e95d17f98d51 Signed-off-by: Marshall Dawson Reviewed-on: https://review.coreboot.org/c/coreboot/+/31737 Reviewed-by: Martin Roth Reviewed-by: Paul Menzel Tested-by: build bot (Jenkins) --- util/amdfwtool/amdfwtool.c | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) (limited to 'util/amdfwtool') diff --git a/util/amdfwtool/amdfwtool.c b/util/amdfwtool/amdfwtool.c index f0a6549dea..376887c2ec 100644 --- a/util/amdfwtool/amdfwtool.c +++ b/util/amdfwtool/amdfwtool.c @@ -175,7 +175,6 @@ static void usage(void) printf("-b | --bootloader Add bootloader\n"); printf("-S | --subprogram Sets subprogram field for the next firmware\n"); printf("-s | --smufirmware Add smufirmware\n"); - printf("-j | --smufnfirmware Add fanless smufirmware\n"); printf("-r | --recovery Add recovery\n"); printf("-k | --rtmpubkey Add rtmpubkey\n"); printf("-c | --secureos Add secureos\n"); @@ -184,7 +183,6 @@ static void usage(void) printf("-t | --trustlets Add trustlets\n"); printf("-u | --trustletkey Add trustletkey\n"); printf("-w | --smufirmware2 Add smufirmware2\n"); - printf("-e | --smufnfirmware2 Add fanless smufirmware2\n"); printf("-m | --smuscs Add smuscs\n"); printf("\n-o | --output output filename\n"); printf("-f | --flashsize ROM size in bytes\n"); @@ -485,7 +483,7 @@ static void integrate_psp_firmwares(context *ctx, fill_dir_header(pspdir, count, PSP_COOKIE); } -static const char *optstring = "x:i:g:AS:p:b:s:r:k:c:n:d:t:u:w:e:j:m:o:f:l:h"; +static const char *optstring = "x:i:g:AS:p:b:s:r:k:c:n:d:t:u:w:m:o:f:l:h"; static struct option long_options[] = { {"xhci", required_argument, 0, 'x' }, @@ -497,7 +495,6 @@ static struct option long_options[] = { {"pubkey", required_argument, 0, 'p' }, {"bootloader", required_argument, 0, 'b' }, {"smufirmware", required_argument, 0, 's' }, - {"smufnfirmware", required_argument, 0, 'j' }, {"recovery", required_argument, 0, 'r' }, {"rtmpubkey", required_argument, 0, 'k' }, {"secureos", required_argument, 0, 'c' }, @@ -506,7 +503,6 @@ static struct option long_options[] = { {"trustlets", required_argument, 0, 't' }, {"trustletkey", required_argument, 0, 'u' }, {"smufirmware2", required_argument, 0, 'w' }, - {"smufnfirmware2", required_argument, 0, 'e' }, {"smuscs", required_argument, 0, 'm' }, {"output", required_argument, 0, 'o' }, {"flashsize", required_argument, 0, 'f' }, @@ -598,12 +594,6 @@ int main(int argc, char **argv) sub, optarg); sub = 0; break; - case 'j': - /* todo: remove the fanless option */ - register_fw_filename(AMD_FW_PSP_SMU_FIRMWARE, - 1, optarg); - sub = 0; - break; case 'r': register_fw_filename(AMD_FW_PSP_RECOVERY, sub, optarg); sub = 0; @@ -641,12 +631,6 @@ int main(int argc, char **argv) sub, optarg); sub = 0; break; - case 'e': - /* todo: remove the fanless option */ - register_fw_filename(AMD_FW_PSP_SMU_FIRMWARE2, - 1, optarg); - sub = 0; - break; case 'm': register_fw_filename(AMD_FW_PSP_SMUSCS, sub, optarg); sub = 0; -- cgit v1.2.3