firmware-tools/ptgen: fix endianness conversion for PTE .start, .length field.

[openwrt/openwrt.git] / tools / firmware-utils / src / ptgen.c

diff --git a/tools/firmware-utils/src/ptgen.c b/tools/firmware-utils/src/ptgen.c
index ce93016667e1715457650f5bb34224ccdcc5abe1..68bad6fd974f261a6073047c3b5e8c95f0b4efdb 100644 (file)
--- a/tools/firmware-utils/src/ptgen.c
+++ b/tools/firmware-utils/src/ptgen.c
@@ -28,11 +28,12 @@
 #include <stdio.h>
 #include <ctype.h>
 #include <fcntl.h>
+#include <stdint.h>
 
 #if __BYTE_ORDER == __BIG_ENDIAN
-#define cpu_to_le16(x) bswap_16(x)
+#define cpu_to_le32(x) bswap_32(x)
 #elif __BYTE_ORDER == __LITTLE_ENDIAN
-#define cpu_to_le16(x) (x)
+#define cpu_to_le32(x) (x)
 #else
 #error unknown endianness!
 #endif
@@ -56,6 +57,7 @@ int verbose = 0;
 int active = 1;
 int heads = -1;
 int sectors = -1;
+int kb_align = 0;
 struct partinfo parts[4];
 char *filename = NULL;
 
@@ -117,8 +119,13 @@ static inline unsigned long round_to_cyl(long sect) {
        return sect + cyl_size - (sect % cyl_size); 
 }
 
+/* round the sector number up to the kb_align boundary */
+static inline unsigned long round_to_kb(long sect) {
+        return ((sect - 1) / kb_align + 1) * kb_align;
+}
+
 /* check the partition sizes and write the partition table */
-static int gen_ptable(int nr)
+static int gen_ptable(uint32_t signature, int nr)
 {
        struct pte pte[4];
        unsigned long sect = 0; 
@@ -132,22 +139,33 @@ static int gen_ptable(int nr)
                }
                pte[i].active = ((i + 1) == active) ? 0x80 : 0;
                pte[i].type = parts[i].type;
-               pte[i].start = cpu_to_le16(start = sect + sectors);
-               sect = round_to_cyl(start + parts[i].size * 2);
-               pte[i].length = cpu_to_le16(len = sect - start);
+               start = sect + sectors;
+               if (kb_align != 0)
+                       start = round_to_kb(start);
+               pte[i].start = cpu_to_le32(start);
+               sect = start + parts[i].size * 2;
+               if (kb_align == 0)
+                       sect = round_to_cyl(sect);
+               pte[i].length = cpu_to_le32(len = sect - start);
                to_chs(start, pte[i].chs_start);
                to_chs(start + len - 1, pte[i].chs_end);
                if (verbose)
                        fprintf(stderr, "Partition %d: start=%ld, end=%ld, size=%ld\n", i, (long) start * 512, ((long) start + (long) len) * 512, (long) len * 512);
                printf("%ld\n", ((long) start * 512));
+               printf("%ld\n", ((long) len * 512));
        }
-       printf("%ld\n", ((long) (start + len) * 512));
 
-       if ((fd = open(filename, O_WRONLY|O_CREAT, 0644)) < 0) {
+       if ((fd = open(filename, O_WRONLY|O_CREAT|O_TRUNC, 0644)) < 0) {
                fprintf(stderr, "Can't open output file '%s'\n",filename);
                return -1;
        }
 
+       lseek(fd, 440, SEEK_SET);
+       if (write(fd, &signature, sizeof(signature)) != sizeof(signature)) {
+               fprintf(stderr, "write failed.\n");
+               goto fail;
+       }
+
        lseek(fd, 446, SEEK_SET);
        if (write(fd, pte, sizeof(struct pte) * 4) != sizeof(struct pte) * 4) {
                fprintf(stderr, "write failed.\n");
@@ -167,7 +185,7 @@ fail:
 
 static void usage(char *prog)
 {
-       fprintf(stderr, "Usage: %s [-v] -h <heads> -s <sectors> -o <outputfile> [-a 0..4] [[-t <type>] -p <size>...] \n", prog);
+       fprintf(stderr, "Usage: %s [-v] -h <heads> -s <sectors> -o <outputfile> [-a 0..4] [-l <align kB>] [[-t <type>] -p <size>...] \n", prog);
        exit(1);
 }
 
@@ -176,8 +194,9 @@ int main (int argc, char **argv)
        char type = 0x83;
        int ch;
        int part = 0;
+       uint32_t signature = 0x5452574F; /* 'OWRT' */
 
-       while ((ch = getopt(argc, argv, "h:s:p:a:t:o:v")) != -1) {
+       while ((ch = getopt(argc, argv, "h:s:p:a:t:o:vl:S:")) != -1) {
                switch (ch) {
                case 'o':
                        filename = optarg;
@@ -207,6 +226,12 @@ int main (int argc, char **argv)
                        if ((active < 0) || (active > 4))
                                active = 0;
                        break;
+               case 'l':
+                       kb_align = (int) strtoul(optarg, NULL, 0) * 2;
+                       break;
+               case 'S':
+                       signature = strtoul(optarg, NULL, 0);
+                       break;
                case '?':
                default:
                        usage(argv[0]);
@@ -215,6 +240,6 @@ int main (int argc, char **argv)
        argc -= optind;
        if (argc || (heads <= 0) || (sectors <= 0) || !filename) 
                usage(argv[0]);
-       
-       return gen_ptable(part);
+
+       return gen_ptable(signature, part);
 }