diff options
| author | peihong huang <Pei-Hong.Huang@Sun.COM> | 2009-05-07 17:38:40 +0800 |
|---|---|---|
| committer | peihong huang <Pei-Hong.Huang@Sun.COM> | 2009-05-07 17:38:40 +0800 |
| commit | 87d06e46cdea545c3c673120b7211158dcfd35cc (patch) | |
| tree | e0ca001eb76a9b2ee60b5299d95072c124aa9074 /usr/src/cmd/fwflash | |
| parent | a9cfc1da47caa02ae3010fb1d0f6a367dc24a954 (diff) | |
| download | illumos-joyent-87d06e46cdea545c3c673120b7211158dcfd35cc.tar.gz | |
6834721 remove all vestiges of MANUFACTURING_MODE from fwflash
Diffstat (limited to 'usr/src/cmd/fwflash')
| -rw-r--r-- | usr/src/cmd/fwflash/common/fwflash.c | 12 | ||||
| -rw-r--r-- | usr/src/cmd/fwflash/common/fwflash.h | 4 | ||||
| -rw-r--r-- | usr/src/cmd/fwflash/plugins/transport/common/ses.c | 3 |
3 files changed, 4 insertions, 15 deletions
diff --git a/usr/src/cmd/fwflash/common/fwflash.c b/usr/src/cmd/fwflash/common/fwflash.c index 56b7fb7c3b..8514eaa07f 100644 --- a/usr/src/cmd/fwflash/common/fwflash.c +++ b/usr/src/cmd/fwflash/common/fwflash.c @@ -19,7 +19,7 @@ * CDDL HEADER END */ /* - * Copyright 2008 Sun Microsystems, Inc. All rights reserved. + * Copyright 2009 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -130,7 +130,7 @@ main(int argc, char **argv) return (FWFLASH_FAILURE); } - while ((ch = getopt(argc, argv, "hvylc:f:r:Qd:M")) != EOF) { + while ((ch = getopt(argc, argv, "hvylc:f:r:Qd:")) != EOF) { switch (ch) { case 'h': fwflash_arg_list |= FWFLASH_HELP_FLAG; @@ -168,14 +168,6 @@ main(int argc, char **argv) /* NOT in the manpage */ fwflash_debug = 1; break; - case 'M': - /* NOT in the manpage */ -#if (MANUFACTURING_MODE > 0) - manufacturing_mode = 1; - logmsg(MSG_WARN, "Enabling Manufacturing Mode " - "operations. This can be destructive!\n"); - break; -#endif /* illegal options */ default: fwflash_usage(optarg); diff --git a/usr/src/cmd/fwflash/common/fwflash.h b/usr/src/cmd/fwflash/common/fwflash.h index 9d179fcfdb..ff7985d19c 100644 --- a/usr/src/cmd/fwflash/common/fwflash.h +++ b/usr/src/cmd/fwflash/common/fwflash.h @@ -19,7 +19,7 @@ * CDDL HEADER END */ /* - * Copyright 2008 Sun Microsystems, Inc. All rights reserved. + * Copyright 2009 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -337,8 +337,6 @@ struct vrfyplugin *verifier; di_node_t rootnode; struct fw_plugin *self; -int manufacturing_mode = 0; - /* * utility defines and macros, since the firmware image we get * from LSI is ARM-format and that means byte- and short-swapping diff --git a/usr/src/cmd/fwflash/plugins/transport/common/ses.c b/usr/src/cmd/fwflash/plugins/transport/common/ses.c index 30f64b4e2f..104dbec3e5 100644 --- a/usr/src/cmd/fwflash/plugins/transport/common/ses.c +++ b/usr/src/cmd/fwflash/plugins/transport/common/ses.c @@ -708,8 +708,7 @@ sendimg(ses_node_t *np, void *data) /* * If the bufferid isn't 2, then the verifier has already - * OK'd the image that the user has provided. That means - * we've got manufacturing_mode = 1 from the command line. + * OK'd the image that the user has provided. * * At present the non-"standard" images need to be flashed * using the scsi WRITE BUFFER command |