From mboxrd@z Thu Jan  1 00:00:00 1970
From: York Sun <yorksun@freescale.com>
Date: Tue, 14 Oct 2014 13:14:10 -0700
Subject: [U-Boot] [PATCH] powerpc/BSC9132QDS: Enable creation of dynamic
 partition for NAND and NOR
In-Reply-To: <1412600096-3928-1-git-send-email-Ashish.Kumar@freescale.com>
References: <1412600096-3928-1-git-send-email-Ashish.Kumar@freescale.com>
Message-ID: <543D8412.1080402@freescale.com>
List-Id: <u-boot.lists.denx.de>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
To: u-boot@lists.denx.de

On 10/06/2014 05:54 AM, Ashish Kumar wrote:
>  * fdt_fixup_mtdparts is called from ft_board_setup
>  * run "mtdparts default" to create NAND, NOR partition on uboot
>  * Use mtdparts to create partitions dynamically rather
>     than using static partitions in device tree
> 
> Signed-off-by: Ashish Kumar <Ashish.Kumar@freescale.com>
> ---
>  board/freescale/bsc9132qds/bsc9132qds.c |   12 ++++++++++++
>  include/configs/BSC9132QDS.h            |   21 +++++++++++++++++++++
>  2 files changed, 33 insertions(+), 0 deletions(-)
> 
> diff --git a/board/freescale/bsc9132qds/bsc9132qds.c b/board/freescale/bsc9132qds/bsc9132qds.c
> index 10580bc..c88838b 100644
> --- a/board/freescale/bsc9132qds/bsc9132qds.c
> +++ b/board/freescale/bsc9132qds/bsc9132qds.c
> @@ -21,6 +21,9 @@
>  #include <hwconfig.h>
>  #include <i2c.h>
>  #include <fsl_ddr_sdram.h>
> +#include <jffs2/load_kernel.h>
> +#include <mtd_node.h>
> +#include <flash.h>
>  
>  #ifdef CONFIG_PCI
>  #include <pci.h>
> @@ -354,6 +357,12 @@ void fdt_del_node_compat(void *blob, const char *compatible)
>  }
>  
>  #if defined(CONFIG_OF_BOARD_SETUP)
> +#ifdef CONFIG_FDT_FIXUP_PARTITIONS
> +struct node_info nodes[] = {
> +	{ "cfi-flash",			MTD_DEV_TYPE_NOR,  },
> +	{ "fsl,ifc-nand",		MTD_DEV_TYPE_NAND, },
> +};
> +#endif
>  void ft_board_setup(void *blob, bd_t *bd)
>  {
>  	phys_addr_t base;
> @@ -369,6 +378,9 @@ void ft_board_setup(void *blob, bd_t *bd)
>  	#endif
>  
>  	fdt_fixup_memory(blob, (u64)base, (u64)size);
> +#ifdef CONFIG_FDT_FIXUP_PARTITIONS
> +	fdt_fixup_mtdparts(blob, nodes, ARRAY_SIZE(nodes));
> +#endif
>  
>  	ccsr_gur_t *gur = (void *)(CONFIG_SYS_MPC85xx_GUTS_ADDR);
>  	u32 porbmsr = in_be32(&gur->porbmsr);
> diff --git a/include/configs/BSC9132QDS.h b/include/configs/BSC9132QDS.h
> index aeded6d..da78a19 100644
> --- a/include/configs/BSC9132QDS.h
> +++ b/include/configs/BSC9132QDS.h
> @@ -630,6 +630,27 @@ combinations. this should be removed later
>  #endif
>  
>  /*
> + * Dynamic MTD Partition support with mtdparts
> + */
> +#ifndef CONFIG_SYS_NO_FLASH
> +#define CONFIG_MTD_DEVICE
> +#define CONFIG_MTD_PARTITIONS
> +#define CONFIG_CMD_MTDPARTS
> +#define CONFIG_FLASH_CFI_MTD
> +#define MTDIDS_DEFAULT "nor0=88000000.nor,nand0=ff800000.flash,"
> +#define MTDPARTS_DEFAULT "mtdparts=88000000.nor:256k(dtb),7m(kernel)," \
> +			"55m(fs),1m(uboot);ff800000.flash:1m(uboot)," \
> +			"8m(kernel),512k(dtb),-(fs)"
> +#endif


Isn't this patch conflict with your earlier patch?
http://patchwork.ozlabs.org/patch/391991/

York