linux-mips
[Top] [All Lists]

[PATCH 3/5] MTD: bcm63xxpart: don't assume NVRAM is always the fourth pa

To: linux-mtd@lists.infradead.org
Subject: [PATCH 3/5] MTD: bcm63xxpart: don't assume NVRAM is always the fourth partition
From: Jonas Gorski <jonas.gorski@gmail.com>
Date: Sat, 17 Dec 2011 13:58:16 +0100
Cc: linux-mips@linux-mips.org, Florian Fainelli <florian@openwrt.org>, David Woodhouse <dwmw2@infradead.org>, Artem Bityutskiy <Artem.Bityutskiy@intel.com>
Dkim-signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; bh=tqGEHstkcsFuTBQmGziO7hkY2hpB9knhCxMEPI/gQ60=; b=wvmLVjnCuG2kKpx2J2dEO6uzlz2k0nN4P3GnMm9Tkviwa7wXZo5/HSGII6+i55MgmF KAk2abaaqlpxDubV/TOAFv2ptl2fkwFu8nPiXPY4pwZ8nvVvdHTxxmnif4JGeADWERZ3 jYXge51V9uFRCOY//RiVuTdoNNMponhJY4qyo=
In-reply-to: <1324126698-9919-1-git-send-email-jonas.gorski@gmail.com>
References: <1324126698-9919-1-git-send-email-jonas.gorski@gmail.com>
Sender: linux-mips-bounce@linux-mips.org
Instead of referencing the sizes of fixed partitions, use the
precomputed CFE/NVRAM lengths.

Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
---
 drivers/mtd/bcm63xxpart.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/mtd/bcm63xxpart.c b/drivers/mtd/bcm63xxpart.c
index 23f6201..3becb4d 100644
--- a/drivers/mtd/bcm63xxpart.c
+++ b/drivers/mtd/bcm63xxpart.c
@@ -165,8 +165,8 @@ static int bcm63xx_parse_cfe_partitions(struct mtd_info 
*master,
        /* Global partition "linux" to make easy firmware upgrade */
        curpart++;
        parts[curpart].name = "linux";
-       parts[curpart].offset = parts[0].size;
-       parts[curpart].size = master->size - parts[0].size - parts[3].size;
+       parts[curpart].offset = cfelen;
+       parts[curpart].size = master->size - cfelen - nvramlen;
 
        for (i = 0; i < nrparts; i++)
                pr_info("Partition %d is %s offset %lx and length %lx\n", i,
-- 
1.7.2.5


<Prev in Thread] Current Thread [Next in Thread>