ppc/85xx: Change cpu_init_early_f so we can use with NAND SPL

[u-boot] / common / cmd_otp.c

diff --git a/common/cmd_otp.c b/common/cmd_otp.c
index 5d85a484d45426226541979560f42d41cc20180e..30af5a31a843ffcc62782c76b376ddb890d472ff 100644 (file)
--- a/common/cmd_otp.c
+++ b/common/cmd_otp.c
@@ -149,8 +149,8 @@ int do_otp(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
                        "Writing one time programmable memory\n"
                        "Make sure your operating voltages and temperature are within spec\n"
                        "   source address:  0x%p\n"
-                       "   OTP destination: %s page 0x%03X - %s page 0x%03X\n"
-                       "   number to write: %ld halfpages\n"
+                       "   OTP destination: %s page 0x%03X - %s page 0x%03lX\n"
+                       "   number to write: %lu halfpages\n"
                        " type \"YES\" (no quotes) to confirm: ",
                        addr,
                        lowup(half), page,
@@ -175,7 +175,7 @@ int do_otp(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
                }
        }
 
-       printf("OTP memory %s: addr 0x%08lx  page 0x%03X  count %ld ... ",
+       printf("OTP memory %s: addr 0x%p  page 0x%03X  count %zu ... ",
                argv[1], addr, page, count);
 
        set_otp_timing(otp_func == bfrom_OtpWrite);
@@ -225,7 +225,7 @@ int do_otp(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 }
 
 U_BOOT_CMD(otp, 7, 0, do_otp,
-       "One-Time-Programmable sub-system\n",
+       "One-Time-Programmable sub-system",
        "read <addr> <page> [count] [half]\n"
        " - read 'count' half-pages starting at 'page' (offset 'half') to 'addr'\n"
        "otp dump <addr> <page> [count] [half]\n"
@@ -233,4 +233,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'"
+);