target/linux/brcm63xx/patches-3.3/311-cfe_version_mod.patch

   1 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
   2 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
   3 @@ -777,6 +777,8 @@ void __init board_prom_init(void)
   4         if (!memcmp(cfe, "cfe-v", 5))
   5                 snprintf(cfe_version, sizeof(cfe_version), "%u.%u.%u-%u.%u",
   6                          cfe[5], cfe[6], cfe[7], cfe[8], cfe[9]);
   7 +       else if (!memcmp(cfe, "cfe-", 4))
   8 +               snprintf(cfe_version, 16, "%s", (char *) &cfe[4]);
   9         else
  10                 strcpy(cfe_version, "unknown");
  11         printk(KERN_INFO PFX "CFE version: %s\n", cfe_version);
  12 --- a/drivers/mtd/bcm63xxpart.c
  13 +++ b/drivers/mtd/bcm63xxpart.c
  14 @@ -54,10 +54,10 @@ static int bcm63xx_detect_cfe(struct mtd
  15         if (ret)
  16                 return ret;
  17
  18 -       if (strncmp("cfe-v", buf, 5) == 0)
  19 +       if (strncmp("cfe-", buf, 4) == 0)
  20                 return 0;
  21
  22 -       /* very old CFE's do not have the cfe-v string, so check for magic */
  23 +       /* very old CFE's do not have the cfe- string, so check for magic */
  24         ret = mtd_read(master, BCM63XX_CFE_MAGIC_OFFSET, 8, &retlen,
  25                        (void *)buf);
  26         buf[retlen] = 0;