1 files changed, 4 insertions, 128 deletions

diff --git a/rbutil/mkamsboot/mkamsboot.c b/rbutil/mkamsboot/mkamsboot.c
index 9d0ad9cd9a..8d40a1966c 100644
--- a/rbutil/mkamsboot/mkamsboot.c
+++ b/rbutil/mkamsboot/mkamsboot.c
@@ -110,7 +110,7 @@ execution to the uncompressed firmware.
 #endif
 
 /* 4 for m200, 2 for e200/c200, 1 or 2 for fuze/clop */
-static const unsigned short hw_revisions[] = {
+const unsigned short hw_revisions[] = {
     [MODEL_FUZE]    = 1,
     [MODEL_CLIP]    = 1,
     [MODEL_CLIPV2]  = 2,
@@ -120,7 +120,7 @@ static const unsigned short hw_revisions[] = {
 };
 
 /* version 2 is used in Clipv2 and Fuzev2 firmwares */
-static const unsigned short fw_revisions[] = {
+const unsigned short fw_revisions[] = {
     [MODEL_FUZE]    = 1,
     [MODEL_CLIP]    = 1,
     [MODEL_CLIPV2]  = 2,
@@ -130,7 +130,7 @@ static const unsigned short fw_revisions[] = {
 };
 
 /* Descriptive name of these models */
-static const char* model_names[] = {
+const char* model_names[] = {
     [MODEL_FUZE]    = "Fuze",
     [MODEL_CLIP]    = "Clip",
     [MODEL_CLIPV2]  = "Clip",
@@ -150,7 +150,7 @@ static const unsigned char* bootloaders[] = {
 };
 
 /* Size of dualboot functions for these models */
-static const int bootloader_sizes[] = {
+const int bootloader_sizes[] = {
     [MODEL_FUZE]    = sizeof(dualboot_fuze),
     [MODEL_CLIP]    = sizeof(dualboot_clip),
     [MODEL_CLIPV2]  = sizeof(dualboot_clipv2),
@@ -574,127 +574,3 @@ int total_size(int model, int rb_packedsize, int of_packedsize)
                 rb_packedsize;
 }
 
-#ifndef LIB
-/* standalone executable */
-int main(int argc, char* argv[])
-{
-    char *infile, *bootfile, *outfile;
-    int fdout;
-    off_t len;
-    uint32_t n;
-    unsigned char* buf;
-    int firmware_size;
-    int bootloader_size;
-    unsigned char* of_packed;
-    int of_packedsize;
-    unsigned char* rb_packed;
-    int rb_packedsize;
-    int totalsize;
-    char errstr[200];
-    struct md5sums sum;
-    char md5sum[33]; /* 32 digits + \0 */
-
-    sum.md5 = md5sum;
-
-/* VERSION comes frome the Makefile */
-    fprintf(stderr,
-"mkamsboot Version " VERSION "\n"
-"This is free software; see the source for copying conditions.  There is NO\n"
-"warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
-"\n");
-
-    if(argc != 4) {
-        printf("Usage: mkamsboot <firmware file> <boot file> <output file>\n");
-        return 1;
-    }
-
-    infile = argv[1];
-    bootfile = argv[2];
-    outfile = argv[3];
-
-    /* Load original firmware file */
-    buf = load_of_file(infile, &len, &sum,
-            &firmware_size, &of_packed, &of_packedsize, errstr, sizeof(errstr));
-
-    if (buf == NULL) {
-        fprintf(stderr, "%s", errstr);
-        fprintf(stderr, "[ERR]  Could not load %s\n", infile);
-        return 1;
-    }
-
-    fprintf(stderr, "[INFO] Original firmware MD5 checksum match\n");
-    fprintf(stderr, "[INFO] Model: Sansa %s v%d - Firmware version: %s\n",
-            model_names[sum.model], hw_revisions[sum.model], sum.version);
-
-
-    /* Load bootloader file */
-    rb_packed = load_rockbox_file(bootfile, sum.model, &bootloader_size,
-            &rb_packedsize, errstr, sizeof(errstr));
-    if (rb_packed == NULL) {
-        fprintf(stderr, "%s", errstr);
-        fprintf(stderr, "[ERR]  Could not load %s\n", bootfile);
-        free(buf);
-        free(of_packed);
-        return 1;
-    }
-
-    printf("[INFO] Firmware patching has begun !\n\n");
-
-    fprintf(stderr, "[INFO] Original firmware size:   %d bytes\n",
-            firmware_size);
-    fprintf(stderr, "[INFO] Packed OF size:           %d bytes\n",
-            of_packedsize);
-    fprintf(stderr, "[INFO] Bootloader size:          %d bytes\n",
-            (int)bootloader_size);
-    fprintf(stderr, "[INFO] Packed bootloader size:   %d bytes\n",
-            rb_packedsize);
-    fprintf(stderr, "[INFO] Dual-boot function size:  %d bytes\n",
-            bootloader_sizes[sum.model]);
-    fprintf(stderr, "[INFO] UCL unpack function size: %u bytes\n",
-            (unsigned int)sizeof(nrv2e_d8));
-
-    totalsize = total_size(sum.model, of_packedsize, rb_packedsize);
-
-    fprintf(stderr, "[INFO] Total size of new image:  %d bytes\n", totalsize);
-
-    if (totalsize > firmware_size) {
-        fprintf(stderr, "[ERR]  No room to insert bootloader, aborting\n");
-        free(buf);
-        free(of_packed);
-        free(rb_packed);
-        return 1;
-    }
-
-    patch_firmware(sum.model, fw_revisions[sum.model], firmware_size, buf, len,
-            of_packed, of_packedsize, rb_packed, rb_packedsize);
-
-    /* Write the new firmware */
-    fdout = open(outfile, O_CREAT|O_TRUNC|O_WRONLY|O_BINARY, 0666);
-
-    if (fdout < 0) {
-        fprintf(stderr, "[ERR]  Could not open %s for writing\n", outfile);
-        free(buf);
-        free(of_packed);
-        free(rb_packed);
-        return 1;
-    }
-
-    n = write(fdout, buf, len);
-
-    if (n != (unsigned)len) {
-        fprintf(stderr, "[ERR]  Could not write firmware file\n");
-        free(buf);
-        free(of_packed);
-        free(rb_packed);
-        return 1;
-    }
-
-    close(fdout);
-    free(buf);
-    free(of_packed);
-    free(rb_packed);
-    fprintf(stderr, "\n[INFO] Patching succeeded!\n");
-
-    return 0;
-}
-#endif