X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/2c2e02d72979e9d2865a400068abc4262bf88074..5f4dbbbf5c5c907ef6cc6df18e3a0ae26d799d3e:/package/mtd/src/fis.c?ds=inline diff --git a/package/mtd/src/fis.c b/package/mtd/src/fis.c index f99101988..559ca9506 100644 --- a/package/mtd/src/fis.c +++ b/package/mtd/src/fis.c @@ -77,7 +77,7 @@ fis_open(void) goto error; fis_erasesize = erasesize; - desc = mmap(NULL, erasesize, PROT_READ|PROT_WRITE, MAP_SHARED, fis_fd, 0); + desc = mmap(NULL, erasesize, PROT_READ|PROT_WRITE, MAP_SHARED|MAP_LOCKED, fis_fd, 0); if (desc == MAP_FAILED) goto error; @@ -99,7 +99,7 @@ fis_validate(struct fis_part *old, int n_old, struct fis_part *new, int n_new) desc = fis_open(); if (!desc) - return 0; + return -1; for (i = 0; i < n_new - 1; i++) { if (!new[i].size) { @@ -146,7 +146,7 @@ fis_remap(struct fis_part *old, int n_old, struct fis_part *new, int n_new) struct fis_image_desc *desc; struct fis_part *part; uint32_t offset = 0, size = 0; - char *end, *tmp; + char *start, *end, *tmp; int i; desc = fis_open(); @@ -156,6 +156,7 @@ fis_remap(struct fis_part *old, int n_old, struct fis_part *new, int n_new) if (!quiet) fprintf(stderr, "Updating FIS table... \n"); + start = (char *) desc; end = (char *) desc + fis_erasesize; while ((char *) desc < end) { if (!desc->hdr.name[0] || (desc->hdr.name[0] == 0xff)) @@ -167,9 +168,12 @@ fis_remap(struct fis_part *old, int n_old, struct fis_part *new, int n_new) if (!strcmp((char *) desc->hdr.name, "RedBoot")) redboot = desc; + /* update max offset */ + if (offset < desc->hdr.flash_base) + offset = desc->hdr.flash_base; + for (i = 0; i < n_old; i++) { if (!strncmp((char *) desc->hdr.name, (char *) old[i].name, sizeof(desc->hdr.name))) { - size += desc->hdr.size; last = desc; if (!first) first = desc; @@ -180,13 +184,21 @@ fis_remap(struct fis_part *old, int n_old, struct fis_part *new, int n_new) } desc--; - if (desc == last) { - desc = fisdir; + /* determine size of available space */ + desc = (struct fis_image_desc *) start; + while ((char *) desc < end) { + if (!desc->hdr.name[0] || (desc->hdr.name[0] == 0xff)) + break; + + if (desc->hdr.flash_base > last->hdr.flash_base && + desc->hdr.flash_base < offset) + offset = desc->hdr.flash_base; + + desc++; } + desc--; - /* size fixup */ - if (desc && (last->hdr.flash_base < desc->hdr.flash_base - last->hdr.size)) - size += (desc->hdr.flash_base - last->hdr.flash_base) - last->hdr.size; + size = offset - first->hdr.flash_base; #ifdef notyet desc = first - 1;