summaryrefslogtreecommitdiffstats
path: root/package/mtd/mtd-utils/mtd-utils-1.2.0-all-flashcp-npow2-erase.patch
blob: b9a0a607c29418c2c1596befd04361b1d04d3a0c (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
flashcp: handle non-power-of-2 erase size (E.G. for dataflash)

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 flashcp.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Index: mtd-utils-1.1.0/flashcp.c
===================================================================
--- mtd-utils-1.1.0.orig/flashcp.c	2007-08-03 15:55:51.000000000 +0200
+++ mtd-utils-1.1.0/flashcp.c	2009-02-17 14:02:09.000000000 +0100
@@ -255,8 +255,9 @@
 #warning "Check for smaller erase regions"
 
 	erase.start = 0;
-	erase.length = filestat.st_size & ~(mtd.erasesize - 1);
-	if (filestat.st_size % mtd.erasesize) erase.length += mtd.erasesize;
+	erase.length = (filestat.st_size + mtd.erasesize - 1) / mtd.erasesize;
+	erase.length *= mtd.erasesize;
+
 	if (flags & FLAG_VERBOSE)
 	{
 		/* if the user wants verbose output, erase 1 block at a time and show him/her what's going on */