diff options
author | Felix Fietkau <nbd@openwrt.org> | 2006-12-14 16:41:33 +0000 |
---|---|---|
committer | Felix Fietkau <nbd@openwrt.org> | 2006-12-14 16:41:33 +0000 |
commit | bff468813f78f81e36ebb2a3f4354de7365e640f (patch) | |
tree | e0144a8d723cac2fd84505ec140dd0011541430a /target/linux/aruba-2.6/patches/001-flash.patch | |
parent | 7ca328b65927e12b4bb65a6d752f43b674498908 (diff) | |
download | master-31e0f0ae-bff468813f78f81e36ebb2a3f4354de7365e640f.tar.gz master-31e0f0ae-bff468813f78f81e36ebb2a3f4354de7365e640f.tar.bz2 master-31e0f0ae-bff468813f78f81e36ebb2a3f4354de7365e640f.zip |
Upgrade to Linux 2.6.19
- Includes large parts of the patch from #1021 by dpalffy
- Includes RB532 NAND driver changes by n0-1
SVN-Revision: 5789
Diffstat (limited to 'target/linux/aruba-2.6/patches/001-flash.patch')
-rw-r--r-- | target/linux/aruba-2.6/patches/001-flash.patch | 40 |
1 files changed, 1 insertions, 39 deletions
diff --git a/target/linux/aruba-2.6/patches/001-flash.patch b/target/linux/aruba-2.6/patches/001-flash.patch index f0b951370d..78bfd3df32 100644 --- a/target/linux/aruba-2.6/patches/001-flash.patch +++ b/target/linux/aruba-2.6/patches/001-flash.patch @@ -118,42 +118,4 @@ diff -Nur linux-2.6.15/drivers/mtd/chips/cfi_probe.c linux-2.6.15-openwrt/driver cfi_send_gen_cmd(0xF0, 0, base, map, cfi, cfi->device_type, NULL); cfi_send_gen_cmd(0xFF, 0, base, map, cfi, cfi->device_type, NULL); cfi_send_gen_cmd(0x98, 0x55, base, map, cfi, cfi->device_type, NULL); -diff -Nur linux-2.6.15/drivers/mtd/maps/physmap.c linux-2.6.15-openwrt/drivers/mtd/maps/physmap.c ---- linux-2.6.15/drivers/mtd/maps/physmap.c 2006-01-03 04:21:10.000000000 +0100 -+++ linux-2.6.15-openwrt/drivers/mtd/maps/physmap.c 2006-01-10 00:32:32.000000000 +0100 -@@ -34,15 +34,31 @@ - static struct mtd_partition *mtd_parts; - static int mtd_parts_nb; - --static int num_physmap_partitions; --static struct mtd_partition *physmap_partitions; -+static int num_physmap_partitions = 3; -+static struct mtd_partition physmap_partitions[] = { -+ { -+ name: "zImage", -+ size: 0x3f0000-0x80000, -+ offset: 0x80000, -+ }, -+ { -+ name: "JFFS2", -+ size: 0x3f0000-0x120000, -+ offset: 0x120000, -+ }, -+ { -+ name: "NVRAM", -+ size: 0x2000, -+ offset: 0x3f8000, -+ } -+}; - - static const char *part_probes[] __initdata = {"cmdlinepart", "RedBoot", NULL}; - - void physmap_set_partitions(struct mtd_partition *parts, int num_parts) - { -- physmap_partitions=parts; -- num_physmap_partitions=num_parts; -+// physmap_partitions=parts; -+// num_physmap_partitions=num_parts; - } - #endif /* CONFIG_MTD_PARTITIONS */ - + |