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

[karo-tx-uboot.git] / board / netstar / crcit.c

diff --git a/board/netstar/crcit.c b/board/netstar/crcit.c
index f6d3066c158294f68f39955e4f9b12300a22daed..0eef41a11ed50a6c65f9db970abb19c4a3ec9c2a 100644 (file)
--- a/board/netstar/crcit.c
+++ b/board/netstar/crcit.c
@@ -31,11 +31,11 @@
 #include <sys/stat.h>
 #include "crcek.h"
 
-extern unsigned long crc32(unsigned long, const unsigned char *, unsigned int);
+extern uint32_t crc32(uint32_t, const unsigned char *, uint);
 
-uint32_t data[LOADER_SIZE/4 + 3];
+static uint32_t data[LOADER_SIZE/4 + 3];
 
-int doit(char *path, unsigned version)
+static int do_crc(char *path, unsigned version)
 {
        uint32_t *p;
        ssize_t size;
@@ -56,13 +56,14 @@ int doit(char *path, unsigned version)
                fprintf(stderr, "File too large\n");
                return EXIT_FAILURE;
        }
-       size = (((size - 1) >> 2) + 1) << 2;
-       data[0] = size + 4;     /* add size of version field */
+       size  = (size + 3) & ~3;        /* round up to 4 bytes */
+       size += 4;                      /* add size of version field */
+       data[0] = size;
        data[1] = version;
-       data[(size >> 2) + 2] = crc32(0, (unsigned char *)(data + 1), data[0]);
+       data[size/4 + 1] = crc32(0, (unsigned char *)(data + 1), size);
        close(fd);
 
-       if (write(STDOUT_FILENO, data, size + 3*4) == -1) {
+       if (write(STDOUT_FILENO, data, size + 4 /*size*/ + 4 /*crc*/) == -1) {
                perror("Error writing file");
                return EXIT_FAILURE;
        }
@@ -73,12 +74,12 @@ int doit(char *path, unsigned version)
 int main(int argc, char **argv)
 {
        if (argc == 2) {
-               return doit(argv[1], 0);
+               return do_crc(argv[1], 0);
        } else if ((argc == 4) && (strcmp(argv[1], "-v") == 0)) {
                char *endptr, *nptr = argv[2];
                unsigned ver = strtoul(nptr, &endptr, 0);
-               if (nptr != '\0' && endptr == '\0')
-                       return doit(argv[3], ver);
+               if (*nptr != '\0' && *endptr == '\0')
+                       return do_crc(argv[3], ver);
        }
        fprintf(stderr, "Usage: crcit [-v version] <image>\n");