X-Git-Url: http://git.ozo.com/?a=blobdiff_plain;f=target%2Flinux%2Fmagicbox-2.6%2Fpatches%2F002-flash_map.patch;h=e5f803a14438ffc4e90b1805df1a99b739c0b440;hb=09b72bad7d535cfbf585acd7bca154fb5678ce23;hp=80382305130f16ab4e198876041ff66d4dc21913;hpb=8c2d40d8fb026d30ad1edf3241daa6cb06585b96;p=openwrt-10.03%2F.git

diff --git a/target/linux/magicbox-2.6/patches/002-flash_map.patch b/target/linux/magicbox-2.6/patches/002-flash_map.patch
index 803823051..e5f803a14 100644
--- a/target/linux/magicbox-2.6/patches/002-flash_map.patch
+++ b/target/linux/magicbox-2.6/patches/002-flash_map.patch
@@ -20,7 +20,7 @@ diff -urN linux.old/drivers/mtd/maps/Kconfig linux.dev/drivers/mtd/maps/Kconfig
 diff -urN linux.old/drivers/mtd/maps/magicmap.c linux.dev/drivers/mtd/maps/magicmap.c
 --- linux.old/drivers/mtd/maps/magicmap.c	1970-01-01 01:00:00.000000000 +0100
 +++ linux.dev/drivers/mtd/maps/magicmap.c	2006-08-30 06:52:34.000000000 +0200
-@@ -0,0 +1,112 @@
+@@ -0,0 +1,113 @@
 +/*
 + * magicmap.c: Copyleft 2005  Karol Lewandowski
 + *
@@ -94,7 +94,8 @@ diff -urN linux.old/drivers/mtd/maps/magicmap.c linux.dev/drivers/mtd/maps/magic
 +		if (MTD_READ(flash, 12, sizeof(u32), &len, (char *) &size) ||
 +			len != 4)
 +			return -ENXIO;
-+		if ((size > 0) && (size < 0x400000)) {
++		size += 0x40; /* header size of the uImage */
++		if (size < 0x400000) {
 +			/* skip to next erase block */
 +			if (size & (flash->erasesize - 1)) {
 +				size |= (flash->erasesize - 1);