diff options
author | Álvaro Fernández Rojas <noltari@gmail.com> | 2020-08-10 17:17:52 +0200 |
---|---|---|
committer | Álvaro Fernández Rojas <noltari@gmail.com> | 2020-08-11 08:04:40 +0200 |
commit | a5a0b3f1d0bf14008e6fbad7024df3f5901303f1 (patch) | |
tree | 26b6cf5296db945764bb021f37bf28e9a5073fe1 /target/linux/bcm63xx/patches-5.4/311-bcm63xxpart_use_cfedetection.patch | |
parent | da4651833ce6a4aad0ce0664b48c10f22197fb48 (diff) | |
download | upstream-a5a0b3f1d0bf14008e6fbad7024df3f5901303f1.tar.gz upstream-a5a0b3f1d0bf14008e6fbad7024df3f5901303f1.tar.bz2 upstream-a5a0b3f1d0bf14008e6fbad7024df3f5901303f1.zip |
bcm63xx: switch to upstream CFE detection patch
This patch has been merged in linux 5.9.
Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
Diffstat (limited to 'target/linux/bcm63xx/patches-5.4/311-bcm63xxpart_use_cfedetection.patch')
-rw-r--r-- | target/linux/bcm63xx/patches-5.4/311-bcm63xxpart_use_cfedetection.patch | 51 |
1 files changed, 0 insertions, 51 deletions
diff --git a/target/linux/bcm63xx/patches-5.4/311-bcm63xxpart_use_cfedetection.patch b/target/linux/bcm63xx/patches-5.4/311-bcm63xxpart_use_cfedetection.patch deleted file mode 100644 index 19ed994b85..0000000000 --- a/target/linux/bcm63xx/patches-5.4/311-bcm63xxpart_use_cfedetection.patch +++ /dev/null @@ -1,51 +0,0 @@ ---- a/drivers/mtd/parsers/bcm63xxpart.c -+++ b/drivers/mtd/parsers/bcm63xxpart.c -@@ -21,6 +21,8 @@ - #include <linux/mtd/mtd.h> - #include <linux/mtd/partitions.h> - #include <linux/of.h> -+ -+#include <asm/mach-bcm63xx/bcm63xx_board.h> - - #define BCM963XX_CFE_BLOCK_SIZE SZ_64K /* always at least 64KiB */ - -@@ -32,30 +34,6 @@ - #define STR_NULL_TERMINATE(x) \ - do { char *_str = (x); _str[sizeof(x) - 1] = 0; } while (0) - --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, BCM963XX_CFE_MAGIC_OFFSET, 8, &retlen, -- (void *)buf); -- buf[retlen] = 0; -- -- return strncmp("CFE1CFE1", buf, 8); --} -- - static int bcm63xx_read_nvram(struct mtd_info *master, - struct bcm963xx_nvram *nvram) - { -@@ -138,7 +116,7 @@ static int bcm63xx_parse_cfe_partitions( - struct bcm963xx_nvram *nvram = NULL; - int ret; - -- if (bcm63xx_detect_cfe(master)) -+ if (!bcm63xx_is_cfe_present()) - return -EINVAL; - - nvram = vzalloc(sizeof(*nvram)); |