mtd/drivers/mtd/maps ceiva.c,1.2,1.3 dc21285.c,1.9,1.10 edb7312.c,1.2,1.3 epxa10db-flash.c,1.4,1.5 impa7.c,1.2,1.3 integrator-flash.c,1.7,1.8 iq80310.c,1.9,1.10 ocelot.c,1.6,1.7 sa1100-flash.c,1.29,1.30 solutionengine.c,1.4,1.5
gthomas at infradead.org
gthomas at infradead.org
Mon Feb 17 16:49:12 EST 2003
Update of /home/cvs/mtd/drivers/mtd/maps
In directory phoenix.infradead.org:/tmp/cvs-serv1136/drivers/mtd/maps
Modified Files:
ceiva.c dc21285.c edb7312.c epxa10db-flash.c impa7.c
integrator-flash.c iq80310.c ocelot.c sa1100-flash.c
solutionengine.c
Log Message:
Add 'origin' argument to partition scanning functions
Index: ceiva.c
===================================================================
RCS file: /home/cvs/mtd/drivers/mtd/maps/ceiva.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ceiva.c 14 Oct 2002 12:50:22 -0000 1.2
+++ ceiva.c 17 Feb 2003 21:49:10 -0000 1.3
@@ -318,9 +318,6 @@
return nr;
}
-extern int parse_redboot_partitions(struct mtd_info *master, struct mtd_partition **pparts);
-extern int parse_cmdline_partitions(struct mtd_info *master, struct mtd_partition **pparts, char *);
-
static struct mtd_partition *parsed_parts;
static void __init clps_locate_partitions(struct mtd_info *mtd)
@@ -339,7 +336,7 @@
}
#endif
#ifdef CONFIG_MTD_REDBOOT_PARTS
- nr_parts = parse_redboot_partitions(mtd, &parsed_parts);
+ nr_parts = parse_redboot_partitions(mtd, &parsed_parts, (void *)0);
if (nr_parts > 0) {
part_type = "RedBoot";
break;
Index: dc21285.c
===================================================================
RCS file: /home/cvs/mtd/drivers/mtd/maps/dc21285.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- dc21285.c 14 Oct 2002 12:22:10 -0000 1.9
+++ dc21285.c 17 Feb 2003 21:49:10 -0000 1.10
@@ -108,8 +108,6 @@
/* Partition stuff */
static struct mtd_partition *dc21285_parts;
-extern int parse_redboot_partitions(struct mtd_info *, struct mtd_partition **);
-
int __init init_dc21285(void)
{
/* Determine buswidth */
@@ -146,7 +144,7 @@
/* partition fixup */
#ifdef CONFIG_MTD_REDBOOT_PARTS
- nrparts = parse_redboot_partitions(mymtd, &dc21285_parts);
+ nrparts = parse_redboot_partitions(mymtd, &dc21285_parts, (void *)0);
#endif
if (nrparts > 0) {
add_mtd_partitions(mymtd, dc21285_parts, nrparts);
Index: edb7312.c
===================================================================
RCS file: /home/cvs/mtd/drivers/mtd/maps/edb7312.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- edb7312.c 5 Sep 2002 05:11:24 -0000 1.2
+++ edb7312.c 17 Feb 2003 21:49:10 -0000 1.3
@@ -118,12 +118,6 @@
#define NB_OF(x) (sizeof (x) / sizeof (x[0]))
-#ifdef CONFIG_MTD_CMDLINE_PARTS
-int parse_cmdline_partitions(struct mtd_info *master,
- struct mtd_partition **pparts,
- const char *mtd_id);
-#endif
-
#endif
static int mtd_parts_nb = 0;
Index: epxa10db-flash.c
===================================================================
RCS file: /home/cvs/mtd/drivers/mtd/maps/epxa10db-flash.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- epxa10db-flash.c 22 Aug 2002 10:46:19 -0000 1.4
+++ epxa10db-flash.c 17 Feb 2003 21:49:10 -0000 1.5
@@ -43,7 +43,6 @@
static struct mtd_info *mymtd;
-extern int parse_redboot_partitions(struct mtd_info *, struct mtd_partition **);
static int epxa_default_partitions(struct mtd_info *master, struct mtd_partition **pparts);
static __u8 epxa_read8(struct map_info *map, unsigned long ofs)
@@ -136,7 +135,7 @@
}
#ifdef CONFIG_MTD_REDBOOT_PARTS
- nr_parts = parse_redboot_partitions(mymtd, &parts);
+ nr_parts = parse_redboot_partitions(mymtd, &parts, (void *)0);
if (nr_parts > 0) {
add_mtd_partitions(mymtd, parts, nr_parts);
@@ -144,7 +143,7 @@
}
#endif
#ifdef CONFIG_MTD_AFS_PARTS
- nr_parts = parse_afs_partitions(mymtd, &parts);
+ nr_parts = parse_afs_partitions(mymtd, &parts, (void *)0);
if (nr_parts > 0) {
add_mtd_partitions(mymtd, parts, nr_parts);
Index: impa7.c
===================================================================
RCS file: /home/cvs/mtd/drivers/mtd/maps/impa7.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- impa7.c 5 Sep 2002 05:11:24 -0000 1.2
+++ impa7.c 17 Feb 2003 21:49:10 -0000 1.3
@@ -125,12 +125,6 @@
#define NB_OF(x) (sizeof (x) / sizeof (x[0]))
-#ifdef CONFIG_MTD_CMDLINE_PARTS
-int parse_cmdline_partitions(struct mtd_info *master,
- struct mtd_partition **pparts,
- const char *mtd_id);
-#endif
-
#endif
static int mtd_parts_nb = 0;
Index: integrator-flash.c
===================================================================
RCS file: /home/cvs/mtd/drivers/mtd/maps/integrator-flash.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- integrator-flash.c 1 Nov 2001 20:55:47 -0000 1.7
+++ integrator-flash.c 17 Feb 2003 21:49:10 -0000 1.8
@@ -41,8 +41,6 @@
#include <asm/io.h>
#include <asm/system.h>
-extern int parse_afs_partitions(struct mtd_info *, struct mtd_partition **);
-
// board specific stuff - sorry, it should be in arch/arm/mach-*.
#ifdef CONFIG_ARCH_INTEGRATOR
@@ -235,7 +233,7 @@
mtd->module = THIS_MODULE;
- ret = parse_afs_partitions(mtd, &parts);
+ ret = parse_afs_partitions(mtd, &parts, (void *)0);
if (ret > 0) {
ret = add_mtd_partitions(mtd, parts, ret);
if (ret)
Index: iq80310.c
===================================================================
RCS file: /home/cvs/mtd/drivers/mtd/maps/iq80310.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- iq80310.c 1 Jan 2002 22:45:02 -0000 1.9
+++ iq80310.c 17 Feb 2003 21:49:10 -0000 1.10
@@ -107,8 +107,6 @@
static struct mtd_info *mymtd;
static struct mtd_partition *parsed_parts;
-extern int parse_redboot_partitions(struct mtd_info *master, struct mtd_partition **pparts);
-
static int __init init_iq80310(void)
{
struct mtd_partition *parts;
@@ -130,7 +128,7 @@
#ifdef CONFIG_MTD_REDBOOT_PARTS
if (parsed_nr_parts == 0) {
- int ret = parse_redboot_partitions(mymtd, &parsed_parts);
+ int ret = parse_redboot_partitions(mymtd, &parsed_parts, (void *)0);
if (ret > 0) {
part_type = "RedBoot";
Index: ocelot.c
===================================================================
RCS file: /home/cvs/mtd/drivers/mtd/maps/ocelot.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ocelot.c 2 Oct 2001 15:05:14 -0000 1.6
+++ ocelot.c 17 Feb 2003 21:49:10 -0000 1.7
@@ -20,8 +20,6 @@
#define NVRAM_WINDOW_SIZE 0x00007FF0
#define NVRAM_BUSWIDTH 1
-extern int parse_redboot_partitions(struct mtd_info *master, struct mtd_partition **pparts);
-
static unsigned int cacheflush = 0;
static struct mtd_info *flash_mtd;
@@ -156,7 +154,7 @@
add_mtd_device(nvram_mtd);
flash_mtd->module = THIS_MODULE;
- nr_parts = parse_redboot_partitions(flash_mtd, &parsed_parts);
+ nr_parts = parse_redboot_partitions(flash_mtd, &parsed_parts, (void *)0);
if (nr_parts)
add_mtd_partitions(flash_mtd, parsed_parts, nr_parts);
Index: sa1100-flash.c
===================================================================
RCS file: /home/cvs/mtd/drivers/mtd/maps/sa1100-flash.c,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- sa1100-flash.c 6 Sep 2002 14:36:19 -0000 1.29
+++ sa1100-flash.c 17 Feb 2003 21:49:10 -0000 1.30
@@ -765,7 +765,6 @@
};
#endif
-extern int parse_redboot_partitions(struct mtd_info *master, struct mtd_partition **pparts);
extern int parse_bootldr_partitions(struct mtd_info *master, struct mtd_partition **pparts);
static struct mtd_partition *parsed_parts;
@@ -964,7 +963,7 @@
*/
#ifdef CONFIG_MTD_REDBOOT_PARTS
if (parsed_nr_parts == 0) {
- int ret = parse_redboot_partitions(mymtd, &parsed_parts);
+ int ret = parse_redboot_partitions(mymtd, &parsed_parts, (void *)0);
if (ret > 0) {
part_type = "RedBoot";
Index: solutionengine.c
===================================================================
RCS file: /home/cvs/mtd/drivers/mtd/maps/solutionengine.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- solutionengine.c 7 Nov 2001 01:20:59 -0000 1.4
+++ solutionengine.c 17 Feb 2003 21:49:10 -0000 1.5
@@ -18,8 +18,6 @@
#include <linux/config.h>
-extern int parse_redboot_partitions(struct mtd_info *master, struct mtd_partition **pparts);
-
__u32 soleng_read32(struct map_info *map, unsigned long ofs)
{
return __raw_readl(map->map_priv_1 + ofs);
@@ -110,7 +108,7 @@
}
#ifdef CONFIG_MTD_REDBOOT_PARTS
- nr_parts = parse_redboot_partitions(flash_mtd, &parsed_parts);
+ nr_parts = parse_redboot_partitions(flash_mtd, &parsed_parts, (void *)0);
if (nr_parts > 0)
printk(KERN_NOTICE "Found RedBoot partition table.\n");
else if (nr_parts < 0)
More information about the linux-mtd-cvs
mailing list