diff --git a/cmd/Kconfig b/cmd/Kconfig
index c9b17f0e621faef3ace4d25151aa6b393831b612..661ae7a98c2eb19ebebe1b258cfb9bb4d19e6bcb 100644
--- a/cmd/Kconfig
+++ b/cmd/Kconfig
@@ -452,7 +452,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.