diff options
| author | Gabor Juhos <juhosg@openwrt.org> | 2011-12-03 18:13:23 +0000 |
|---|---|---|
| committer | Gabor Juhos <juhosg@openwrt.org> | 2011-12-03 18:13:23 +0000 |
| commit | c4126790b7aa0dfb30e7ecef853858ea491c5392 (patch) | |
| tree | b961b6f01208821df619f14093d51df2b25f4adf | |
| parent | 2216dd22b0f1c2fdd8e0a1a6aa214a1373f6186b (diff) | |
| download | upstream-c4126790b7aa0dfb30e7ecef853858ea491c5392.tar.gz upstream-c4126790b7aa0dfb30e7ecef853858ea491c5392.tar.bz2 upstream-c4126790b7aa0dfb30e7ecef853858ea491c5392.zip | |
ar71xx: run the MyLoader parser only on the WP543 board
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@29413 3c298f89-4303-0410-b956-a3cf2f4a3e73
3 files changed, 13 insertions, 26 deletions
diff --git a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-wp543.c b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-wp543.c index 7a1c6b1976..3eb57119cb 100644 --- a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-wp543.c +++ b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-wp543.c @@ -9,9 +9,6 @@ * by the Free Software Foundation. */ -#include <linux/mtd/mtd.h> -#include <linux/mtd/partitions.h> - #include <asm/mach-ar71xx/ar71xx.h> #include "machtype.h" @@ -73,9 +70,18 @@ static struct gpio_keys_button wp543_gpio_keys[] __initdata = { } }; +static const char *wp543_part_probes[] = { + "MyLoader", + NULL, +}; + +static struct flash_platform_data wp543_flash_data = { + .part_probes = wp543_part_probes, +}; + static void __init wp543_setup(void) { - ar71xx_add_device_m25p80(NULL); + ar71xx_add_device_m25p80(&wp543_flash_data); ar71xx_add_device_mdio(0, 0xfffffff0); diff --git a/target/linux/ar71xx/patches-2.6.39/102-mtd_m25p80_add_myloader_parser.patch b/target/linux/ar71xx/patches-2.6.39/102-mtd_m25p80_add_myloader_parser.patch deleted file mode 100644 index 35c5a07a09..0000000000 --- a/target/linux/ar71xx/patches-2.6.39/102-mtd_m25p80_add_myloader_parser.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- a/drivers/mtd/devices/m25p80.c -+++ b/drivers/mtd/devices/m25p80.c -@@ -972,6 +972,16 @@ static int __devinit m25p_probe(struct s - nr_parts = parse_mtd_partitions(&flash->mtd, - data->part_probes, &parts, 0); - -+#ifdef CONFIG_MTD_MYLOADER_PARTS -+ if (nr_parts <= 0) { -+ static const char *part_probes[] -+ = { "MyLoader", NULL, }; -+ -+ nr_parts = parse_mtd_partitions(&flash->mtd, -+ part_probes, &parts, 0); -+ } -+#endif -+ - if (nr_parts <= 0 && data && data->parts) { - parts = data->parts; - nr_parts = data->nr_parts; diff --git a/target/linux/ar71xx/patches-2.6.39/104-mtd_m25p80_add_redboot_parser.patch b/target/linux/ar71xx/patches-2.6.39/104-mtd_m25p80_add_redboot_parser.patch index da6f1e14eb..d9139237a0 100644 --- a/target/linux/ar71xx/patches-2.6.39/104-mtd_m25p80_add_redboot_parser.patch +++ b/target/linux/ar71xx/patches-2.6.39/104-mtd_m25p80_add_redboot_parser.patch @@ -1,8 +1,8 @@ --- a/drivers/mtd/devices/m25p80.c +++ b/drivers/mtd/devices/m25p80.c -@@ -982,6 +982,15 @@ static int __devinit m25p_probe(struct s - } - #endif +@@ -972,6 +972,15 @@ static int __devinit m25p_probe(struct s + nr_parts = parse_mtd_partitions(&flash->mtd, + data->part_probes, &parts, 0); +#ifdef CONFIG_MTD_REDBOOT_PARTS + if (nr_parts <= 0) { |