diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 9f5eaf8..8a23c76 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 04bdbf0..13d4c99 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