Merge git://www.denx.de/git/u-boot

[u-boot] / common / cmd_autoscript.c

diff --git a/common/cmd_autoscript.c b/common/cmd_autoscript.c
index 4894dabd3e4d9416017a12faa6793321ad52205c..a6038a6effd8a3a7c89ea33ea580f29edb42df38 100644 (file)
--- a/common/cmd_autoscript.c
+++ b/common/cmd_autoscript.c
@@ -47,8 +47,7 @@
 #include <hush.h>
 #endif
 
-#if defined(CONFIG_AUTOSCRIPT) || \
-        (CONFIG_COMMANDS & CFG_CMD_AUTOSCRIPT )
+#if defined(CONFIG_AUTOSCRIPT) || defined(CONFIG_CMD_AUTOSCRIPT)
 
 extern image_header_t header;          /* from cmd_bootm.c */
 int
@@ -68,7 +67,7 @@ autoscript (ulong addr)
        memmove (hdr, (char *)addr, sizeof(image_header_t));
 
        if (ntohl(hdr->ih_magic) != IH_MAGIC) {
-               printf ("Bad magic number\n");
+               puts ("Bad magic number\n");
                return 1;
        }
 
@@ -76,8 +75,8 @@ autoscript (ulong addr)
        hdr->ih_hcrc = 0;
        len = sizeof (image_header_t);
        data = (ulong)hdr;
-       if (crc32(0, (char *)data, len) != crc) {
-               printf ("Bad header crc\n");
+       if (crc32(0, (uchar *)data, len) != crc) {
+               puts ("Bad header crc\n");
                return 1;
        }
 
@@ -85,14 +84,14 @@ autoscript (ulong addr)
        len = ntohl(hdr->ih_size);
 
        if (verify) {
-               if (crc32(0, (char *)data, len) != ntohl(hdr->ih_dcrc)) {
-                       printf ("Bad data crc\n");
+               if (crc32(0, (uchar *)data, len) != ntohl(hdr->ih_dcrc)) {
+                       puts ("Bad data crc\n");
                        return 1;
                }
        }
 
        if (hdr->ih_type != IH_TYPE_SCRIPT) {
-               printf ("Bad image type\n");
+               puts ("Bad image type\n");
                return 1;
        }
 
@@ -100,7 +99,7 @@ autoscript (ulong addr)
        len_ptr = (ulong *)data;
 
        if ((len = ntohl(*len_ptr)) == 0) {
-               printf ("Empty Script\n");
+               puts ("Empty Script\n");
                return 1;
        }
 
@@ -150,9 +149,10 @@ autoscript (ulong addr)
        return rcode;
 }
 
-#endif /* CONFIG_AUTOSCRIPT || CFG_CMD_AUTOSCRIPT */
+#endif
+
 /**************************************************/
-#if (CONFIG_COMMANDS & CFG_CMD_AUTOSCRIPT)
+#if defined(CONFIG_CMD_AUTOSCRIPT)
 int
 do_autoscript (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 {
@@ -170,13 +170,13 @@ do_autoscript (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
        return rcode;
 }
 
-#if (CONFIG_COMMANDS & CFG_CMD_AUTOSCRIPT)
+#if defined(CONFIG_CMD_AUTOSCRIPT)
 U_BOOT_CMD(
        autoscr, 2, 0,  do_autoscript,
        "autoscr - run script from memory\n",
        "[addr] - run script starting at addr"
        " - A valid autoscr header must be present\n"
 );
-#endif /* CFG_CMD_AUTOSCRIPT */
+#endif
 
-#endif /* CONFIG_AUTOSCRIPT || CFG_CMD_AUTOSCRIPT */
+#endif