powerpc/BSC9132QDS: Enable creation of dynamic partition for NAND and NOR

PATCH New Ashish Kumar 2 participants 6 messages Oct 6, 2014 – Nov 14, 2014 1 message not in the archive

Share & tools

Ashish Kumar

author

2014-10-06 12:54 UTC #0 lore raw

PATCH 1/1 powerpc/BSC9132QDS: Enable creation of dynamic partition for NAND and NOR

* 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 <[email protected]>

---
 board/freescale/bsc9132qds/bsc9132qds.c |   12 ++++++++++++
 include/configs/BSC9132QDS.h            |   21 +++++++++++++++++++++
 2 files changed, 33 insertions(+), 0 deletions(-)

board/freescale/bsc9132qds/bsc9132qds.c +12 -0

index 10580bc..c88838b 100644
@@ -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);

include/configs/BSC9132QDS.h +21 -0

index aeded6d..da78a19 100644
@@ -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
+/*
+ * Override partitions in device tree using info
+ * in "mtdparts" environment variable
+ */
+#ifdef CONFIG_CMD_MTDPARTS
+#define CONFIG_FDT_FIXUP_PARTITIONS
+#endif
+
+/*
  * Environment Configuration
  */

Signature · 1 line

1.7.6.GIT

York Sun

2014-10-14 20:14 UTC #1 lore raw

PATCH 1/1 powerpc/BSC9132QDS: Enable creation of dynamic partition for NAND and NOR

Quoted 58 lines · Ashish Kumar

Signed-off-by Ashish Kumar <[email protected]>

---
 board/freescale/bsc9132qds/bsc9132qds.c |   12 ++++++++++++
 include/configs/BSC9132QDS.h            |   21 +++++++++++++++++++++
 2 files changed, 33 insertions(+), 0 deletions(-)

board/freescale/bsc9132qds/bsc9132qds.c +12 -0

index 10580bc..c88838b 100644
@@ -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);

include/configs/BSC9132QDS.h +2 -0

index aeded6d..da78a19 100644
@@ -630,6 +630,27 @@ combinations. this should be removed later
 #endif
 
 /*
+ * Dynamic MTD Partition support with mtdparts
+ */

include/configs/BSC9132QDS.h combinations. this should be removed later · line 644

Quoted 10 lines

include/configs/BSC9132QDS.h +10 -0

+#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

Ashish Kumar

author

2014-10-14 20:19 UTC #2 lore raw

PATCH 1/1 powerpc/BSC9132QDS: Enable creation of dynamic partition for NAND and NOR

Hi York,

Yes, I should superseed/reject the below patches

http://patchwork.ozlabs.org/patch/391991/
http://patchwork.ozlabs.org/patch/391990/

Regards
Ashish

-----Original Message-----
From: Sun York-R58495
Sent: Wednesday, October 15, 2014 1:44 AM
To: Kumar Ashish-B37399; u-Boot at lists.denx.de
Cc: Wood Scott-B07421
Subject: Re: [PATCH] powerpc/BSC9132QDS: Enable creation of dynamic partition for NAND and NOR

Quoted 54 lines · Ashish Kumar

Signed-off-by Ashish Kumar <[email protected]>

---
 board/freescale/bsc9132qds/bsc9132qds.c |   12 ++++++++++++
 include/configs/BSC9132QDS.h            |   21 +++++++++++++++++++++
 2 files changed, 33 insertions(+), 0 deletions(-)

board/freescale/bsc9132qds/bsc9132qds.c +11 -0

index 10580bc..c88838b 100644
@@ -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

include/configs/BSC9132QDS.h +0 -0

@@ -630,6 +630,27 @@ combinations. this should be removed later  
 #endif

include/configs/BSC9132QDS.h combinations. this should be removed later · line 641

Quoted 10 lines

include/configs/BSC9132QDS.h +9 -0

 /*
+ * 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

York Sun

2014-10-14 20:21 UTC #3 lore raw

PATCH 1/1 powerpc/BSC9132QDS: Enable creation of dynamic partition for NAND and NOR

Quoted 5 lines · On 10/14/2014 01:19 PM, Kumar Ashish-B37399 wrote:

Hi York,
Yes, I should superseed/reject the below patches
http://patchwork.ozlabs.org/patch/391991/

I think your v2 patch reduced the size of SPI. Please check before you mark them superseded.

York

Quoted 84 lines

http://patchwork.ozlabs.org/patch/391990/
Regards
Ashish
-----Original Message-----
From: Sun York-R58495
Sent: Wednesday, October 15, 2014 1:44 AM
To: Kumar Ashish-B37399; u-Boot at lists.denx.de
Cc: Wood Scott-B07421
Subject: Re: [PATCH] powerpc/BSC9132QDS: Enable creation of dynamic partition for NAND and NOR
Quoted 54 lines · Ashish Kumar
* 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 <[email protected]>
---
 board/freescale/bsc9132qds/bsc9132qds.c |   12 ++++++++++++
 include/configs/BSC9132QDS.h            |   21 +++++++++++++++++++++
 2 files changed, 33 insertions(+), 0 deletions(-)
board/freescale/bsc9132qds/bsc9132qds.c +11 -0
index 10580bc..c88838b 100644
@@ -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
include/configs/BSC9132QDS.h +0 -0
@@ -630,6 +630,27 @@ combinations. this should be removed later  
 #endif
 
include/configs/BSC9132QDS.h combinations. this should be removed later · line 641
Quoted 10 lines
include/configs/BSC9132QDS.h +9 -0
 /*
+ * 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

A message that is not in the archive (sent off-list or not yet received): c86d04d90d2d49589f832d1130b7e2c4@BL2PR03MB276.namprd03.prod.outlook.com

York Sun

2014-10-15 15:31 UTC #5 lore raw

PATCH 1/1 powerpc/BSC9132QDS: Enable creation of dynamic partition for NAND and NOR

OK. Please mark old patches superseded.

York

Quoted 112 lines · On 10/15/2014 02:04 AM, Kumar Ashish-B37399 wrote:

Hi York,
Please see the attached mail.
Since SPI is not supported by fdt_fixup_mtdparts() same is removed in V2
Regards
Ashish
-----Original Message-----
From: Sun York-R58495
Sent: Wednesday, October 15, 2014 1:51 AM
To: Kumar Ashish-B37399
Cc: Wood Scott-B07421; u-Boot at lists.denx.de
Subject: Re: [PATCH] powerpc/BSC9132QDS: Enable creation of dynamic partition for NAND and NOR
Quoted 5 lines · On 10/14/2014 01:19 PM, Kumar Ashish-B37399 wrote:
Hi York,
Yes, I should superseed/reject the below patches
http://patchwork.ozlabs.org/patch/391991/
I think your v2 patch reduced the size of SPI. Please check before you mark them superseded.
York
Quoted 85 lines
http://patchwork.ozlabs.org/patch/391990/
Regards
Ashish
-----Original Message-----
From: Sun York-R58495
Sent: Wednesday, October 15, 2014 1:44 AM
To: Kumar Ashish-B37399; u-Boot at lists.denx.de
Cc: Wood Scott-B07421
Subject: Re: [PATCH] powerpc/BSC9132QDS: Enable creation of dynamic partition for NAND and NOR
Quoted 54 lines · Ashish Kumar
* 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 <[email protected]>
---
 board/freescale/bsc9132qds/bsc9132qds.c |   12 ++++++++++++
 include/configs/BSC9132QDS.h            |   21 +++++++++++++++++++++
 2 files changed, 33 insertions(+), 0 deletions(-)
board/freescale/bsc9132qds/bsc9132qds.c +11 -0
index 10580bc..c88838b 100644
@@ -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
include/configs/BSC9132QDS.h +0 -0
@@ -630,6 +630,27 @@ combinations. this should be removed later 
 #endif
 
include/configs/BSC9132QDS.h combinations. this should be removed later · line 641
Quoted 10 lines
include/configs/BSC9132QDS.h +9 -0
 /*
+ * 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

York Sun

2014-11-14 21:28 UTC #6 lore raw

PATCH 1/1 powerpc/BSC9132QDS: Enable creation of dynamic partition for NAND and NOR

In reply to Ashish Kumar

Quoted 7 lines · Ashish Kumar

* 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 <[email protected]>
---

Applied to u-boot-mpc85xx master. Thanks.

York