public inbox for u-boot@lists.denx.de
 help / color / mirror / Atom feed
* [U-Boot] [PATCH 1/2] dfu: nand: Add missing dependency on CMD_MTDPARTS
@ 2018-11-10 11:22 Boris Brezillon
  2018-11-10 11:22 ` [U-Boot] [PATCH 2/2] mtd: Fix dependency of {MTDIDS, MTDPARTS}_DEFAULT Boris Brezillon
  2018-11-12  4:43 ` [U-Boot] [PATCH 1/2] dfu: nand: Add missing dependency on CMD_MTDPARTS Jagan Teki
  0 siblings, 2 replies; 6+ messages in thread
From: Boris Brezillon @ 2018-11-10 11:22 UTC (permalink / raw)
  To: u-boot

dfu_fill_entity_nand() uses find_dev_and_part() and mtdparts_init()
which are provided by cmd/mtdparts.c.

Add the dependency to avoid build failures when CMD_MTDPARTS is not
selected.

Reported-by: Jagan Teki <jagan@amarulasolutions.com>
Fixes: 6828e602b722d ("dfu: Migrate to Kconfig")
Signed-off-by: Boris Brezillon <boris.brezillon@bootlin.com>
---
 drivers/dfu/Kconfig | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/dfu/Kconfig b/drivers/dfu/Kconfig
index 51ab484c2a49..4692736c9d24 100644
--- a/drivers/dfu/Kconfig
+++ b/drivers/dfu/Kconfig
@@ -30,6 +30,7 @@ config DFU_MMC
 
 config DFU_NAND
 	bool "NAND back end for DFU"
+	depends on CMD_MTDPARTS
 	help
 	  This option enables using DFU to read and write to NAND based
 	  storage.
-- 
2.17.1

^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [U-Boot] [PATCH 2/2] mtd: Fix dependency of {MTDIDS, MTDPARTS}_DEFAULT
  2018-11-10 11:22 [U-Boot] [PATCH 1/2] dfu: nand: Add missing dependency on CMD_MTDPARTS Boris Brezillon
@ 2018-11-10 11:22 ` Boris Brezillon
  2018-11-12  4:43 ` [U-Boot] [PATCH 1/2] dfu: nand: Add missing dependency on CMD_MTDPARTS Jagan Teki
  1 sibling, 0 replies; 6+ messages in thread
From: Boris Brezillon @ 2018-11-10 11:22 UTC (permalink / raw)
  To: u-boot

The gwventana platform was relying on CMD_UBI to select CMD_MTDPARTS,
which was then making {MTDIDS,MTDPARTS}_DEFAULT available.
Now that UBI no longer selects CMD_MTDPARTS, we end up with a build
failure because those defaults are not defined.

Fix that by making adjusting the depends on of these options: we now
depends on MTD_PARTITIONS, so that option selecting MTD_PARTITIONS
(which is the case of CMD_UBI) also gets those default values.

We also get rid of the depends on CMD_MTD, since CMD_MTD also selects
MTD_PARTITIONS.

Reported-by: Jagan Teki <jagan@amarulasolutions.com>
Fixes: c7da70c1eb94 ("cmd: ubi: Remove useless call to mtdparts_init()")
Signed-off-by: Boris Brezillon <boris.brezillon@bootlin.com>
---
 cmd/Kconfig | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/cmd/Kconfig b/cmd/Kconfig
index b47e7fe80dbb..ad14c9ce7124 100644
--- a/cmd/Kconfig
+++ b/cmd/Kconfig
@@ -1728,14 +1728,14 @@ config CMD_MTDPARTS
 
 config MTDIDS_DEFAULT
 	string "Default MTD IDs"
-	depends on CMD_MTD || CMD_MTDPARTS || CMD_NAND || CMD_FLASH
+	depends on MTD_PARTITIONS || CMD_MTDPARTS || CMD_NAND || CMD_FLASH
 	help
 	  Defines a default MTD IDs list for use with MTD partitions in the
 	  Linux MTD command line partitions format.
 
 config MTDPARTS_DEFAULT
 	string "Default MTD partition scheme"
-	depends on CMD_MTD || CMD_MTDPARTS || CMD_NAND || CMD_FLASH
+	depends on MTD_PARTITIONS || CMD_MTDPARTS || CMD_NAND || CMD_FLASH
 	help
 	  Defines a default MTD partitioning scheme in the Linux MTD command
 	  line partitions format
-- 
2.17.1

^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [U-Boot] [PATCH 1/2] dfu: nand: Add missing dependency on CMD_MTDPARTS
  2018-11-10 11:22 [U-Boot] [PATCH 1/2] dfu: nand: Add missing dependency on CMD_MTDPARTS Boris Brezillon
  2018-11-10 11:22 ` [U-Boot] [PATCH 2/2] mtd: Fix dependency of {MTDIDS, MTDPARTS}_DEFAULT Boris Brezillon
@ 2018-11-12  4:43 ` Jagan Teki
  2018-11-12  6:45   ` Boris Brezillon
  1 sibling, 1 reply; 6+ messages in thread
From: Jagan Teki @ 2018-11-12  4:43 UTC (permalink / raw)
  To: u-boot

On Sat, Nov 10, 2018 at 4:52 PM Boris Brezillon
<boris.brezillon@bootlin.com> wrote:
>
> dfu_fill_entity_nand() uses find_dev_and_part() and mtdparts_init()
> which are provided by cmd/mtdparts.c.
>
> Add the dependency to avoid build failures when CMD_MTDPARTS is not
> selected.
>
> Reported-by: Jagan Teki <jagan@amarulasolutions.com>
> Fixes: 6828e602b722d ("dfu: Migrate to Kconfig")
> Signed-off-by: Boris Brezillon <boris.brezillon@bootlin.com>
> ---
>  drivers/dfu/Kconfig | 1 +
>  1 file changed, 1 insertion(+)

Squashed both patches into "cmd: ubi: Remove useless call to
mtdparts_init()" patch.

^ permalink raw reply	[flat|nested] 6+ messages in thread

* [U-Boot] [PATCH 1/2] dfu: nand: Add missing dependency on CMD_MTDPARTS
  2018-11-12  4:43 ` [U-Boot] [PATCH 1/2] dfu: nand: Add missing dependency on CMD_MTDPARTS Jagan Teki
@ 2018-11-12  6:45   ` Boris Brezillon
  2018-11-12  7:11     ` Jagan Teki
  0 siblings, 1 reply; 6+ messages in thread
From: Boris Brezillon @ 2018-11-12  6:45 UTC (permalink / raw)
  To: u-boot

Hi Jagan,

On Mon, 12 Nov 2018 10:13:40 +0530
Jagan Teki <jagan@amarulasolutions.com> wrote:

> On Sat, Nov 10, 2018 at 4:52 PM Boris Brezillon
> <boris.brezillon@bootlin.com> wrote:
> >
> > dfu_fill_entity_nand() uses find_dev_and_part() and mtdparts_init()
> > which are provided by cmd/mtdparts.c.
> >
> > Add the dependency to avoid build failures when CMD_MTDPARTS is not
> > selected.
> >
> > Reported-by: Jagan Teki <jagan@amarulasolutions.com>
> > Fixes: 6828e602b722d ("dfu: Migrate to Kconfig")
> > Signed-off-by: Boris Brezillon <boris.brezillon@bootlin.com>
> > ---
> >  drivers/dfu/Kconfig | 1 +
> >  1 file changed, 1 insertion(+)  
> 
> Squashed both patches into "cmd: ubi: Remove useless call to
> mtdparts_init()" patch.

Sorry to complain again, but I don't think this was the right thing to
do. Those 2 patches are unrelated to "cmd: ubi: Remove useless call to
->mtdparts_init()", it's just that this commit uncovers problems in the
dependency definition of the DFU_NAND and MTD{PARTS,IDS}_DEFAULT
options.

If you want to keep things bisectable, it would be preferable to
move those 2 commits before "cmd: ubi: Remove useless call to
->mtdparts_init()" (and rework the commit messages accordingly).

Regards,

Boris

^ permalink raw reply	[flat|nested] 6+ messages in thread

* [U-Boot] [PATCH 1/2] dfu: nand: Add missing dependency on CMD_MTDPARTS
  2018-11-12  6:45   ` Boris Brezillon
@ 2018-11-12  7:11     ` Jagan Teki
  2018-11-12  8:36       ` Boris Brezillon
  0 siblings, 1 reply; 6+ messages in thread
From: Jagan Teki @ 2018-11-12  7:11 UTC (permalink / raw)
  To: u-boot

On Mon, Nov 12, 2018 at 12:15 PM Boris Brezillon
<boris.brezillon@bootlin.com> wrote:
>
> Hi Jagan,
>
> On Mon, 12 Nov 2018 10:13:40 +0530
> Jagan Teki <jagan@amarulasolutions.com> wrote:
>
> > On Sat, Nov 10, 2018 at 4:52 PM Boris Brezillon
> > <boris.brezillon@bootlin.com> wrote:
> > >
> > > dfu_fill_entity_nand() uses find_dev_and_part() and mtdparts_init()
> > > which are provided by cmd/mtdparts.c.
> > >
> > > Add the dependency to avoid build failures when CMD_MTDPARTS is not
> > > selected.
> > >
> > > Reported-by: Jagan Teki <jagan@amarulasolutions.com>
> > > Fixes: 6828e602b722d ("dfu: Migrate to Kconfig")
> > > Signed-off-by: Boris Brezillon <boris.brezillon@bootlin.com>
> > > ---
> > >  drivers/dfu/Kconfig | 1 +
> > >  1 file changed, 1 insertion(+)
> >
> > Squashed both patches into "cmd: ubi: Remove useless call to
> > mtdparts_init()" patch.
>
> Sorry to complain again, but I don't think this was the right thing to
> do. Those 2 patches are unrelated to "cmd: ubi: Remove useless call to
> ->mtdparts_init()", it's just that this commit uncovers problems in the
> dependency definition of the DFU_NAND and MTD{PARTS,IDS}_DEFAULT
> options.
>
> If you want to keep things bisectable, it would be preferable to
> move those 2 commits before "cmd: ubi: Remove useless call to
> ->mtdparts_init()" (and rework the commit messages accordingly).

I was concentrated to move this on the release, anyway please send the
series again will push it during MW.

^ permalink raw reply	[flat|nested] 6+ messages in thread

* [U-Boot] [PATCH 1/2] dfu: nand: Add missing dependency on CMD_MTDPARTS
  2018-11-12  7:11     ` Jagan Teki
@ 2018-11-12  8:36       ` Boris Brezillon
  0 siblings, 0 replies; 6+ messages in thread
From: Boris Brezillon @ 2018-11-12  8:36 UTC (permalink / raw)
  To: u-boot

On Mon, 12 Nov 2018 12:41:15 +0530
Jagan Teki <jagan@amarulasolutions.com> wrote:

> On Mon, Nov 12, 2018 at 12:15 PM Boris Brezillon
> <boris.brezillon@bootlin.com> wrote:
> >
> > Hi Jagan,
> >
> > On Mon, 12 Nov 2018 10:13:40 +0530
> > Jagan Teki <jagan@amarulasolutions.com> wrote:
> >  
> > > On Sat, Nov 10, 2018 at 4:52 PM Boris Brezillon
> > > <boris.brezillon@bootlin.com> wrote:  
> > > >
> > > > dfu_fill_entity_nand() uses find_dev_and_part() and mtdparts_init()
> > > > which are provided by cmd/mtdparts.c.
> > > >
> > > > Add the dependency to avoid build failures when CMD_MTDPARTS is not
> > > > selected.
> > > >
> > > > Reported-by: Jagan Teki <jagan@amarulasolutions.com>
> > > > Fixes: 6828e602b722d ("dfu: Migrate to Kconfig")
> > > > Signed-off-by: Boris Brezillon <boris.brezillon@bootlin.com>
> > > > ---
> > > >  drivers/dfu/Kconfig | 1 +
> > > >  1 file changed, 1 insertion(+)  
> > >
> > > Squashed both patches into "cmd: ubi: Remove useless call to
> > > mtdparts_init()" patch.  
> >
> > Sorry to complain again, but I don't think this was the right thing to
> > do. Those 2 patches are unrelated to "cmd: ubi: Remove useless call to  
> > ->mtdparts_init()", it's just that this commit uncovers problems in the  
> > dependency definition of the DFU_NAND and MTD{PARTS,IDS}_DEFAULT
> > options.
> >
> > If you want to keep things bisectable, it would be preferable to
> > move those 2 commits before "cmd: ubi: Remove useless call to  
> > ->mtdparts_init()" (and rework the commit messages accordingly).  
> 
> I was concentrated to move this on the release, anyway please send the
> series again will push it during MW.

Is it too late to queue it for the current release (I see v2018.11 has
not been tagged yet)?

^ permalink raw reply	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2018-11-12  8:36 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-11-10 11:22 [U-Boot] [PATCH 1/2] dfu: nand: Add missing dependency on CMD_MTDPARTS Boris Brezillon
2018-11-10 11:22 ` [U-Boot] [PATCH 2/2] mtd: Fix dependency of {MTDIDS, MTDPARTS}_DEFAULT Boris Brezillon
2018-11-12  4:43 ` [U-Boot] [PATCH 1/2] dfu: nand: Add missing dependency on CMD_MTDPARTS Jagan Teki
2018-11-12  6:45   ` Boris Brezillon
2018-11-12  7:11     ` Jagan Teki
2018-11-12  8:36       ` Boris Brezillon

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox