| Message ID | 200906221127.06461.florian@openwrt.org |
|---|---|
| State | New, archived |
| Headers | show |
On Mon, Jun 22, 2009 at 05:27, Florian Fainelli wrote: > #ifdef CONFIG_MTD_PARTITIONS > -static const char *part_probe_types[] = { "cmdlinepart", "RedBoot", NULL }; > +static const char *part_probe_types[] = { > +#ifdef CONFIG_MTD_CMDLINE_PARTS > + "cmdlinepart", > +#elif defined CONFIG_MTD_REDBOOT_PARTS > + "RedBoot", > +#elif defined CONFIG_MTD_AR7_PARTS > + "ar7part", > +#endif > + NULL > +}; > #endif you just broke systems that have both cmdline and redboot enabled -mike
Le Monday 22 June 2009 14:33:22 Mike Frysinger, vous avez écrit : > On Mon, Jun 22, 2009 at 05:27, Florian Fainelli wrote: > > #ifdef CONFIG_MTD_PARTITIONS > > -static const char *part_probe_types[] = { "cmdlinepart", "RedBoot", NULL > > }; +static const char *part_probe_types[] = { > > +#ifdef CONFIG_MTD_CMDLINE_PARTS > > + "cmdlinepart", > > +#elif defined CONFIG_MTD_REDBOOT_PARTS > > + "RedBoot", > > +#elif defined CONFIG_MTD_AR7_PARTS > > + "ar7part", > > +#endif > > + NULL > > +}; > > #endif > > you just broke systems that have both cmdline and redboot enabled > -mike Right, let me respin that one.
diff --git a/drivers/mtd/maps/physmap.c b/drivers/mtd/maps/physmap.c index 29a9011..2095b60 100644 --- a/drivers/mtd/maps/physmap.c +++ b/drivers/mtd/maps/physmap.c @@ -80,7 +80,16 @@ static const char *rom_probe_types[] = { "map_rom", NULL }; #ifdef CONFIG_MTD_PARTITIONS -static const char *part_probe_types[] = { "cmdlinepart", "RedBoot", NULL }; +static const char *part_probe_types[] = { +#ifdef CONFIG_MTD_CMDLINE_PARTS + "cmdlinepart", +#elif defined CONFIG_MTD_REDBOOT_PARTS + "RedBoot", +#elif defined CONFIG_MTD_AR7_PARTS + "ar7part", +#endif + NULL +}; #endif static int physmap_flash_probe(struct platform_device *dev)
This patch makes the physmap driver use the partition parsers that we enable in the kernel configuration as the list of partition parsers to use when probing the flash chip. Signed-off-by: Florian Fainelli <florian@openwrt.org> ---