Merge branch 'master' of git://git.denx.de/u-boot-spi

[karo-tx-uboot.git] / common / cmd_otp.c

diff --git a/common/cmd_otp.c b/common/cmd_otp.c
index 4be43448a8945ed3b31e8dace5d34194f823e04b..67808aa377ef15cdf3059bae08e6bfe8592ca886 100644 (file)
--- a/common/cmd_otp.c
+++ b/common/cmd_otp.c
@@ -18,6 +18,7 @@
 #include <command.h>
 
 #include <asm/blackfin.h>
+#include <asm/clock.h>
 #include <asm/mach-common/bits/otp.h>
 
 static const char *otp_strerror(uint32_t err)
@@ -80,35 +81,35 @@ static void set_otp_timing(bool write)
        bfrom_OtpCommand(OTP_INIT, write ? timing : timing & ~(-1 << 15));
 }
 
-int do_otp(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
+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);
 
        if (argc < 4) {
  usage:
-               cmd_usage(cmdtp);
-               return 1;
+               return CMD_RET_USAGE;
        }
 
        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;
@@ -176,7 +177,7 @@ int do_otp(cmd_tbl_t *cmdtp, int flag, int argc, char *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()) {
@@ -224,7 +225,8 @@ int do_otp(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
        return ret;
 }
 
-U_BOOT_CMD(otp, 7, 0, do_otp,
+U_BOOT_CMD(
+       otp, 7, 0, do_otp,
        "One-Time-Programmable sub-system",
        "read <addr> <page> [count] [half]\n"
        " - read 'count' half-pages starting at 'page' (offset 'half') to 'addr'\n"
@@ -233,4 +235,5 @@ U_BOOT_CMD(otp, 7, 0, do_otp,
        "otp write [--force] <addr> <page> [count] [half]\n"
        " - write 'count' half-pages starting at 'page' (offset 'half') from 'addr'\n"
        "otp lock <page> <count>\n"
-       " - lock 'count' pages starting at 'page'\n");
+       " - lock 'count' pages starting at 'page'"
+);