From 66a2d7415e809aa1ce0161e2cff51d2b1c11700b Mon Sep 17 00:00:00 2001 From: lars Date: Sun, 7 Feb 2010 13:08:18 +0000 Subject: [PATCH 1/4] [xburst] defkeymap.c has been renamed to defkeymap.c_shipped in 2.6.32 git-svn-id: svn://svn.openwrt.org/openwrt/trunk@19544 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- .../drivers/char/{defkeymap.c => defkeymap.c_shipped} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename target/linux/xburst/files-2.6.32/drivers/char/{defkeymap.c => defkeymap.c_shipped} (100%) diff --git a/target/linux/xburst/files-2.6.32/drivers/char/defkeymap.c b/target/linux/xburst/files-2.6.32/drivers/char/defkeymap.c_shipped similarity index 100% rename from target/linux/xburst/files-2.6.32/drivers/char/defkeymap.c rename to target/linux/xburst/files-2.6.32/drivers/char/defkeymap.c_shipped From 8b8121c12a3b821741e07af80ea972af2f429873 Mon Sep 17 00:00:00 2001 From: juhosg Date: Mon, 8 Feb 2010 09:37:05 +0000 Subject: [PATCH 2/4] ar71xx: drop the mx25lxxx patch, these chips are supported in 2.6.32.7 already git-svn-id: svn://svn.openwrt.org/openwrt/trunk@19545 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- .../105-mtd_m25p80_add_mx25lxxx_support.patch | 14 -------------- .../106-mtd_m25p80_add_xxxs33b_support.patch | 8 ++++---- .../109-mtd-wrt160nl-trx-parser.patch | 2 +- .../112-mtd-m25p80-add-w25q32-chip-support.patch | 2 +- 4 files changed, 6 insertions(+), 20 deletions(-) delete mode 100644 target/linux/ar71xx/patches-2.6.32/105-mtd_m25p80_add_mx25lxxx_support.patch diff --git a/target/linux/ar71xx/patches-2.6.32/105-mtd_m25p80_add_mx25lxxx_support.patch b/target/linux/ar71xx/patches-2.6.32/105-mtd_m25p80_add_mx25lxxx_support.patch deleted file mode 100644 index 201c20546..000000000 --- a/target/linux/ar71xx/patches-2.6.32/105-mtd_m25p80_add_mx25lxxx_support.patch +++ /dev/null @@ -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 }, diff --git a/target/linux/ar71xx/patches-2.6.32/106-mtd_m25p80_add_xxxs33b_support.patch b/target/linux/ar71xx/patches-2.6.32/106-mtd_m25p80_add_xxxs33b_support.patch index 8f1a842be..0c7c227ed 100644 --- a/target/linux/ar71xx/patches-2.6.32/106-mtd_m25p80_add_xxxs33b_support.patch +++ b/target/linux/ar71xx/patches-2.6.32/106-mtd_m25p80_add_xxxs33b_support.patch @@ -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); /* diff --git a/target/linux/ar71xx/patches-2.6.32/109-mtd-wrt160nl-trx-parser.patch b/target/linux/ar71xx/patches-2.6.32/109-mtd-wrt160nl-trx-parser.patch index b4eab674a..52f54e6ce 100644 --- a/target/linux/ar71xx/patches-2.6.32/109-mtd-wrt160nl-trx-parser.patch +++ b/target/linux/ar71xx/patches-2.6.32/109-mtd-wrt160nl-trx-parser.patch @@ -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 +@@ -885,6 +885,16 @@ static int __devinit m25p_probe(struct s part_probes, &parts, 0); } #endif diff --git a/target/linux/ar71xx/patches-2.6.32/112-mtd-m25p80-add-w25q32-chip-support.patch b/target/linux/ar71xx/patches-2.6.32/112-mtd-m25p80-add-w25q32-chip-support.patch index 0e4c060db..5f44c1d69 100644 --- a/target/linux/ar71xx/patches-2.6.32/112-mtd-m25p80-add-w25q32-chip-support.patch +++ b/target/linux/ar71xx/patches-2.6.32/112-mtd-m25p80-add-w25q32-chip-support.patch @@ -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, }, From 31fbf6222a3b15fab94dc960a4a08978a5340c3c Mon Sep 17 00:00:00 2001 From: juhosg Date: Mon, 8 Feb 2010 09:37:11 +0000 Subject: [PATCH 3/4] kernel: 2.6.32: refresh a patch git-svn-id: svn://svn.openwrt.org/openwrt/trunk@19546 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- .../patches-2.6.32/270-scci_sd_section_fix.patch | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/target/linux/generic-2.6/patches-2.6.32/270-scci_sd_section_fix.patch b/target/linux/generic-2.6/patches-2.6.32/270-scci_sd_section_fix.patch index 2ca7e4898..3389b4b8c 100644 --- a/target/linux/generic-2.6/patches-2.6.32/270-scci_sd_section_fix.patch +++ b/target/linux/generic-2.6/patches-2.6.32/270-scci_sd_section_fix.patch @@ -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. **/ From a3d1e1db67e0f1139a377202a04b481d54078ae7 Mon Sep 17 00:00:00 2001 From: juhosg Date: Mon, 8 Feb 2010 09:37:16 +0000 Subject: [PATCH 4/4] kernel: 2.6.32: integrate m25p80 driver related patches from ar71xx git-svn-id: svn://svn.openwrt.org/openwrt/trunk@19547 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- .../patches-2.6.32/102-mtd_m25p80_add_myloader_parser.patch | 2 +- .../patches-2.6.32/104-mtd_m25p80_add_redboot_parser.patch | 2 +- .../ar71xx/patches-2.6.32/109-mtd-wrt160nl-trx-parser.patch | 2 +- ...de.patch => 083-mtd_fix_nand_correct_data_return_code.patch} | 0 .../084-mtd_m25p80_add_pm25lv_flash_support.patch} | 0 .../patches-2.6.32/085-mtd_m25p80_add_en25pxx_support.patch} | 0 .../patches-2.6.32/086-mtd_m25p80_add_xxxs33b_support.patch} | 0 .../087-mtd-m25p80-add-w25q32-chip-support.patch} | 0 8 files changed, 3 insertions(+), 3 deletions(-) rename target/linux/generic-2.6/patches-2.6.32/{090-mtd_fix_nand_correct_data_return_code.patch => 083-mtd_fix_nand_correct_data_return_code.patch} (100%) rename target/linux/{ar71xx/patches-2.6.32/100-mtd_m25p80_add_pm25lv_flash_support.patch => generic-2.6/patches-2.6.32/084-mtd_m25p80_add_pm25lv_flash_support.patch} (100%) rename target/linux/{ar71xx/patches-2.6.32/103-mtd_m25p80_add_en25pxx_support.patch => generic-2.6/patches-2.6.32/085-mtd_m25p80_add_en25pxx_support.patch} (100%) rename target/linux/{ar71xx/patches-2.6.32/106-mtd_m25p80_add_xxxs33b_support.patch => generic-2.6/patches-2.6.32/086-mtd_m25p80_add_xxxs33b_support.patch} (100%) rename target/linux/{ar71xx/patches-2.6.32/112-mtd-m25p80-add-w25q32-chip-support.patch => generic-2.6/patches-2.6.32/087-mtd-m25p80-add-w25q32-chip-support.patch} (100%) diff --git a/target/linux/ar71xx/patches-2.6.32/102-mtd_m25p80_add_myloader_parser.patch b/target/linux/ar71xx/patches-2.6.32/102-mtd_m25p80_add_myloader_parser.patch index 7b28fe418..320c76a0c 100644 --- a/target/linux/ar71xx/patches-2.6.32/102-mtd_m25p80_add_myloader_parser.patch +++ b/target/linux/ar71xx/patches-2.6.32/102-mtd_m25p80_add_myloader_parser.patch @@ -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); } diff --git a/target/linux/ar71xx/patches-2.6.32/104-mtd_m25p80_add_redboot_parser.patch b/target/linux/ar71xx/patches-2.6.32/104-mtd_m25p80_add_redboot_parser.patch index d4a8ce9a4..dbcdde088 100644 --- a/target/linux/ar71xx/patches-2.6.32/104-mtd_m25p80_add_redboot_parser.patch +++ b/target/linux/ar71xx/patches-2.6.32/104-mtd_m25p80_add_redboot_parser.patch @@ -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 diff --git a/target/linux/ar71xx/patches-2.6.32/109-mtd-wrt160nl-trx-parser.patch b/target/linux/ar71xx/patches-2.6.32/109-mtd-wrt160nl-trx-parser.patch index 52f54e6ce..7af88432a 100644 --- a/target/linux/ar71xx/patches-2.6.32/109-mtd-wrt160nl-trx-parser.patch +++ b/target/linux/ar71xx/patches-2.6.32/109-mtd-wrt160nl-trx-parser.patch @@ -1,6 +1,6 @@ --- a/drivers/mtd/devices/m25p80.c +++ b/drivers/mtd/devices/m25p80.c -@@ -885,6 +885,16 @@ static int __devinit m25p_probe(struct s +@@ -886,6 +886,16 @@ static int __devinit m25p_probe(struct s part_probes, &parts, 0); } #endif diff --git a/target/linux/generic-2.6/patches-2.6.32/090-mtd_fix_nand_correct_data_return_code.patch b/target/linux/generic-2.6/patches-2.6.32/083-mtd_fix_nand_correct_data_return_code.patch similarity index 100% rename from target/linux/generic-2.6/patches-2.6.32/090-mtd_fix_nand_correct_data_return_code.patch rename to target/linux/generic-2.6/patches-2.6.32/083-mtd_fix_nand_correct_data_return_code.patch diff --git a/target/linux/ar71xx/patches-2.6.32/100-mtd_m25p80_add_pm25lv_flash_support.patch b/target/linux/generic-2.6/patches-2.6.32/084-mtd_m25p80_add_pm25lv_flash_support.patch similarity index 100% rename from target/linux/ar71xx/patches-2.6.32/100-mtd_m25p80_add_pm25lv_flash_support.patch rename to target/linux/generic-2.6/patches-2.6.32/084-mtd_m25p80_add_pm25lv_flash_support.patch diff --git a/target/linux/ar71xx/patches-2.6.32/103-mtd_m25p80_add_en25pxx_support.patch b/target/linux/generic-2.6/patches-2.6.32/085-mtd_m25p80_add_en25pxx_support.patch similarity index 100% rename from target/linux/ar71xx/patches-2.6.32/103-mtd_m25p80_add_en25pxx_support.patch rename to target/linux/generic-2.6/patches-2.6.32/085-mtd_m25p80_add_en25pxx_support.patch diff --git a/target/linux/ar71xx/patches-2.6.32/106-mtd_m25p80_add_xxxs33b_support.patch b/target/linux/generic-2.6/patches-2.6.32/086-mtd_m25p80_add_xxxs33b_support.patch similarity index 100% rename from target/linux/ar71xx/patches-2.6.32/106-mtd_m25p80_add_xxxs33b_support.patch rename to target/linux/generic-2.6/patches-2.6.32/086-mtd_m25p80_add_xxxs33b_support.patch diff --git a/target/linux/ar71xx/patches-2.6.32/112-mtd-m25p80-add-w25q32-chip-support.patch b/target/linux/generic-2.6/patches-2.6.32/087-mtd-m25p80-add-w25q32-chip-support.patch similarity index 100% rename from target/linux/ar71xx/patches-2.6.32/112-mtd-m25p80-add-w25q32-chip-support.patch rename to target/linux/generic-2.6/patches-2.6.32/087-mtd-m25p80-add-w25q32-chip-support.patch