aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/brcm63xx/patches-4.1/311-bcm63xxpart_use_cfedetection.patch
diff options
context:
space:
mode:
authorÁlvaro Fernández Rojas <noltari@gmail.com>2016-05-24 20:59:54 +0200
committerÁlvaro Fernández Rojas <noltari@gmail.com>2016-06-03 16:25:11 +0200
commitfd7786159d47d26277f3e70600aa5dc90a6b53cd (patch)
tree34f64422ddfcc99fd1bc8dde2fa54e63f8468862 /target/linux/brcm63xx/patches-4.1/311-bcm63xxpart_use_cfedetection.patch
parent23273044a8db6c8d5245169b29b0a18dd66ce8ad (diff)
downloadupstream-fd7786159d47d26277f3e70600aa5dc90a6b53cd.tar.gz
upstream-fd7786159d47d26277f3e70600aa5dc90a6b53cd.tar.bz2
upstream-fd7786159d47d26277f3e70600aa5dc90a6b53cd.zip
brcm63xx: drop linux 4.1 support
Switch to linux 4.4 now that it has been enough tested. Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
Diffstat (limited to 'target/linux/brcm63xx/patches-4.1/311-bcm63xxpart_use_cfedetection.patch')
-rw-r--r--target/linux/brcm63xx/patches-4.1/311-bcm63xxpart_use_cfedetection.patch51
1 files changed, 0 insertions, 51 deletions
diff --git a/target/linux/brcm63xx/patches-4.1/311-bcm63xxpart_use_cfedetection.patch b/target/linux/brcm63xx/patches-4.1/311-bcm63xxpart_use_cfedetection.patch
deleted file mode 100644
index 46d9b47cdf..0000000000
--- a/target/linux/brcm63xx/patches-4.1/311-bcm63xxpart_use_cfedetection.patch
+++ /dev/null
@@ -1,51 +0,0 @@
---- a/drivers/mtd/bcm63xxpart.c
-+++ b/drivers/mtd/bcm63xxpart.c
-@@ -35,7 +35,7 @@
-
- #include <asm/mach-bcm63xx/bcm63xx_nvram.h>
- #include <asm/mach-bcm63xx/bcm963xx_tag.h>
--#include <asm/mach-bcm63xx/board_bcm963xx.h>
-+#include <asm/mach-bcm63xx/bcm63xx_board.h>
-
- #define BCM63XX_EXTENDED_SIZE 0xBFC00000 /* Extended flash address */
-
-@@ -43,30 +43,6 @@
-
- #define BCM63XX_CFE_MAGIC_OFFSET 0x4e0
-
--static int bcm63xx_detect_cfe(struct mtd_info *master)
--{
-- char buf[9];
-- int ret;
-- size_t retlen;
--
-- ret = mtd_read(master, BCM963XX_CFE_VERSION_OFFSET, 5, &retlen,
-- (void *)buf);
-- buf[retlen] = 0;
--
-- if (ret)
-- return ret;
--
-- if (strncmp("cfe-v", buf, 5) == 0)
-- return 0;
--
-- /* very old CFE's do not have the cfe-v string, so check for magic */
-- ret = mtd_read(master, BCM63XX_CFE_MAGIC_OFFSET, 8, &retlen,
-- (void *)buf);
-- buf[retlen] = 0;
--
-- return strncmp("CFE1CFE1", buf, 8);
--}
--
- static int bcm63xx_parse_cfe_partitions(struct mtd_info *master,
- struct mtd_partition **pparts,
- struct mtd_part_parser_data *data)
-@@ -85,7 +61,7 @@ static int bcm63xx_parse_cfe_partitions(
- u32 computed_crc;
- bool rootfs_first = false;
-
-- if (bcm63xx_detect_cfe(master))
-+ if (!bcm63xx_is_cfe_present())
- return -EINVAL;
-
- cfe_erasesize = max_t(uint32_t, master->erasesize,