bcm63xx: Simplify CFE detection.
Check bootloader argument in mtd. Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com> [jogo@openwrt.org: split into two patches, one for detection, one letting bcm63xxpart use it.] Signed-off-by: Jonas Gorski <jogo@openwrt.org> SVN-Revision: 36659
This commit is contained in:
@@ -9,18 +9,3 @@
|
||||
else
|
||||
strcpy(cfe_version, "unknown");
|
||||
printk(KERN_INFO PFX "CFE version: %s\n", cfe_version);
|
||||
--- a/drivers/mtd/bcm63xxpart.c
|
||||
+++ b/drivers/mtd/bcm63xxpart.c
|
||||
@@ -56,10 +56,10 @@ static int bcm63xx_detect_cfe(struct mtd
|
||||
if (ret)
|
||||
return ret;
|
||||
|
||||
- if (strncmp("cfe-v", buf, 5) == 0)
|
||||
+ if (strncmp("cfe-", buf, 4) == 0)
|
||||
return 0;
|
||||
|
||||
- /* very old CFE's do not have the cfe-v string, so check for magic */
|
||||
+ /* very old CFE's do not have the cfe- string, so check for magic */
|
||||
ret = mtd_read(master, BCM63XX_CFE_MAGIC_OFFSET, 8, &retlen,
|
||||
(void *)buf);
|
||||
buf[retlen] = 0;
|
||||
|
||||
Reference in New Issue
Block a user