KumiSystems/openwrtv4
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

ar71xx: run the MyLoader parser only on the WP543 board

Browse source 
SVN-Revision: 29413
This commit is contained in:
Gabor Juhos 2011-12-03 18:13:23 +00:00
parent 67a0b9aada
commit 9cc28d5aa0
3 changed files with 13 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
target/linux/ar71xx/files/arch/mips/ar71xx/mach-wp543.c
View file

@ -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);

19
target/linux/ar71xx/patches-2.6.39/102-mtd_m25p80_add_myloader_parser.patch
View file

@ -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;

6
target/linux/ar71xx/patches-2.6.39/104-mtd_m25p80_add_redboot_parser.patch
View file

@ -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) {