From c6cca10b9c29224b62c93e24389751c487b98a7d Mon Sep 17 00:00:00 2001
From: Masahiro Yamada <yamada.masahiro@socionext.com>
Date: Mon, 9 Jul 2018 15:12:37 +0900
Subject: [PATCH] cmd: ubi: change 'default y' for SUNXI to 'imply' in Kconfig

It is not preferred to put SUNXI-specific code in the common place.

Change it to 'imply' property of ARCH_SUNXI.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
---
 arch/arm/Kconfig | 1 +
 cmd/Kconfig      | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 9f5eaf8591..8a23c76db8 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -831,6 +831,7 @@ config ARCH_SUNXI
 	select USE_TINY_PRINTF
 	imply CMD_DM
 	imply CMD_GPT
+	imply CMD_UBI if NAND
 	imply DISTRO_DEFAULTS
 	imply FAT_WRITE
 	imply OF_LIBFDT_OVERLAY
diff --git a/cmd/Kconfig b/cmd/Kconfig
index 04bdbf0f3b..13d4c991bf 100644
--- a/cmd/Kconfig
+++ b/cmd/Kconfig
@@ -1824,7 +1824,6 @@ endmenu
 
 config CMD_UBI
 	tristate "Enable UBI - Unsorted block images commands"
-	default y if NAND_SUNXI
 	select CMD_MTDPARTS
 	select CRC32
 	select MTD_UBI
-- 
2.39.5