[U-Boot] [PATCH 1/5] ubi: Kconfig: Fix MTD_UBI selection dependency

From: Karl Beldan karl.beldan-ext@sagemcom.com
Remove the ARCH_SUNXI dependency on selection of RBTREE.
Cc: Boris Brezillon boris.brezillon@free-electrons.com Cc: Maxime Ripard maxime.ripard@free-electrons.com Cc: Jagan Teki jagan@openedev.com Signed-off-by: Karl Beldan karl.beldan-ext@sagemcom.com --- drivers/mtd/ubi/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/mtd/ubi/Kconfig b/drivers/mtd/ubi/Kconfig index cb9ba78681..165273e438 100644 --- a/drivers/mtd/ubi/Kconfig +++ b/drivers/mtd/ubi/Kconfig @@ -3,7 +3,7 @@ menu "UBI support" config MTD_UBI bool "Enable UBI - Unsorted block images" select CRC32 - select RBTREE if ARCH_SUNXI + select RBTREE help UBI is a software layer above MTD layer which admits of LVM-like logical volumes on top of MTD devices, hides some complexities of

From: Karl Beldan karl.beldan-ext@sagemcom.com
Remove the ARCH_SUNXI dependency.
Cc: Maxime Ripard maxime.ripard@free-electrons.com Cc: Jagan Teki jagan@openedev.com Signed-off-by: Karl Beldan karl.beldan-ext@sagemcom.com --- cmd/Kconfig | 1 - 1 file changed, 1 deletion(-)
diff --git a/cmd/Kconfig b/cmd/Kconfig index c80ac364ea..87ee2ea613 100644 --- a/cmd/Kconfig +++ b/cmd/Kconfig @@ -1196,7 +1196,6 @@ config CMD_JFFS2 filesystem information.
config CMD_MTDPARTS - depends on ARCH_SUNXI bool "MTD partition support" help MTD partition support

On Wed, Jul 12, 2017 at 04:11:44PM +0000, Karl Beldan wrote:
From: Karl Beldan karl.beldan-ext@sagemcom.com
Remove the ARCH_SUNXI dependency.
Cc: Maxime Ripard maxime.ripard@free-electrons.com Cc: Jagan Teki jagan@openedev.com Signed-off-by: Karl Beldan karl.beldan-ext@sagemcom.com
Reviewed-by: Tom Rini trini@konsulko.com

On Wed, Jul 12, 2017 at 04:11:44PM +0000, karl beldan wrote:
From: Karl Beldan karl.beldan-ext@sagemcom.com
Remove the ARCH_SUNXI dependency.
Cc: Maxime Ripard maxime.ripard@free-electrons.com Cc: Jagan Teki jagan@openedev.com Signed-off-by: Karl Beldan karl.beldan-ext@sagemcom.com Reviewed-by: Tom Rini trini@konsulko.com
Applied to u-boot/master, thanks!

From: Karl Beldan karl.beldan-ext@sagemcom.com
This missing dependency has probably remained under the radar because MTD_PARTITIONS is still whitelisted.
Signed-off-by: Karl Beldan karl.beldan-ext@sagemcom.com --- drivers/mtd/ubi/Kconfig | 1 + 1 file changed, 1 insertion(+)
diff --git a/drivers/mtd/ubi/Kconfig b/drivers/mtd/ubi/Kconfig index 165273e438..caa5197df5 100644 --- a/drivers/mtd/ubi/Kconfig +++ b/drivers/mtd/ubi/Kconfig @@ -4,6 +4,7 @@ config MTD_UBI bool "Enable UBI - Unsorted block images" select CRC32 select RBTREE + select MTD_PARTITIONS help UBI is a software layer above MTD layer which admits of LVM-like logical volumes on top of MTD devices, hides some complexities of

On Wed, Jul 12, 2017 at 04:11:45PM +0000, Karl Beldan wrote:
From: Karl Beldan karl.beldan-ext@sagemcom.com
This missing dependency has probably remained under the radar because MTD_PARTITIONS is still whitelisted.
Signed-off-by: Karl Beldan karl.beldan-ext@sagemcom.com
Reviewed-by: Tom Rini trini@konsulko.com

On Wed, Jul 12, 2017 at 04:11:45PM +0000, karl beldan wrote:
From: Karl Beldan karl.beldan-ext@sagemcom.com
This missing dependency has probably remained under the radar because MTD_PARTITIONS is still whitelisted.
Signed-off-by: Karl Beldan karl.beldan-ext@sagemcom.com Reviewed-by: Tom Rini trini@konsulko.com
Applied to u-boot/master, thanks!

From: Karl Beldan karl.beldan-ext@sagemcom.com
Many configs still define CMD_MTDPARTS in their non-Kconfig but CMD_MTDPARTS has now moved to Kconfig.
Signed-off-by: Karl Beldan karl.beldan-ext@sagemcom.com --- cmd/Kconfig | 1 + 1 file changed, 1 insertion(+)
diff --git a/cmd/Kconfig b/cmd/Kconfig index 87ee2ea613..92576f5734 100644 --- a/cmd/Kconfig +++ b/cmd/Kconfig @@ -1255,6 +1255,7 @@ config CMD_UBI tristate "Enable UBI - Unsorted block images commands" select CRC32 select MTD_UBI + select CMD_MTDPARTS default y if NAND_SUNXI help UBI is a software layer above MTD layer which admits use of LVM-like

On Wed, Jul 12, 2017 at 04:11:46PM +0000, Karl Beldan wrote:
From: Karl Beldan karl.beldan-ext@sagemcom.com
Many configs still define CMD_MTDPARTS in their non-Kconfig but CMD_MTDPARTS has now moved to Kconfig.
Signed-off-by: Karl Beldan karl.beldan-ext@sagemcom.com
Reviewed-by: Tom Rini trini@konsulko.com

On Wed, Jul 12, 2017 at 04:11:46PM +0000, karl beldan wrote:
From: Karl Beldan karl.beldan-ext@sagemcom.com
Many configs still define CMD_MTDPARTS in their non-Kconfig but CMD_MTDPARTS has now moved to Kconfig.
Signed-off-by: Karl Beldan karl.beldan-ext@sagemcom.com Reviewed-by: Tom Rini trini@konsulko.com
Applied to u-boot/master, thanks!

From: Karl Beldan karl.beldan-ext@sagemcom.com
Remove the ARCH_SUNXI and RBTREE dependencies. CMD_UBIFS already gets RBTREE from CMD_UBI (from MTD_UBI), and should the first become independant from the latter, there would likely be a dependency on MTD_UBI anyway.
Cc: Boris Brezillon boris.brezillon@free-electrons.com Cc: Jagan Teki jagan@openedev.com Signed-off-by: Karl Beldan karl.beldan-ext@sagemcom.com --- cmd/Kconfig | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/cmd/Kconfig b/cmd/Kconfig index 92576f5734..8766243f0c 100644 --- a/cmd/Kconfig +++ b/cmd/Kconfig @@ -1269,8 +1269,7 @@ 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 + select LZO default y if NAND_SUNXI help UBIFS is a file system for flash devices which works on top of UBI.

On Wed, Jul 12, 2017 at 04:11:47PM +0000, Karl Beldan wrote:
From: Karl Beldan karl.beldan-ext@sagemcom.com
Remove the ARCH_SUNXI and RBTREE dependencies. CMD_UBIFS already gets RBTREE from CMD_UBI (from MTD_UBI), and should the first become independant from the latter, there would likely be a dependency on MTD_UBI anyway.
Cc: Boris Brezillon boris.brezillon@free-electrons.com Cc: Jagan Teki jagan@openedev.com Signed-off-by: Karl Beldan karl.beldan-ext@sagemcom.com
Reviewed-by: Tom Rini trini@konsulko.com
That said, we should move on to also having a populated fs/ubifs/Kconfig that controls fs/ubifs/ and CMD_UBIFS should depend on that (and we also need the same for ubi, and in turn, correct dependencies between ubi and ubifs. Your patch moves things in the right direction, thanks!

On Wed, Jul 12, 2017 at 04:11:47PM +0000, karl beldan wrote:
From: Karl Beldan karl.beldan-ext@sagemcom.com
Remove the ARCH_SUNXI and RBTREE dependencies. CMD_UBIFS already gets RBTREE from CMD_UBI (from MTD_UBI), and should the first become independant from the latter, there would likely be a dependency on MTD_UBI anyway.
Cc: Boris Brezillon boris.brezillon@free-electrons.com Cc: Jagan Teki jagan@openedev.com Signed-off-by: Karl Beldan karl.beldan-ext@sagemcom.com Reviewed-by: Tom Rini trini@konsulko.com
Applied to u-boot/master, thanks!

On Wed, Jul 12, 2017 at 04:11:43PM +0000, Karl Beldan wrote:
From: Karl Beldan karl.beldan-ext@sagemcom.com
Remove the ARCH_SUNXI dependency on selection of RBTREE.
Cc: Boris Brezillon boris.brezillon@free-electrons.com Cc: Maxime Ripard maxime.ripard@free-electrons.com Cc: Jagan Teki jagan@openedev.com Signed-off-by: Karl Beldan karl.beldan-ext@sagemcom.com
Reviewed-by: Tom Rini trini@konsulko.com

On Wed, Jul 12, 2017 at 04:11:43PM +0000, karl beldan wrote:
From: Karl Beldan karl.beldan-ext@sagemcom.com
Remove the ARCH_SUNXI dependency on selection of RBTREE.
Cc: Boris Brezillon boris.brezillon@free-electrons.com Cc: Maxime Ripard maxime.ripard@free-electrons.com Cc: Jagan Teki jagan@openedev.com Signed-off-by: Karl Beldan karl.beldan-ext@sagemcom.com Reviewed-by: Tom Rini trini@konsulko.com
Applied to u-boot/master, thanks!
participants (2)
-
Karl Beldan
-
Tom Rini