projects / openwrt / staging / chunkeey.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: cae1c44)
kernel: drop bcm47xxpart patch for Xiaomi
authorRafał Miłecki <zajec5@gmail.com>
Sat, 2 Jan 2016 00:33:31 +0000 (00:33 +0000)
committerRafał Miłecki <zajec5@gmail.com>
Sat, 2 Jan 2016 00:33:31 +0000 (00:33 +0000)
It was never tested, most likely not working (because of le32_to_cpu)
and not upstreamed.

Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
SVN-Revision: 48060

target/linux/bcm53xx/patches-4.1/901-mtd-bcm47xxpart-workaround-for-Asus-RT-AC87U-asus-pa.patch patch | blob | history
target/linux/bcm53xx/patches-4.1/902-mtd-bcm47xxpart-print-buffer-used-for-determining-pa.patch patch | blob | history
target/linux/bcm53xx/patches-4.4/901-mtd-bcm47xxpart-workaround-for-Asus-RT-AC87U-asus-pa.patch patch | blob | history
target/linux/generic/patches-3.18/431-mtd-bcm47xxpart-support-for-Xiaomi-specific-board_da.patch [deleted file] patch | blob | history
target/linux/generic/patches-3.18/432-mtd-bcm47xxpart-detect-T_Meter-partition.patch patch | blob | history
target/linux/generic/patches-4.1/431-mtd-bcm47xxpart-support-for-Xiaomi-specific-board_da.patch [deleted file] patch | blob | history
target/linux/generic/patches-4.1/432-mtd-bcm47xxpart-detect-T_Meter-partition.patch patch | blob | history
target/linux/generic/patches-4.4/431-mtd-bcm47xxpart-support-for-Xiaomi-specific-board_da.patch [deleted file] patch | blob | history
target/linux/generic/patches-4.4/432-mtd-bcm47xxpart-detect-T_Meter-partition.patch patch | blob | history

diff --git a/target/linux/bcm53xx/patches-4.1/901-mtd-bcm47xxpart-workaround-for-Asus-RT-AC87U-asus-pa.patch b/target/linux/bcm53xx/patches-4.1/901-mtd-bcm47xxpart-workaround-for-Asus-RT-AC87U-asus-pa.patch
index 774a186263492b95df63eb4044ad6d738a37db13..aa68415d68416654b5ee4692379a8a34c212f598 100644 (file)
--- a/target/linux/bcm53xx/patches-4.1/901-mtd-bcm47xxpart-workaround-for-Asus-RT-AC87U-asus-pa.patch
+++ b/target/linux/bcm53xx/patches-4.1/901-mtd-bcm47xxpart-workaround-for-Asus-RT-AC87U-asus-pa.patch
@@ -22,7 +22,7 @@ Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
  
  #include <uapi/linux/magic.h>
  
-@@ -132,6 +133,17 @@ static int bcm47xxpart_parse(struct mtd_
+@@ -131,6 +132,17 @@ static int bcm47xxpart_parse(struct mtd_
                        break;
                }
  
diff --git a/target/linux/bcm53xx/patches-4.1/902-mtd-bcm47xxpart-print-buffer-used-for-determining-pa.patch b/target/linux/bcm53xx/patches-4.1/902-mtd-bcm47xxpart-print-buffer-used-for-determining-pa.patch
index 2731c6dde5cbedae8336e4d76573f0ef6be5c0c3..1ebc75a4df78164aa8e3bbc978b38be11d37f0c7 100644 (file)
--- a/target/linux/bcm53xx/patches-4.1/902-mtd-bcm47xxpart-print-buffer-used-for-determining-pa.patch
+++ b/target/linux/bcm53xx/patches-4.1/902-mtd-bcm47xxpart-print-buffer-used-for-determining-pa.patch
@@ -12,7 +12,7 @@ Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
 
 --- a/drivers/mtd/bcm47xxpart.c
 +++ b/drivers/mtd/bcm47xxpart.c
-@@ -67,19 +67,22 @@ static void bcm47xxpart_add_part(struct
+@@ -66,19 +66,22 @@ static void bcm47xxpart_add_part(struct
  static const char *bcm47xxpart_trx_data_part_name(struct mtd_info *master,
                                                  size_t offset)
  {
diff --git a/target/linux/bcm53xx/patches-4.4/901-mtd-bcm47xxpart-workaround-for-Asus-RT-AC87U-asus-pa.patch b/target/linux/bcm53xx/patches-4.4/901-mtd-bcm47xxpart-workaround-for-Asus-RT-AC87U-asus-pa.patch
index 774a186263492b95df63eb4044ad6d738a37db13..aa68415d68416654b5ee4692379a8a34c212f598 100644 (file)
--- a/target/linux/bcm53xx/patches-4.4/901-mtd-bcm47xxpart-workaround-for-Asus-RT-AC87U-asus-pa.patch
+++ b/target/linux/bcm53xx/patches-4.4/901-mtd-bcm47xxpart-workaround-for-Asus-RT-AC87U-asus-pa.patch
@@ -22,7 +22,7 @@ Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
  
  #include <uapi/linux/magic.h>
  
-@@ -132,6 +133,17 @@ static int bcm47xxpart_parse(struct mtd_
+@@ -131,6 +132,17 @@ static int bcm47xxpart_parse(struct mtd_
                        break;
                }
  
diff --git a/target/linux/generic/patches-3.18/431-mtd-bcm47xxpart-support-for-Xiaomi-specific-board_da.patch b/target/linux/generic/patches-3.18/431-mtd-bcm47xxpart-support-for-Xiaomi-specific-board_da.patch
deleted file mode 100644 (file)
index bc3e502..0000000
--- a/target/linux/generic/patches-3.18/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-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 2b04286f923df1cd6f6b894f8f97cec81a5f4d40..a3b7c1f71f9bc9605d096b59ef97ed043dad7458 100644 (file)
--- 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
@@ -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;
                }
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 (file)
index bc3e502..0000000
--- 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 2b04286f923df1cd6f6b894f8f97cec81a5f4d40..a3b7c1f71f9bc9605d096b59ef97ed043dad7458 100644 (file)
--- 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;
                }
diff --git a/target/linux/generic/patches-4.4/431-mtd-bcm47xxpart-support-for-Xiaomi-specific-board_da.patch b/target/linux/generic/patches-4.4/431-mtd-bcm47xxpart-support-for-Xiaomi-specific-board_da.patch
deleted file mode 100644 (file)
index bc3e502..0000000
--- a/target/linux/generic/patches-4.4/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.4/432-mtd-bcm47xxpart-detect-T_Meter-partition.patch b/target/linux/generic/patches-4.4/432-mtd-bcm47xxpart-detect-T_Meter-partition.patch
index 2b04286f923df1cd6f6b894f8f97cec81a5f4d40..a3b7c1f71f9bc9605d096b59ef97ed043dad7458 100644 (file)
--- a/target/linux/generic/patches-4.4/432-mtd-bcm47xxpart-detect-T_Meter-partition.patch
+++ b/target/linux/generic/patches-4.4/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;
                }
Staging tree of Christian Lamparter