Skip to contentSkip to conversation

dfu: nand: Add missing dependency on CMD_MTDPARTS

PATCH New Boris Brezillon 2 participants 6 messages Nov 10, 2018 – Nov 12, 2018

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 dfu: nand: Add missing dependency on CMD_MTDPARTS

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.

Fixes 6828e602b722d ("dfu: Migrate to Kconfig")
---
 drivers/dfu/Kconfig | 1 +
 1 file changed, 1 insertion(+)
drivers/dfu/Kconfig +1 -0
index 51ab484c2a49..4692736c9d24 100644
@@ -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.
Signature · 1 line
2.17.1
#1 lore raw

PATCH 2/2 mtd: Fix dependency of {MTDIDS, MTDPARTS}_DEFAULT

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.

Fixes c7da70c1eb94 ("cmd: ubi: Remove useless call to mtdparts_init()")
---
 cmd/Kconfig | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
cmd/Kconfig +2 -2
index b47e7fe80dbb..ad14c9ce7124 100644
@@ -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
Signature · 1 line
2.17.1
#2 lore raw

PATCH 1/2 dfu: nand: Add missing dependency on CMD_MTDPARTS

In reply to Boris Brezillon
Quoted 7 lines · Boris Brezillon

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.

Quoted 6 lines
Fixes 6828e602b722d ("dfu: Migrate to Kconfig")
---
 drivers/dfu/Kconfig | 1 +
 1 file changed, 1 insertion(+)

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

#3 lore raw

PATCH 1/2 dfu: nand: Add missing dependency on CMD_MTDPARTS

Hi Jagan,

Quoted 16 lines · On Mon, 12 Nov 2018 10:13:40 +0530 Jagan Teki <[email protected]>…
Quoted 7 lines · Boris Brezillon

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.

Quoted 6 lines
Fixes 6828e602b722d ("dfu: Migrate to Kconfig")
---
 drivers/dfu/Kconfig | 1 +
 1 file changed, 1 insertion(+)  
Quoted 2 lines

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

#4 lore raw

PATCH 1/2 dfu: nand: Add missing dependency on CMD_MTDPARTS

Quoted 31 lines · Boris Brezillon

Hi Jagan,

Quoted 16 lines · On Mon, 12 Nov 2018 10:13:40 +0530 Jagan Teki <[email protected]>…
Quoted 7 lines · Boris Brezillon

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.

Quoted 6 lines
Fixes 6828e602b722d ("dfu: Migrate to Kconfig")
---
 drivers/dfu/Kconfig | 1 +
 1 file changed, 1 insertion(+)
Quoted 2 lines

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.

Quoted 3 lines

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.

#5 lore raw

PATCH 1/2 dfu: nand: Add missing dependency on CMD_MTDPARTS

Quoted 33 lines · On Mon, 12 Nov 2018 12:41:15 +0530 Jagan Teki <[email protected]>…
Quoted 31 lines · Boris Brezillon

Hi Jagan,

Quoted 16 lines · On Mon, 12 Nov 2018 10:13:40 +0530 Jagan Teki <[email protected]>…
Quoted 7 lines · Boris Brezillon

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.

Quoted 6 lines
Fixes 6828e602b722d ("dfu: Migrate to Kconfig")
---
 drivers/dfu/Kconfig | 1 +
 1 file changed, 1 insertion(+)  
Quoted 2 lines

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.

Quoted 6 lines
Quoted 3 lines

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)?