From: Gabor Juhos Date: Fri, 24 Jan 2014 08:48:10 +0000 (+0000) Subject: Revert "kernel: create firmware partition from MyLoader partition parser" X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fstaging%2Flynxis%2Fomap.git;a=commitdiff_plain;h=e89476e0a8122710a16fcf56c60cd872783966e4 Revert "kernel: create firmware partition from MyLoader partition parser" This reverts r38197. The automatically created firmware partition includes the partition_table partition. Apart from the partition table, this partition contains sensitive data on some Compex devices which data can be destroyed when the firmware partition gets modified. Revert the change to prevent that. Signed-off-by: Gabor Juhos SVN-Revision: 39382 --- diff --git a/target/linux/generic/files/drivers/mtd/myloader.c b/target/linux/generic/files/drivers/mtd/myloader.c index 93b4a9b286..72956cdc1c 100644 --- a/target/linux/generic/files/drivers/mtd/myloader.c +++ b/target/linux/generic/files/drivers/mtd/myloader.c @@ -89,12 +89,8 @@ static int myloader_parse_partitions(struct mtd_info *master, goto out_free_buf; } - /* - * The MyLoader and the Partition Table is always present. - * Additionally, an extra partition is generated to cover - * everything after the bootloader. - */ - num_parts = 3; + /* The MyLoader and the Partition Table is always present */ + num_parts = 2; /* Detect number of used partitions */ for (i = 0; i < MYLO_MAX_PARTITIONS; i++) { @@ -125,13 +121,6 @@ static int myloader_parse_partitions(struct mtd_info *master, mtd_part++; names += PART_NAME_LEN; - strncpy(names, "firmware", PART_NAME_LEN); - mtd_part->name = names; - mtd_part->offset = offset; - mtd_part->size = master->size - offset; - mtd_part++; - names += PART_NAME_LEN; - strncpy(names, "partition_table", PART_NAME_LEN); mtd_part->name = names; mtd_part->offset = offset;