X-Git-Url: https://git.archive.openwrt.org/?a=blobdiff_plain;f=target%2Flinux%2Fgeneric%2Fpatches-3.18%2F432-mtd-bcm47xxpart-detect-T_Meter-partition.patch;h=1edc99525dd10c6790d8d99a00664236a6d8cd89;hb=5fb250390c94182ca58cd8b745821af013748f31;hp=3f702259805b7eaa4ceb3d570c934eb15c55e37e;hpb=67ab756ccef6b7d0f1c398a1c4446487453e2e76;p=15.05%2Fopenwrt.git diff --git a/target/linux/generic/patches-3.18/432-mtd-bcm47xxpart-detect-T_Meter-partition.patch b/target/linux/generic/patches-3.18/432-mtd-bcm47xxpart-detect-T_Meter-partition.patch index 3f70225980..1edc99525d 100644 --- a/target/linux/generic/patches-3.18/432-mtd-bcm47xxpart-detect-T_Meter-partition.patch +++ b/target/linux/generic/patches-3.18/432-mtd-bcm47xxpart-detect-T_Meter-partition.patch @@ -14,8 +14,6 @@ Signed-off-by: Rafał Miłecki drivers/mtd/bcm47xxpart.c | 10 ++++++++++ 1 file changed, 10 insertions(+) -diff --git a/drivers/mtd/bcm47xxpart.c b/drivers/mtd/bcm47xxpart.c -index f14ec0f..40dd0db 100644 --- a/drivers/mtd/bcm47xxpart.c +++ b/drivers/mtd/bcm47xxpart.c @@ -39,6 +39,7 @@ @@ -26,10 +24,11 @@ index f14ec0f..40dd0db 100644 #define ML_MAGIC1 0x39685a42 #define ML_MAGIC2 0x26594131 #define TRX_MAGIC 0x30524448 -@@ -177,6 +178,15 @@ static int bcm47xxpart_parse(struct mtd_info *master, +@@ -176,6 +177,15 @@ static int bcm47xxpart_parse(struct mtd_ + MTD_WRITEABLE); continue; } - ++ + /* T_Meter */ + if ((le32_to_cpu(buf[0x000 / 4]) & 0xFFFF0000) == T_METER_MAGIC && + (le32_to_cpu(buf[0x030 / 4]) & 0xFFFF0000) == T_METER_MAGIC && @@ -38,10 +37,6 @@ index f14ec0f..40dd0db 100644 + MTD_WRITEABLE); + continue; + } -+ + /* TRX */ if (buf[0x000 / 4] == TRX_MAGIC) { - if (BCM47XXPART_MAX_PARTS - curr_part < 4) { --- -1.8.4.5 -