Skip to contentSkip to conversation

cmd: ubifs: Add a dependency on CMD_UBI

PATCH New Maxime Ripard 5 participants 7 messages Mar 3, 2017 – Mar 20, 2017

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 cmd: ubifs: Add a dependency on CMD_UBI

CMD_UBIFS can't compile without CMD_UBI enabled. Make sure we can't end up in that case.

---
 cmd/Kconfig | 1 +
 1 file changed, 1 insertion(+)
cmd/Kconfig +1 -0
index 8e2a05de82ea..585a00c31f4e 100644
@@ -858,6 +858,7 @@ config CMD_UBI
 
 config CMD_UBIFS
 	tristate "Enable UBIFS - Unsorted block images filesystem commands"
+	depends on CMD_UBI
 	select CRC32
 	select RBTREE if ARCH_SUNXI
 	select LZO if ARCH_SUNXI
Signature · 1 line
2.11.0
#1 lore raw

PATCH 2/2 cmd: nand: Make the NAND options default to NAND_SUNXI

If we depend on the ARCH_SUNXI configuration option, the boards that do not have NAND support enabled (with the associated options) will not compile anymore.

Depend on the NAND driver configuration option to make sure that is not the case.

---
 cmd/Kconfig | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
cmd/Kconfig +3 -3
index 585a00c31f4e..91e3d6a46769 100644
@@ -438,7 +438,7 @@ config CMD_MMC
 
 config CMD_NAND
 	bool "nand"
-	default y if ARCH_SUNXI
+	default y if NAND_SUNXI
 	help
 	  NAND support.
 
@@ -847,7 +847,7 @@ config CMD_UBI
 	tristate "Enable UBI - Unsorted block images commands"
 	select CRC32
 	select MTD_UBI
-	default y if ARCH_SUNXI
+	default y if NAND_SUNXI
 	help
 	  UBI is a software layer above MTD layer which admits use of LVM-like
 	  logical volumes on top of MTD devices, hides some complexities of
@@ -862,7 +862,7 @@ config CMD_UBIFS
 	select CRC32
 	select RBTREE if ARCH_SUNXI
 	select LZO if ARCH_SUNXI
-	default y if ARCH_SUNXI
+	default y if NAND_SUNXI
 	help
 	  UBIFS is a file system for flash devices which works on top of UBI.
 
Signature · 1 line
2.11.0
#2 lore raw

PATCH 2/2 cmd: nand: Make the NAND options default to NAND_SUNXI

Quoted 9 lines · Maxime Ripard

If we depend on the ARCH_SUNXI configuration option, the boards that do not have NAND support enabled (with the associated options) will not compile anymore.

Depend on the NAND driver configuration option to make sure that is not the case.

Quoted 9 lines
---
 cmd/Kconfig | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
cmd/Kconfig +0 -0
index 585a00c31f4e..91e3d6a46769 100644

cmd/Kconfig config CMD_MMC · line 441

Quoted 5 lines
cmd/Kconfig +1 -1
@@ -438,7 +438,7 @@ config CMD_MMC
 
 config CMD_NAND
        bool "nand"
-       default y if ARCH_SUNXI
+       default y if NAND_SUNXI

It would be nicer if it were a stronger constraint though. The user can still enable CMD_NAND (such as by using a config from before this patch was applied) and still break the build. I understand that this is hard to achieve since each platform does things a bit differently.

ChenYu

Quoted 24 lines
cmd/Kconfig +2 -3
        help
          NAND support.
 
@@ -847,7 +847,7 @@ config CMD_UBI
        tristate "Enable UBI - Unsorted block images commands"
        select CRC32
        select MTD_UBI
-       default y if ARCH_SUNXI
+       default y if NAND_SUNXI
        help
          UBI is a software layer above MTD layer which admits use of LVM-like
          logical volumes on top of MTD devices, hides some complexities of
@@ -862,7 +862,7 @@ config CMD_UBIFS
        select CRC32
        select RBTREE if ARCH_SUNXI
        select LZO if ARCH_SUNXI
-       default y if ARCH_SUNXI
+       default y if NAND_SUNXI
        help
          UBIFS is a file system for flash devices which works on top of UBI.
 
--

2.11.0

#3 lore raw

PATCH 2/2 cmd: nand: Make the NAND options default to NAND_SUNXI

In reply to Maxime Ripard
Quoted 10 lines · Maxime Ripard

If we depend on the ARCH_SUNXI configuration option, the boards that do not have NAND support enabled (with the associated options) will not compile anymore.

Depend on the NAND driver configuration option to make sure that is not the case.

As I came up with an identical patch today to fix sunxi/master:

So this situation is a bit unfortunate: The sunxi/master branch was updated apparently before even compile-testing it for more than one sunxi board (it is broken for every sunxi board except Chip Pro at the
moment: buildman says 105/106). And even after reports and the corresponding fixes appeared (thanks Chen-Yu and Maxime!) the branch is _still_ broken as of today (10 days after the fix was posted).

So can we please have both
a) a better quality assurance before merging patches into this custodian branch and
b) quicker merging of fixes?
To my understanding u-boot-sunxi should be always a good and working candidate for anyone interested in Allwinner boards.

For a) it would already help to just simply build test sunxi:

$ tools/buildman/buildman sunxi
but probably extend this to cover at least all ARM boards.

Cheers,
Andre

Quoted 36 lines
---
 cmd/Kconfig | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
cmd/Kconfig +3 -3
index 585a00c31f4e..91e3d6a46769 100644
@@ -438,7 +438,7 @@ config CMD_MMC
 
 config CMD_NAND
 	bool "nand"
-	default y if ARCH_SUNXI
+	default y if NAND_SUNXI
 	help
 	  NAND support.
 
@@ -847,7 +847,7 @@ config CMD_UBI
 	tristate "Enable UBI - Unsorted block images commands"
 	select CRC32
 	select MTD_UBI
-	default y if ARCH_SUNXI
+	default y if NAND_SUNXI
 	help
 	  UBI is a software layer above MTD layer which admits use of LVM-like
 	  logical volumes on top of MTD devices, hides some complexities of
@@ -862,7 +862,7 @@ config CMD_UBIFS
 	select CRC32
 	select RBTREE if ARCH_SUNXI
 	select LZO if ARCH_SUNXI
-	default y if ARCH_SUNXI
+	default y if NAND_SUNXI
 	help
 	  UBIFS is a file system for flash devices which works on top of UBI.
 
#4 lore raw

PATCH 2/2 cmd: nand: Make the NAND options default to NAND_SUNXI

Hi,

Quoted 31 lines · André Przywara
Quoted 10 lines · Maxime Ripard

If we depend on the ARCH_SUNXI configuration option, the boards that do not have NAND support enabled (with the associated options) will not compile anymore.

Depend on the NAND driver configuration option to make sure that is not the case.

As I came up with an identical patch today to fix sunxi/master:

So this situation is a bit unfortunate: The sunxi/master branch was updated apparently before even compile-testing it for more than one sunxi board (it is broken for every sunxi board except Chip Pro at the
moment: buildman says 105/106). And even after reports and the corresponding fixes appeared (thanks Chen-Yu and Maxime!) the branch is _still_ broken as of today (10 days after the fix was posted).

So can we please have both
a) a better quality assurance before merging patches into this custodian branch and
b) quicker merging of fixes?
To my understanding u-boot-sunxi should be always a good and working candidate for anyone interested in Allwinner boards.

Quoted 3 lines

For a) it would already help to just simply build test sunxi:

$ tools/buildman/buildman sunxi
but probably extend this to cover at least all ARM boards.

Jagan usually takes the patches, but he seems to be off, and I was in holidays last week.

I just pushed it, sorry for the breakage.

Maxime

Signature · 10 lines
Maxime Ripard, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 801 bytes
Desc: not available
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20170320/260407cc/attachment.sig>
#5 lore raw

PATCH 2/2 cmd: nand: Make the NAND options default to NAND_SUNXI

Quoted 34 lines · Maxime Ripard

Hi,

Quoted 31 lines · André Przywara
Quoted 10 lines · Maxime Ripard

If we depend on the ARCH_SUNXI configuration option, the boards that do not have NAND support enabled (with the associated options) will not compile anymore.

Depend on the NAND driver configuration option to make sure that is not the case.

As I came up with an identical patch today to fix sunxi/master:

So this situation is a bit unfortunate: The sunxi/master branch was updated apparently before even compile-testing it for more than one sunxi board (it is broken for every sunxi board except Chip Pro at the
moment: buildman says 105/106). And even after reports and the corresponding fixes appeared (thanks Chen-Yu and Maxime!) the branch is _still_ broken as of today (10 days after the fix was posted).

So can we please have both
a) a better quality assurance before merging patches into this custodian branch and
b) quicker merging of fixes?
To my understanding u-boot-sunxi should be always a good and working candidate for anyone interested in Allwinner boards.

Quoted 6 lines
Quoted 3 lines

For a) it would already help to just simply build test sunxi:

$ tools/buildman/buildman sunxi
but probably extend this to cover at least all ARM boards.

Jagan usually takes the patches, but he seems to be off, and I was in holidays last week.

Sorry, I was off with holidays, will active and look for all.

thanks!

Signature · 4 lines
Jagan Teki
Free Software Engineer | www.openedev.com
U-Boot, Linux | Upstream Maintainer
Hyderabad, India.
#6 lore raw

PATCH 1/2 cmd: ubifs: Add a dependency on CMD_UBI

In reply to Maxime Ripard

Hello Maxime,

Am 03.03.2017 um 15:32 schrieb Maxime Ripard:

Quoted 7 lines

CMD_UBIFS can't compile without CMD_UBI enabled. Make sure we can't end up in that case.

---
  cmd/Kconfig | 1 +
  1 file changed, 1 insertion(+)

Good catch! Thanks!

bye,
Heiko

Quoted 14 lines
cmd/Kconfig +1 -0
index 8e2a05de82ea..585a00c31f4e 100644
@@ -858,6 +858,7 @@ config CMD_UBI
 
  config CMD_UBIFS
  	tristate "Enable UBIFS - Unsorted block images filesystem commands"
+	depends on CMD_UBI
  	select CRC32
  	select RBTREE if ARCH_SUNXI
  	select LZO if ARCH_SUNXI
Signature · 2 lines
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany