aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/patches-4.1
diff options
context:
space:
mode:
Diffstat (limited to 'target/linux/generic/patches-4.1')
-rw-r--r--target/linux/generic/patches-4.1/431-mtd-bcm47xxpart-support-for-Xiaomi-specific-board_da.patch34
-rw-r--r--target/linux/generic/patches-4.1/432-mtd-bcm47xxpart-detect-T_Meter-partition.patch4
2 files changed, 2 insertions, 36 deletions
diff --git a/target/linux/generic/patches-4.1/431-mtd-bcm47xxpart-support-for-Xiaomi-specific-board_da.patch b/target/linux/generic/patches-4.1/431-mtd-bcm47xxpart-support-for-Xiaomi-specific-board_da.patch
deleted file mode 100644
index bc3e502d41..0000000000
--- a/target/linux/generic/patches-4.1/431-mtd-bcm47xxpart-support-for-Xiaomi-specific-board_da.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 841e59ba3e496d86ca5f069204d5e5c1ad43c01d Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <zajec5@gmail.com>
-Date: Tue, 27 Jan 2015 22:29:21 +0100
-Subject: [PATCH] mtd: bcm47xxpart: support for Xiaomi specific board_data
- partition
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
----
- drivers/mtd/bcm47xxpart.c | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
---- a/drivers/mtd/bcm47xxpart.c
-+++ b/drivers/mtd/bcm47xxpart.c
-@@ -33,6 +33,7 @@
- /* Magics */
- #define BOARD_DATA_MAGIC 0x5246504D /* MPFR */
- #define BOARD_DATA_MAGIC2 0xBD0D0BBD
-+#define BOARD_DATA_XIAOMI_MAGIC 0x474D4442 /* GMDB */
- #define CFE_MAGIC 0x43464531 /* 1EFC */
- #define FACTORY_MAGIC 0x59544346 /* FCTY */
- #define NVRAM_HEADER 0x48534C46 /* FLSH */
-@@ -267,7 +268,8 @@ static int bcm47xxpart_parse(struct mtd_
- }
-
- /* Some devices (ex. WNDR3700v3) don't have a standard 'MPFR' */
-- if (buf[0x000 / 4] == BOARD_DATA_MAGIC2) {
-+ if (buf[0x000 / 4] == BOARD_DATA_MAGIC2 ||
-+ le32_to_cpu(buf[0x000 / 4]) == BOARD_DATA_XIAOMI_MAGIC) {
- bcm47xxpart_add_part(&parts[curr_part++], "board_data",
- offset, MTD_WRITEABLE);
- continue;
diff --git a/target/linux/generic/patches-4.1/432-mtd-bcm47xxpart-detect-T_Meter-partition.patch b/target/linux/generic/patches-4.1/432-mtd-bcm47xxpart-detect-T_Meter-partition.patch
index 2b04286f92..a3b7c1f71f 100644
--- a/target/linux/generic/patches-4.1/432-mtd-bcm47xxpart-detect-T_Meter-partition.patch
+++ b/target/linux/generic/patches-4.1/432-mtd-bcm47xxpart-detect-T_Meter-partition.patch
@@ -16,7 +16,7 @@ Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
--- a/drivers/mtd/bcm47xxpart.c
+++ b/drivers/mtd/bcm47xxpart.c
-@@ -39,6 +39,7 @@
+@@ -38,6 +38,7 @@
#define NVRAM_HEADER 0x48534C46 /* FLSH */
#define POT_MAGIC1 0x54544f50 /* POTT */
#define POT_MAGIC2 0x504f /* OP */
@@ -24,7 +24,7 @@ Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
#define ML_MAGIC1 0x39685a42
#define ML_MAGIC2 0x26594131
#define TRX_MAGIC 0x30524448
-@@ -180,6 +181,15 @@ static int bcm47xxpart_parse(struct mtd_
+@@ -179,6 +180,15 @@ static int bcm47xxpart_parse(struct mtd_
MTD_WRITEABLE);
continue;
}