From: Felix Fietkau <nbd@openwrt.org>
Date: Wed, 30 Aug 2006 14:04:26 +0000 (+0000)
Subject: magicbox: add 0x40 to the kernel image size (uImage header)
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=ccb8fdf93ae08aa5299da9714953d64aa6097729;p=openwrt%2Fsvn-archive%2Farchive.git

magicbox: add 0x40 to the kernel image size (uImage header)

SVN-Revision: 4720
---

diff --git a/openwrt/target/linux/magicbox-2.6/patches/002-flash_map.patch b/openwrt/target/linux/magicbox-2.6/patches/002-flash_map.patch
index 8038230513..fcddb348c7 100644
--- a/openwrt/target/linux/magicbox-2.6/patches/002-flash_map.patch
+++ b/openwrt/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,6 +94,7 @@ 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;
++		size += 0x40; /* header size of the uImage */
 +		if ((size > 0) && (size < 0x400000)) {
 +			/* skip to next erase block */
 +			if (size & (flash->erasesize - 1)) {