diff options
| author | Wolfgang Denk <wd@denx.de> | 2010-10-05 14:42:32 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2010-10-05 14:42:32 +0200 |
| commit | d6288664743cdd4824cb877ca424619c827c1256 (patch) | |
| tree | 3c6c64f71cd5a1bc3467ab722490de5b8e898405 /common | |
| parent | db682a0b59b2e97b24275214f1837197a73fdb03 (diff) | |
| parent | fcbd5b73d77e2e8103fdea0ff23f9c61cd7e7514 (diff) | |
| download | talos-obmc-uboot-d6288664743cdd4824cb877ca424619c827c1256.tar.gz talos-obmc-uboot-d6288664743cdd4824cb877ca424619c827c1256.zip | |
Merge branch 'master' of git://git.denx.de/u-boot-blackfin
Diffstat (limited to 'common')
| -rw-r--r-- | common/cmd_otp.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/common/cmd_otp.c b/common/cmd_otp.c index 56f08e0c05..eb93eb2db9 100644 --- a/common/cmd_otp.c +++ b/common/cmd_otp.c @@ -82,6 +82,7 @@ static void set_otp_timing(bool write) int do_otp(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) { + char *cmd; uint32_t ret, base_flags; bool prompt_user, force_read; uint32_t (*otp_func)(uint32_t page, uint32_t flags, uint64_t *page_content); @@ -93,21 +94,21 @@ int do_otp(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) prompt_user = false; base_flags = 0; - if (!strcmp(argv[1], "read")) + cmd = argv[1]; + if (!strcmp(cmd, "read")) otp_func = bfrom_OtpRead; - else if (!strcmp(argv[1], "dump")) { + else if (!strcmp(cmd, "dump")) { otp_func = bfrom_OtpRead; force_read = true; - } else if (!strcmp(argv[1], "write")) { + } else if (!strcmp(cmd, "write")) { otp_func = bfrom_OtpWrite; base_flags = OTP_CHECK_FOR_PREV_WRITE; if (!strcmp(argv[2], "--force")) { - argv[2] = argv[1]; argv++; --argc; } else prompt_user = false; - } else if (!strcmp(argv[1], "lock")) { + } else if (!strcmp(cmd, "lock")) { if (argc != 4) goto usage; otp_func = bfrom_OtpWrite; @@ -175,7 +176,7 @@ int do_otp(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) } printf("OTP memory %s: addr 0x%p page 0x%03X count %zu ... ", - argv[1], addr, page, count); + cmd, addr, page, count); set_otp_timing(otp_func == bfrom_OtpWrite); if (otp_func == bfrom_OtpWrite && check_voltage()) { |
