KumiSystems/openwrtv4
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

package/mtd: fix automatic partition size detection in fis_remap

Browse source 
SVN-Revision: 20537
This commit is contained in:
Gabor Juhos 2010-03-28 07:16:27 +00:00
parent d14e0a0b93
commit ebab30b7c7
2 changed files with 21 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
package/mtd/Makefile
View file

@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
include $(INCLUDE_DIR)/kernel.mk include $(INCLUDE_DIR)/kernel.mk
PKG_NAME:=mtd PKG_NAME:=mtd
PKG_RELEASE:=11 PKG_RELEASE:=12
PKG_BUILD_DIR := $(KERNEL_BUILD_DIR)/$(PKG_NAME) PKG_BUILD_DIR := $(KERNEL_BUILD_DIR)/$(PKG_NAME)
STAMP_PREPARED := $(STAMP_PREPARED)_$(call confvar,CONFIG_MTD_REDBOOT_PARTS) STAMP_PREPARED := $(STAMP_PREPARED)_$(call confvar,CONFIG_MTD_REDBOOT_PARTS)

28
package/mtd/src/fis.c
View file

@ -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_image_desc *desc;
struct fis_part *part; struct fis_part *part;
uint32_t offset = 0, size = 0; uint32_t offset = 0, size = 0;
char *end, *tmp; char *start, *end, *tmp;
int i; int i;
desc = fis_open(); 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) if (!quiet)
fprintf(stderr, "Updating FIS table... \n"); fprintf(stderr, "Updating FIS table... \n");
start = (char *) desc;
end = (char *) desc + fis_erasesize; end = (char *) desc + fis_erasesize;
while ((char *) desc < end) { while ((char *) desc < end) {
if (!desc->hdr.name[0] || (desc->hdr.name[0] == 0xff)) 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")) if (!strcmp((char *) desc->hdr.name, "RedBoot"))
redboot = desc; redboot = desc;
/* update max offset */
if (offset < desc->hdr.flash_base)
offset = desc->hdr.flash_base;
for (i = 0; i < n_old; i++) { for (i = 0; i < n_old; i++) {
if (!strncmp((char *) desc->hdr.name, (char *) old[i].name, sizeof(desc->hdr.name))) { if (!strncmp((char *) desc->hdr.name, (char *) old[i].name, sizeof(desc->hdr.name))) {
size += desc->hdr.size;
last = desc; last = desc;
if (!first) if (!first)
first = desc; first = desc;
@ -180,13 +184,21 @@ fis_remap(struct fis_part *old, int n_old, struct fis_part *new, int n_new)
} }
desc--; desc--;
if (desc == last) { /* determine size of available space */
desc = fisdir; desc = (struct fis_image_desc *) start;
} while ((char *) desc < end) {
if (!desc->hdr.name[0] || (desc->hdr.name[0] == 0xff))
break;
/* size fixup */ if (desc->hdr.flash_base > last->hdr.flash_base &&
if (desc && (last->hdr.flash_base < desc->hdr.flash_base - last->hdr.size)) desc->hdr.flash_base < offset)
size += (desc->hdr.flash_base - last->hdr.flash_base) - last->hdr.size; offset = desc->hdr.flash_base;
desc++;
}
desc--;
size = offset - first->hdr.flash_base;
#ifdef notyet #ifdef notyet
desc = first - 1; desc = first - 1;