1 files changed, 0 insertions, 249 deletions

diff --git a/bootloader.c b/bootloader.c
index 61b24e918..38b5651bf 100644
--- a/bootloader.c
+++ b/bootloader.c
@@ -119,252 +119,3 @@ int set_bootloader_message(const struct bootloader_message *in) {
     LOGI("Set boot command \"%s\"\n", in->command[0] != 255 ? in->command : "");
     return 0;
 }
-
-/* Update Image
- *
- * - will be stored in the "cache" partition
- * - bad blocks will be ignored, like boot.img and recovery.img
- * - the first block will be the image header (described below)
- * - the size is in BYTES, inclusive of the header
- * - offsets are in BYTES from the start of the update header
- * - two raw bitmaps will be included, the "busy" and "fail" bitmaps
- * - for dream, the bitmaps will be 320x480x16bpp RGB565
- */
-
-#define UPDATE_MAGIC       "MSM-RADIO-UPDATE"
-#define UPDATE_MAGIC_SIZE  16
-#define UPDATE_VERSION     0x00010000
-
-struct update_header {
-    unsigned char MAGIC[UPDATE_MAGIC_SIZE];
-
-    unsigned version;
-    unsigned size;
-
-    unsigned image_offset;
-    unsigned image_length;
-
-    unsigned bitmap_width;
-    unsigned bitmap_height;
-    unsigned bitmap_bpp;
-
-    unsigned busy_bitmap_offset;
-    unsigned busy_bitmap_length;
-
-    unsigned fail_bitmap_offset;
-    unsigned fail_bitmap_length;
-};
-
-#define LOG_MAGIC        "LOGmagic"
-#define LOG_MAGIC_SIZE   8
-
-int write_update_for_bootloader(
-        const char *update, int update_length,
-        int bitmap_width, int bitmap_height, int bitmap_bpp,
-        const char *busy_bitmap, const char *fail_bitmap,
-        const char *log_filename) {
-    if (ensure_root_path_unmounted(CACHE_NAME)) {
-        LOGE("Can't unmount %s\n", CACHE_NAME);
-        return -1;
-    }
-
-    const MtdPartition *part = get_root_mtd_partition(CACHE_NAME);
-    if (part == NULL) {
-        LOGE("Can't find %s\n", CACHE_NAME);
-        return -1;
-    }
-
-    MtdWriteContext *write = mtd_write_partition(part);
-    if (write == NULL) {
-        LOGE("Can't open %s\n(%s)\n", CACHE_NAME, strerror(errno));
-        return -1;
-    }
-
-    /* Write an invalid (zero) header first, to disable any previous
-     * update and any other structured contents (like a filesystem),
-     * and as a placeholder for the amount of space required.
-     */
-
-    struct update_header header;
-    memset(&header, 0, sizeof(header));
-    const ssize_t header_size = sizeof(header);
-    if (mtd_write_data(write, (char*) &header, header_size) != header_size) {
-        LOGE("Can't write header to %s\n(%s)\n", CACHE_NAME, strerror(errno));
-        mtd_write_close(write);
-        return -1;
-    }
-
-    /* Write each section individually block-aligned, so we can write
-     * each block independently without complicated buffering.
-     */
-
-    memcpy(&header.MAGIC, UPDATE_MAGIC, UPDATE_MAGIC_SIZE);
-    header.version = UPDATE_VERSION;
-    header.size = header_size;
-
-    if (log_filename != NULL) {
-        // Write 1 byte into the following block, then fill to the end
-        // in order to reserve that block.  We'll use the block to
-        // send a copy of the log through to the next invocation of
-        // recovery.  We write the log as late as possible in order to
-        // capture any messages emitted by this function.
-        mtd_erase_blocks(write, 0);
-        if (mtd_write_data(write, (char*) &header, 1) != 1) {
-            LOGE("Can't write log block to %s\n(%s)\n",
-                 CACHE_NAME, strerror(errno));
-            mtd_write_close(write);
-            return -1;
-        }
-    }
-
-    off_t image_start_pos = mtd_erase_blocks(write, 0);
-    header.image_length = update_length;
-    if ((int) header.image_offset == -1 ||
-        mtd_write_data(write, update, update_length) != update_length) {
-        LOGE("Can't write update to %s\n(%s)\n", CACHE_NAME, strerror(errno));
-        mtd_write_close(write);
-        return -1;
-    }
-    off_t busy_start_pos = mtd_erase_blocks(write, 0);
-    header.image_offset = mtd_find_write_start(write, image_start_pos);
-
-    header.bitmap_width = bitmap_width;
-    header.bitmap_height = bitmap_height;
-    header.bitmap_bpp = bitmap_bpp;
-
-    int bitmap_length = (bitmap_bpp + 7) / 8 * bitmap_width * bitmap_height;
-
-    header.busy_bitmap_length = busy_bitmap != NULL ? bitmap_length : 0;
-    if ((int) header.busy_bitmap_offset == -1 ||
-        mtd_write_data(write, busy_bitmap, bitmap_length) != bitmap_length) {
-        LOGE("Can't write bitmap to %s\n(%s)\n", CACHE_NAME, strerror(errno));
-        mtd_write_close(write);
-        return -1;
-    }
-    off_t fail_start_pos = mtd_erase_blocks(write, 0);
-    header.busy_bitmap_offset = mtd_find_write_start(write, busy_start_pos);
-
-    header.fail_bitmap_length = fail_bitmap != NULL ? bitmap_length : 0;
-    if ((int) header.fail_bitmap_offset == -1 ||
-        mtd_write_data(write, fail_bitmap, bitmap_length) != bitmap_length) {
-        LOGE("Can't write bitmap to %s\n(%s)\n", CACHE_NAME, strerror(errno));
-        mtd_write_close(write);
-        return -1;
-    }
-    mtd_erase_blocks(write, 0);
-    header.fail_bitmap_offset = mtd_find_write_start(write, fail_start_pos);
-
-    /* Write the header last, after all the blocks it refers to, so that
-     * when the magic number is installed everything is valid.
-     */
-
-    if (mtd_write_close(write)) {
-        LOGE("Can't finish writing %s\n(%s)\n", CACHE_NAME, strerror(errno));
-        return -1;
-    }
-
-    write = mtd_write_partition(part);
-    if (write == NULL) {
-        LOGE("Can't reopen %s\n(%s)\n", CACHE_NAME, strerror(errno));
-        return -1;
-    }
-
-    if (mtd_write_data(write, (char*) &header, header_size) != header_size) {
-        LOGE("Can't rewrite header to %s\n(%s)\n", CACHE_NAME, strerror(errno));
-        mtd_write_close(write);
-        return -1;
-    }
-
-    if (log_filename != NULL) {
-        size_t erase_size;
-        if (mtd_partition_info(part, NULL, &erase_size, NULL) != 0) {
-            LOGE("Error reading block size\n(%s)\n", strerror(errno));
-            mtd_write_close(write);
-            return -1;
-        }
-        mtd_erase_blocks(write, 0);
-
-        if (erase_size > 0) {
-            char* log = malloc(erase_size);
-            FILE* f = fopen(log_filename, "rb");
-            // The fseek() may fail if it tries to go before the
-            // beginning of the log, but that's okay because we want
-            // to be positioned at the start anyway.
-            fseek(f, -(erase_size-sizeof(size_t)-LOG_MAGIC_SIZE), SEEK_END);
-            memcpy(log, LOG_MAGIC, LOG_MAGIC_SIZE);
-            size_t read = fread(log+sizeof(size_t)+LOG_MAGIC_SIZE,
-                                1, erase_size-sizeof(size_t)-LOG_MAGIC_SIZE, f);
-            LOGI("read %d bytes from log\n", (int)read);
-            *(size_t *)(log + LOG_MAGIC_SIZE) = read;
-            fclose(f);
-            if (mtd_write_data(write, log, erase_size) != erase_size) {
-                LOGE("failed to store log in cache partition\n(%s)\n",
-                     strerror(errno));
-                mtd_write_close(write);
-            }
-            free(log);
-        }
-    }
-
-    if (mtd_erase_blocks(write, 0) != image_start_pos) {
-        LOGE("Misalignment rewriting %s\n(%s)\n", CACHE_NAME, strerror(errno));
-        mtd_write_close(write);
-        return -1;
-    }
-
-    if (mtd_write_close(write)) {
-        LOGE("Can't finish header of %s\n(%s)\n", CACHE_NAME, strerror(errno));
-        return -1;
-    }
-
-    return 0;
-}
-
-void recover_firmware_update_log() {
-    printf("recovering log from before firmware update\n");
-
-    const MtdPartition *part = get_root_mtd_partition(CACHE_NAME);
-    if (part == NULL) {
-        LOGE("Can't find %s\n", CACHE_NAME);
-        return;
-    }
-
-    MtdReadContext* read = mtd_read_partition(part);
-
-    size_t erase_size;
-    if (mtd_partition_info(part, NULL, &erase_size, NULL) != 0) {
-        LOGE("Error reading block size\n(%s)\n", strerror(errno));
-        mtd_read_close(read);
-        return;
-    }
-
-    char* buffer = malloc(erase_size);
-    if (mtd_read_data(read, buffer, erase_size) != erase_size) {
-        LOGE("Error reading header block\n(%s)\n", strerror(errno));
-        mtd_read_close(read);
-        free(buffer);
-        return;
-    }
-    if (mtd_read_data(read, buffer, erase_size) != erase_size) {
-        LOGE("Error reading log block\n(%s)\n", strerror(errno));
-        mtd_read_close(read);
-        free(buffer);
-        return;
-    }
-    mtd_read_close(read);
-
-    if (memcmp(buffer, LOG_MAGIC, LOG_MAGIC_SIZE) != 0) {
-        LOGE("No log from before firmware install\n");
-        free(buffer);
-        return;
-    }
-
-    size_t log_size = *(size_t *)(buffer + LOG_MAGIC_SIZE);
-    LOGI("header has %d bytes of log\n", (int)log_size);
-
-    printf("\n###\n### START RECOVERED LOG\n###\n\n");
-    fwrite(buffer + sizeof(size_t) + LOG_MAGIC_SIZE, 1, log_size, stdout);
-    printf("\n\n###\n### END RECOVERED LOG\n###\n\n");
-
-    free(buffer);
-}