[U-Boot] [PATCH v6 27/31] mtd: move mtdparts_init() declaration

[Boris Brezillon <boris.brezillon@bootlin.com>]

On Thu, 16 Aug 2018 17:30:25 +0200
Miquel Raynal <miquel.raynal@bootlin.com> wrote:

> mtdparts_init() is called from various source files. It is declared in
> include/jffs2/load_kernel.h while it has nothing to do with jffs2
> anymore.
> 
> Move its declaration to include/linux/mtd/partitions.h which has way
> more meaning.

Looks like that's not the only change you're doing in this patch.

> 
> Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com>
> ---
>  cmd/flash.c                    |  1 +
>  cmd/jffs2.c                    |  1 +
>  cmd/mtdparts.c                 | 35 +++++++++++++++++++++++-----------
>  cmd/nand.c                     |  1 +
>  common/fdt_support.c           |  1 +
>  drivers/dfu/dfu_nand.c         |  1 +
>  drivers/fastboot/fb_nand.c     |  1 +
>  drivers/mtd/mtd_uboot.c        |  1 +
>  include/jffs2/load_kernel.h    |  1 -
>  include/linux/mtd/partitions.h |  3 +++
>  10 files changed, 34 insertions(+), 12 deletions(-)
> 
> diff --git a/cmd/flash.c b/cmd/flash.c
> index cd1758d7e2..383c015b87 100644
> --- a/cmd/flash.c
> +++ b/cmd/flash.c
> @@ -12,6 +12,7 @@
>  
>  #if defined(CONFIG_CMD_MTDPARTS)
>  #include <jffs2/jffs2.h>
> +#include <linux/mtd/partitions.h>
>  
>  /* partition handling routines */
>  int mtdparts_init(void);
> diff --git a/cmd/jffs2.c b/cmd/jffs2.c
> index 64621f2546..0ca2d30e2e 100644
> --- a/cmd/jffs2.c
> +++ b/cmd/jffs2.c
> @@ -76,6 +76,7 @@
>  #include <jffs2/jffs2.h>
>  #include <linux/list.h>
>  #include <linux/ctype.h>
> +#include <linux/mtd/partitions.h>
>  #include <cramfs/cramfs_fs.h>
>  
>  #if defined(CONFIG_CMD_NAND)
> diff --git a/cmd/mtdparts.c b/cmd/mtdparts.c
> index 7fd9e5cbdb..33becb86e8 100644
> --- a/cmd/mtdparts.c
> +++ b/cmd/mtdparts.c
> @@ -44,7 +44,7 @@
>   *
>   * 'mtdparts' - partition list
>   *
> - * mtdparts=mtdparts=<mtd-def>[;<mtd-def>...]
> + * mtdparts=[mtdparts=]<mtd-def>[;<mtd-def>...]
>   *
>   * <mtd-def>  := <mtd-id>:<part-def>[,<part-def>...]
>   * <mtd-id>   := unique device tag used by linux kernel to find mtd device (mtd->name)
> @@ -62,11 +62,11 @@
>   *
>   * 1 NOR Flash, with 1 single writable partition:
>   * mtdids=nor0=edb7312-nor
> - * mtdparts=mtdparts=edb7312-nor:-
> + * mtdparts=[mtdparts=]edb7312-nor:-
>   *
>   * 1 NOR Flash with 2 partitions, 1 NAND with one
>   * mtdids=nor0=edb7312-nor,nand0=edb7312-nand
> - * mtdparts=mtdparts=edb7312-nor:256k(ARMboot)ro,-(root);edb7312-nand:-(home)
> + * mtdparts=[mtdparts=]edb7312-nor:256k(ARMboot)ro,-(root);edb7312-nand:-(home)
>   *
>   */
>  
> @@ -1170,9 +1170,6 @@ static int generate_mtdparts(char *buf, u32 buflen)
>  		return 0;
>  	}
>  
> -	strcpy(p, "mtdparts=");
> -	p += 9;
> -
>  	list_for_each(dentry, &devices) {
>  		dev = list_entry(dentry, struct mtd_device, link);
>  
> @@ -1643,11 +1640,9 @@ static int parse_mtdparts(const char *const mtdparts)
>  	if (!p)
>  		p = mtdparts;
>  
> -	if (strncmp(p, "mtdparts=", 9) != 0) {
> -		printf("mtdparts variable doesn't start with 'mtdparts='\n");
> -		return err;
> -	}
> -	p += 9;
> +	/* Skip the useless prefix, if any */
> +	if (strncmp(p, "mtdparts=", 9) == 0)
> +		p += 9;
>  
>  	while (*p != '\0') {
>  		err = 1;
> @@ -1786,6 +1781,24 @@ static int parse_mtdids(const char *const ids)
>  	return 0;
>  }
>  
> +int mtdids_search_alternate_name(const char *mtdname, char *altname,
> +				 unsigned int max_len)
> +{
> +	struct list_head *entry;
> +	struct mtdids *id;
> +
> +	list_for_each(entry, &mtdids) {
> +		id = list_entry(entry, struct mtdids, link);
> +		if (!strncmp(mtdname, id->mtd_id, max_len)) {
> +			snprintf(altname, max_len, "%s%d",
> +				 MTD_DEV_TYPE(id->type), id->num);
> +
> +			return 0;
> +		}
> +	}
> +
> +	return -EINVAL;
> +}
>  
>  /**
>   * Parse and initialize global mtdids mapping and create global
> diff --git a/cmd/nand.c b/cmd/nand.c
> index a22945d144..507966c513 100644
> --- a/cmd/nand.c
> +++ b/cmd/nand.c
> @@ -21,6 +21,7 @@
>  
>  #include <common.h>
>  #include <linux/mtd/mtd.h>
> +#include <linux/mtd/partitions.h>
>  #include <command.h>
>  #include <console.h>
>  #include <watchdog.h>
> diff --git a/common/fdt_support.c b/common/fdt_support.c
> index 34d2bd59c4..3906b7446d 100644
> --- a/common/fdt_support.c
> +++ b/common/fdt_support.c
> @@ -11,6 +11,7 @@
>  #include <stdio_dev.h>
>  #include <linux/ctype.h>
>  #include <linux/types.h>
> +#include <linux/mtd/partitions.h>
>  #include <asm/global_data.h>
>  #include <linux/libfdt.h>
>  #include <fdt_support.h>
> diff --git a/drivers/dfu/dfu_nand.c b/drivers/dfu/dfu_nand.c
> index 0bfdbf9428..a3164491eb 100644
> --- a/drivers/dfu/dfu_nand.c
> +++ b/drivers/dfu/dfu_nand.c
> @@ -15,6 +15,7 @@
>  #include <div64.h>
>  #include <dfu.h>
>  #include <linux/mtd/mtd.h>
> +#include <linux/mtd/partitions.h>
>  #include <jffs2/load_kernel.h>
>  #include <nand.h>
>  
> diff --git a/drivers/fastboot/fb_nand.c b/drivers/fastboot/fb_nand.c
> index 526bc12307..776f628712 100644
> --- a/drivers/fastboot/fb_nand.c
> +++ b/drivers/fastboot/fb_nand.c
> @@ -11,6 +11,7 @@
>  #include <image-sparse.h>
>  
>  #include <linux/mtd/mtd.h>
> +#include <linux/mtd/partitions.h>
>  #include <jffs2/jffs2.h>
>  #include <nand.h>
>  
> diff --git a/drivers/mtd/mtd_uboot.c b/drivers/mtd/mtd_uboot.c
> index 2b3b2eecca..55cdde284c 100644
> --- a/drivers/mtd/mtd_uboot.c
> +++ b/drivers/mtd/mtd_uboot.c
> @@ -5,6 +5,7 @@
>   */
>  #include <common.h>
>  #include <linux/mtd/mtd.h>
> +#include <linux/mtd/partitions.h>
>  #include <jffs2/jffs2.h>
>  
>  static int get_part(const char *partname, int *idx, loff_t *off, loff_t *size,
> diff --git a/include/jffs2/load_kernel.h b/include/jffs2/load_kernel.h
> index 9346d7ee9f..3ef56ab0c5 100644
> --- a/include/jffs2/load_kernel.h
> +++ b/include/jffs2/load_kernel.h
> @@ -62,7 +62,6 @@ struct mtdids {
>  #define led_blink(x, y, z, a)
>  
>  /* common/cmd_jffs2.c */
> -extern int mtdparts_init(void);
>  extern int find_dev_and_part(const char *id, struct mtd_device **dev,
>  				u8 *part_num, struct part_info **part);
>  extern struct mtd_device *device_find(u8 type, u8 num);
> diff --git a/include/linux/mtd/partitions.h b/include/linux/mtd/partitions.h
> index 0cf26ca945..0d6e0cfa59 100644
> --- a/include/linux/mtd/partitions.h
> +++ b/include/linux/mtd/partitions.h
> @@ -87,6 +87,9 @@ int mtd_add_partition(struct mtd_info *master, const char *name,
>  int mtd_del_partition(struct mtd_info *master, int partno);
>  uint64_t mtd_get_device_size(const struct mtd_info *mtd);
>  
> +int mtdparts_init(void);
> +int mtdids_search_alternate_name(const char *mtdname, char *altname,
> +				 unsigned int max_len);
>  int mtdparts_parse_part(struct mtd_info *parent, const char **_mtdparts,
>  			struct mtd_partition **_parts, int *_nb_parts);
>