aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGabor Juhos <juhosg@openwrt.org>2014-01-24 08:48:10 +0000
committerGabor Juhos <juhosg@openwrt.org>2014-01-24 08:48:10 +0000
commit4d7fd74a792b7cddf7be9e75fa347a33e63f2727 (patch)
treeda310ff0b5ea2eeaa11b036ff5c899045a252b06
parent6f3bf6a7b9edb926e76b9159c0c3d27f938a94cc (diff)
downloadmaster-187ad058-4d7fd74a792b7cddf7be9e75fa347a33e63f2727.tar.gz
master-187ad058-4d7fd74a792b7cddf7be9e75fa347a33e63f2727.tar.bz2
master-187ad058-4d7fd74a792b7cddf7be9e75fa347a33e63f2727.zip
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 <juhosg@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@39382 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--target/linux/generic/files/drivers/mtd/myloader.c15
1 files changed, 2 insertions, 13 deletions
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;