aboutsummaryrefslogtreecommitdiffstats
path: root/target
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2006-08-30 14:04:26 +0000
committerFelix Fietkau <nbd@openwrt.org>2006-08-30 14:04:26 +0000
commite2f95958173eb3899ec2c0a47480eefb2e6312ea (patch)
treec1923f56ddb007b94fa7133e5bff352b807f95e6 /target
parent79dea1681c7830825624d6b44b637a0278403471 (diff)
downloadupstream-e2f95958173eb3899ec2c0a47480eefb2e6312ea.tar.gz
upstream-e2f95958173eb3899ec2c0a47480eefb2e6312ea.tar.bz2
upstream-e2f95958173eb3899ec2c0a47480eefb2e6312ea.zip
magicbox: add 0x40 to the kernel image size (uImage header)
git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4720 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target')
-rw-r--r--target/linux/magicbox-2.6/patches/002-flash_map.patch3
1 files changed, 2 insertions, 1 deletions
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 8038230513..fcddb348c7 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,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)) {