qi-hardware/openwrt-xburst
1
0
Fork 0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2024-12-28 17:48:58 +02:00
Code

Merge commit 'nbd/master' into xburst

Browse Source
This commit is contained in:
Lars-Peter Clausen 2010-02-08 13:15:59 +01:00
commit b90e053718
11 changed files with 11 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
target/linux/ar71xx/patches-2.6.32/102-mtd_m25p80_add_myloader_parser.patch
View File

@ -1,6 +1,6 @@
--- a/drivers/mtd/devices/m25p80.c
+++ b/drivers/mtd/devices/m25p80.c
@@ -856,6 +856,16 @@ static int __devinit m25p_probe(struct s
@@ -867,6 +867,16 @@ static int __devinit m25p_probe(struct s
part_probes, &parts, 0);
}

2
target/linux/ar71xx/patches-2.6.32/104-mtd_m25p80_add_redboot_parser.patch
View File

@ -1,6 +1,6 @@
--- a/drivers/mtd/devices/m25p80.c
+++ b/drivers/mtd/devices/m25p80.c
@@ -870,6 +870,15 @@ static int __devinit m25p_probe(struct s
@@ -877,6 +877,15 @@ static int __devinit m25p_probe(struct s
}
#endif

14
target/linux/ar71xx/patches-2.6.32/105-mtd_m25p80_add_mx25lxxx_support.patch
View File

@ -1,14 +0,0 @@
--- a/drivers/mtd/devices/m25p80.c
+++ b/drivers/mtd/devices/m25p80.c
@@ -630,6 +630,11 @@ static struct flash_info __devinitdata m
{ "en25p32", 0x1c2016, 0, 64 * 1024, 64, },
{ "en25p64", 0x1c2017, 0, 64 * 1024, 128, },
+ /* Macronix -- mx25lxxx */
+ { "mx25l32", 0xc22016, 0, 64 * 1024, 64, },
+ { "mx25l64", 0xc22017, 0, 64 * 1024, 128, },
+ { "mx25l128", 0xc22018, 0, 64 * 1024, 256, },
+
/* PMC -- pm25x "blocks" are 32K, sectors are 4K */
{ "pm25lv512", 0, 32 * 1024, 2, SECT_4K },
{ "pm25lv010", 0, 32 * 1024, 4, SECT_4K },

2
target/linux/ar71xx/patches-2.6.32/109-mtd-wrt160nl-trx-parser.patch
View File

@ -1,6 +1,6 @@
--- a/drivers/mtd/devices/m25p80.c
+++ b/drivers/mtd/devices/m25p80.c
@@ -890,6 +890,16 @@ static int __devinit m25p_probe(struct s
@@ -886,6 +886,16 @@ static int __devinit m25p_probe(struct s
part_probes, &parts, 0);
}
#endif

0
target/linux/generic-2.6/patches-2.6.32/090-mtd_fix_nand_correct_data_return_code.patch → target/linux/generic-2.6/patches-2.6.32/083-mtd_fix_nand_correct_data_return_code.patch
View File

0
target/linux/ar71xx/patches-2.6.32/100-mtd_m25p80_add_pm25lv_flash_support.patch → target/linux/generic-2.6/patches-2.6.32/084-mtd_m25p80_add_pm25lv_flash_support.patch
View File

0
target/linux/ar71xx/patches-2.6.32/103-mtd_m25p80_add_en25pxx_support.patch → target/linux/generic-2.6/patches-2.6.32/085-mtd_m25p80_add_en25pxx_support.patch
View File

8
target/linux/ar71xx/patches-2.6.32/106-mtd_m25p80_add_xxxs33b_support.patch → target/linux/generic-2.6/patches-2.6.32/086-mtd_m25p80_add_xxxs33b_support.patch
View File

@ -1,8 +1,8 @@
--- a/drivers/mtd/devices/m25p80.c
+++ b/drivers/mtd/devices/m25p80.c
@@ -635,6 +635,11 @@ static struct flash_info __devinitdata m
{ "mx25l64", 0xc22017, 0, 64 * 1024, 128, },
{ "mx25l128", 0xc22018, 0, 64 * 1024, 256, },
@@ -630,6 +630,11 @@ static struct flash_info __devinitdata m
{ "en25p32", 0x1c2016, 0, 64 * 1024, 64, },
{ "en25p64", 0x1c2017, 0, 64 * 1024, 128, },
+ /* Numonyx -- xxxs33b */
+ { "160s33b", 0x898911, 0, 64 * 1024, 64, },
@ -12,7 +12,7 @@
/* PMC -- pm25x "blocks" are 32K, sectors are 4K */
{ "pm25lv512", 0, 32 * 1024, 2, SECT_4K },
{ "pm25lv010", 0, 32 * 1024, 4, SECT_4K },
@@ -789,11 +794,12 @@ static int __devinit m25p_probe(struct s
@@ -784,11 +789,12 @@ static int __devinit m25p_probe(struct s
dev_set_drvdata(&spi->dev, flash);
/*

2
target/linux/ar71xx/patches-2.6.32/112-mtd-m25p80-add-w25q32-chip-support.patch → target/linux/generic-2.6/patches-2.6.32/087-mtd-m25p80-add-w25q32-chip-support.patch
View File

@ -1,6 +1,6 @@
--- a/drivers/mtd/devices/m25p80.c
+++ b/drivers/mtd/devices/m25p80.c
@@ -692,6 +692,7 @@ static struct flash_info __devinitdata m
@@ -687,6 +687,7 @@ static struct flash_info __devinitdata m
{ "w25x80", 0xef3014, 0, 64 * 1024, 16, SECT_4K, },
{ "w25x16", 0xef3015, 0, 64 * 1024, 32, SECT_4K, },
{ "w25x32", 0xef3016, 0, 64 * 1024, 64, SECT_4K, },

8
target/linux/generic-2.6/patches-2.6.32/270-scci_sd_section_fix.patch
View File

@ -1,8 +1,6 @@
Index: linux-2.6.32.7/drivers/scsi/sd.c
===================================================================
--- linux-2.6.32.7.orig/drivers/scsi/sd.c 2010-02-05 21:19:44.000000000 +0100
+++ linux-2.6.32.7/drivers/scsi/sd.c 2010-02-05 21:19:52.000000000 +0100
@@ -2394,7 +2394,7 @@
--- a/drivers/scsi/sd.c
+++ b/drivers/scsi/sd.c
@@ -2394,7 +2394,7 @@ err_out:
*
* Note: this function unregisters this driver from the scsi mid-level.
**/

0
target/linux/xburst/files-2.6.32/drivers/char/defkeymap.c → target/linux/xburst/files-2.6.32/drivers/char/defkeymap.c_shipped
View File