1
0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2025-04-21 12:27:27 +03:00

[kernel] update to 2.6.25.1 and refresh patches

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@11006 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
juhosg
2008-05-02 10:17:03 +00:00
parent 9fcaee9fcc
commit 60289aade7
93 changed files with 3767 additions and 3197 deletions

View File

@@ -1,8 +1,8 @@
Index: linux-2.6.23-rc6/drivers/mtd/chips/cfi_cmdset_0001.c
Index: linux-2.6.25.1/drivers/mtd/chips/cfi_cmdset_0001.c
===================================================================
--- linux-2.6.23-rc6.orig/drivers/mtd/chips/cfi_cmdset_0001.c 2007-09-21 16:23:54.000000000 +0800
+++ linux-2.6.23-rc6/drivers/mtd/chips/cfi_cmdset_0001.c 2007-09-21 16:23:57.000000000 +0800
@@ -933,7 +933,7 @@
--- linux-2.6.25.1.orig/drivers/mtd/chips/cfi_cmdset_0001.c
+++ linux-2.6.25.1/drivers/mtd/chips/cfi_cmdset_0001.c
@@ -1008,7 +1008,7 @@ static void __xipram xip_enable(struct m
static int __xipram xip_wait_for_operation(
struct map_info *map, struct flchip *chip,
@@ -11,7 +11,7 @@ Index: linux-2.6.23-rc6/drivers/mtd/chips/cfi_cmdset_0001.c
{
struct cfi_private *cfi = map->fldrv_priv;
struct cfi_pri_intelext *cfip = cfi->cmdset_priv;
@@ -942,7 +942,7 @@
@@ -1017,7 +1017,7 @@ static int __xipram xip_wait_for_operati
flstate_t oldstate, newstate;
start = xip_currtime();
@@ -20,7 +20,7 @@ Index: linux-2.6.23-rc6/drivers/mtd/chips/cfi_cmdset_0001.c
if (usec == 0)
usec = 500000;
done = 0;
@@ -1052,8 +1052,8 @@
@@ -1127,8 +1127,8 @@ static int __xipram xip_wait_for_operati
#define XIP_INVAL_CACHED_RANGE(map, from, size) \
INVALIDATE_CACHED_RANGE(map, from, size)
@@ -31,7 +31,7 @@ Index: linux-2.6.23-rc6/drivers/mtd/chips/cfi_cmdset_0001.c
#else
@@ -1065,65 +1065,65 @@
@@ -1140,65 +1140,65 @@ static int __xipram xip_wait_for_operati
static int inval_cache_and_wait_for_operation(
struct map_info *map, struct flchip *chip,
unsigned long cmd_adr, unsigned long inval_adr, int inval_len,
@@ -132,7 +132,7 @@ Index: linux-2.6.23-rc6/drivers/mtd/chips/cfi_cmdset_0001.c
/* Done and happy. */
chip->state = FL_STATUS;
return 0;
@@ -1132,7 +1132,8 @@
@@ -1207,7 +1207,8 @@ static int inval_cache_and_wait_for_oper
#endif
#define WAIT_TIMEOUT(map, chip, adr, udelay) \
@@ -142,7 +142,7 @@ Index: linux-2.6.23-rc6/drivers/mtd/chips/cfi_cmdset_0001.c
static int do_point_onechip (struct map_info *map, struct flchip *chip, loff_t adr, size_t len)
@@ -1356,7 +1357,7 @@
@@ -1438,7 +1439,7 @@ static int __xipram do_write_oneword(str
ret = INVAL_CACHE_AND_WAIT(map, chip, adr,
adr, map_bankwidth(map),
@@ -151,7 +151,7 @@ Index: linux-2.6.23-rc6/drivers/mtd/chips/cfi_cmdset_0001.c
if (ret) {
xip_enable(map, chip, adr);
printk(KERN_ERR "%s: word write error (status timeout)\n", map->name);
@@ -1593,7 +1594,7 @@
@@ -1678,7 +1679,7 @@ static int __xipram do_write_buffer(stru
ret = INVAL_CACHE_AND_WAIT(map, chip, cmd_adr,
initial_adr, initial_len,
@@ -160,7 +160,7 @@ Index: linux-2.6.23-rc6/drivers/mtd/chips/cfi_cmdset_0001.c
if (ret) {
map_write(map, CMD(0x70), cmd_adr);
chip->state = FL_STATUS;
@@ -1728,7 +1729,7 @@
@@ -1813,7 +1814,7 @@ static int __xipram do_erase_oneblock(st
ret = INVAL_CACHE_AND_WAIT(map, chip, adr,
adr, len,