diff --git a/cmd/Kconfig b/cmd/Kconfig
index 4d89af4a819ef3430c888745bdcc83d3adf08ad3..0d967a7973ec1eb9fc503fd67161c6727ee8c9b5 100644
--- a/cmd/Kconfig
+++ b/cmd/Kconfig
@@ -718,6 +718,14 @@ config CMD_MMC_SPI
 	  to 20MHz. It is useful since it reduces the amount of protocol code
 	  required.
 
+config CMD_ONENAND
+	bool "onenand - access to onenand device"
+	help
+	  OneNAND is a brand of NAND ('Not AND' gate) flash which provides
+	  various useful features. This command allows reading, writing,
+	  and erasing blocks. It allso provides a way to show and change
+	  bad blocks, and test the device.
+
 config CMD_PART
 	bool "part"
 	select PARTITION_UUIDS
diff --git a/configs/igep0020_defconfig b/configs/igep0020_defconfig
index 8ca5a84ec517a8ff4de72b125d4dae9a6cc7a89d..2375f861f12efdeeae5a08a3d2c1fe32cf1650e4 100644
--- a/configs/igep0020_defconfig
+++ b/configs/igep0020_defconfig
@@ -20,6 +20,7 @@ CONFIG_CMD_ASKENV=y
 # CONFIG_CMD_FLASH is not set
 CONFIG_CMD_MMC=y
 CONFIG_CMD_NAND=y
+CONFIG_CMD_ONENAND=y
 CONFIG_CMD_SPI=y
 CONFIG_CMD_I2C=y
 CONFIG_CMD_GPIO=y
diff --git a/configs/igep0030_defconfig b/configs/igep0030_defconfig
index 8af6dd53d04e0e6cd8f4c84c776d384bb7485de7..03da20162bae5ffb4f8df4b3fcf236c4fcfd9c2a 100644
--- a/configs/igep0030_defconfig
+++ b/configs/igep0030_defconfig
@@ -20,6 +20,7 @@ CONFIG_CMD_ASKENV=y
 # CONFIG_CMD_FLASH is not set
 CONFIG_CMD_MMC=y
 CONFIG_CMD_NAND=y
+CONFIG_CMD_ONENAND=y
 CONFIG_CMD_SPI=y
 CONFIG_CMD_I2C=y
 CONFIG_CMD_GPIO=y
diff --git a/configs/igep0032_defconfig b/configs/igep0032_defconfig
index dd433309f97a42699d02efb875c77be5156228bb..fb8c9251132fc1a48017c4338032039d624b952b 100644
--- a/configs/igep0032_defconfig
+++ b/configs/igep0032_defconfig
@@ -19,6 +19,7 @@ CONFIG_CMD_ASKENV=y
 # CONFIG_CMD_FLASH is not set
 CONFIG_CMD_MMC=y
 CONFIG_CMD_NAND=y
+CONFIG_CMD_ONENAND=y
 CONFIG_CMD_SPI=y
 CONFIG_CMD_I2C=y
 CONFIG_CMD_GPIO=y
diff --git a/configs/s5p_goni_defconfig b/configs/s5p_goni_defconfig
index 9c66a1826da4a752ee9bae782c0230babde73930..0045f5e63e02a51deafffc734a3aa08d5e28e653 100644
--- a/configs/s5p_goni_defconfig
+++ b/configs/s5p_goni_defconfig
@@ -12,6 +12,7 @@ CONFIG_SYS_PROMPT="Goni # "
 # CONFIG_CMD_FLASH is not set
 CONFIG_CMD_GPT=y
 CONFIG_CMD_MMC=y
+CONFIG_CMD_ONENAND=y
 CONFIG_CMD_DFU=y
 CONFIG_CMD_USB_MASS_STORAGE=y
 # CONFIG_CMD_FPGA is not set
diff --git a/configs/smdkc100_defconfig b/configs/smdkc100_defconfig
index ef8510d47d73eadcbf4ea993485fdd5e130a5ffb..82ba51c00da5040dfb14155f693c78a6a0690d8a 100644
--- a/configs/smdkc100_defconfig
+++ b/configs/smdkc100_defconfig
@@ -9,6 +9,7 @@ CONFIG_HUSH_PARSER=y
 CONFIG_SYS_PROMPT="SMDKC100 # "
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
+CONFIG_CMD_ONENAND=y
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_CMD_CACHE=y
 CONFIG_CMD_FAT=y
diff --git a/configs/vct_platinum_onenand_defconfig b/configs/vct_platinum_onenand_defconfig
index 4c1615c537d17f6b9381ddf1182026b9b7ff04c9..4c242e878644d9a8ab264bcfd15fcd52b0b2f50a 100644
--- a/configs/vct_platinum_onenand_defconfig
+++ b/configs/vct_platinum_onenand_defconfig
@@ -9,6 +9,7 @@ CONFIG_SYS_PROMPT="$ "
 # CONFIG_CMD_IMLS is not set
 CONFIG_CMD_EEPROM=y
 # CONFIG_CMD_FLASH is not set
+CONFIG_CMD_ONENAND=y
 CONFIG_CMD_I2C=y
 CONFIG_CMD_USB=y
 # CONFIG_CMD_SETEXPR is not set
diff --git a/configs/vct_platinum_onenand_small_defconfig b/configs/vct_platinum_onenand_small_defconfig
index 20c0863b7b51fd9ac86984b4f69fa7e293c70870..845833c07347f3154e0b62dd28c90f3db4979729 100644
--- a/configs/vct_platinum_onenand_small_defconfig
+++ b/configs/vct_platinum_onenand_small_defconfig
@@ -15,6 +15,7 @@ CONFIG_SYS_PROMPT="$ "
 # CONFIG_CMD_LOADB is not set
 # CONFIG_CMD_LOADS is not set
 # CONFIG_CMD_FLASH is not set
+CONFIG_CMD_ONENAND=y
 # CONFIG_CMD_ITEST is not set
 # CONFIG_CMD_SOURCE is not set
 # CONFIG_CMD_SETEXPR is not set
diff --git a/configs/vct_platinumavc_onenand_defconfig b/configs/vct_platinumavc_onenand_defconfig
index dfb8f04ce786b9a5416f4c99eb94984dd1cdd3c5..2a726144e9d524236e9a17b70661ea241eb1fade 100644
--- a/configs/vct_platinumavc_onenand_defconfig
+++ b/configs/vct_platinumavc_onenand_defconfig
@@ -9,6 +9,7 @@ CONFIG_SYS_PROMPT="$ "
 # CONFIG_CMD_IMLS is not set
 CONFIG_CMD_EEPROM=y
 # CONFIG_CMD_FLASH is not set
+CONFIG_CMD_ONENAND=y
 CONFIG_CMD_I2C=y
 # CONFIG_CMD_SETEXPR is not set
 # CONFIG_CMD_NET is not set
diff --git a/configs/vct_platinumavc_onenand_small_defconfig b/configs/vct_platinumavc_onenand_small_defconfig
index de7b500f806097017660255d7218a82aa78a554e..e2f68eb1ead8d29ab02b49ff409ee4aad2c2d8bd 100644
--- a/configs/vct_platinumavc_onenand_small_defconfig
+++ b/configs/vct_platinumavc_onenand_small_defconfig
@@ -15,6 +15,7 @@ CONFIG_SYS_PROMPT="$ "
 # CONFIG_CMD_LOADB is not set
 # CONFIG_CMD_LOADS is not set
 # CONFIG_CMD_FLASH is not set
+CONFIG_CMD_ONENAND=y
 # CONFIG_CMD_ITEST is not set
 # CONFIG_CMD_SOURCE is not set
 # CONFIG_CMD_SETEXPR is not set
diff --git a/configs/vct_premium_onenand_defconfig b/configs/vct_premium_onenand_defconfig
index ba43e0e00a2c62083aee265fcea1b1461363e617..39be742c5c0e7fe50aa8e1cc3f4e4e89d04d7ff0 100644
--- a/configs/vct_premium_onenand_defconfig
+++ b/configs/vct_premium_onenand_defconfig
@@ -9,6 +9,7 @@ CONFIG_SYS_PROMPT="$ "
 # CONFIG_CMD_IMLS is not set
 CONFIG_CMD_EEPROM=y
 # CONFIG_CMD_FLASH is not set
+CONFIG_CMD_ONENAND=y
 CONFIG_CMD_I2C=y
 CONFIG_CMD_USB=y
 # CONFIG_CMD_SETEXPR is not set
diff --git a/configs/vct_premium_onenand_small_defconfig b/configs/vct_premium_onenand_small_defconfig
index cc9998f391a6e7b9e0550ad99b8dc81355058aad..6e3a420a1408d4a31b0f57508db3d4e6fb3ebfa8 100644
--- a/configs/vct_premium_onenand_small_defconfig
+++ b/configs/vct_premium_onenand_small_defconfig
@@ -15,6 +15,7 @@ CONFIG_SYS_PROMPT="$ "
 # CONFIG_CMD_LOADB is not set
 # CONFIG_CMD_LOADS is not set
 # CONFIG_CMD_FLASH is not set
+CONFIG_CMD_ONENAND=y
 # CONFIG_CMD_ITEST is not set
 # CONFIG_CMD_SOURCE is not set
 # CONFIG_CMD_SETEXPR is not set
diff --git a/include/config_cmd_all.h b/include/config_cmd_all.h
index b3c0d0e71f4fa2d22a689b500f68ef6501e9af7e..c61951bb221677a805137d5899db3dbe4f71cea6 100644
--- a/include/config_cmd_all.h
+++ b/include/config_cmd_all.h
@@ -13,7 +13,6 @@
  * Alphabetical list of all possible commands.
  */
 
-#define CONFIG_CMD_ONENAND	/* OneNAND support		*/
 #define CONFIG_CMD_PCI		/* pciinfo			*/
 #define CONFIG_CMD_PCMCIA	/* PCMCIA support		*/
 #define CONFIG_CMD_PORTIO	/* Port I/O			*/
diff --git a/include/configs/exynos4-common.h b/include/configs/exynos4-common.h
index c995f35b73adbb772e27f3e1aeffc360b81620a6..9f0131a7ee91da0fc90c1633426b4eb8dd9eff64 100644
--- a/include/configs/exynos4-common.h
+++ b/include/configs/exynos4-common.h
@@ -20,8 +20,6 @@
 /* SD/MMC configuration */
 #define CONFIG_MMC_DEFAULT_DEV	0
 
-#undef CONFIG_CMD_ONENAND
-
 /* TIZEN THOR downloader support */
 #define CONFIG_CMD_THOR_DOWNLOAD
 #define CONFIG_USB_FUNCTION_THOR
diff --git a/include/configs/nokia_rx51.h b/include/configs/nokia_rx51.h
index a06aec1f5f0f424ca1369dc9cc5757c1f07276d0..6d589273aa94e07b80d2f2096fc2efdb728e0cd6 100644
--- a/include/configs/nokia_rx51.h
+++ b/include/configs/nokia_rx51.h
@@ -102,12 +102,6 @@
 #define CONFIG_CMDLINE_EDITING		/* add command line history */
 #define CONFIG_AUTO_COMPLETE		/* add autocompletion support */
 
-#ifdef ONENAND_SUPPORT
-
-#define CONFIG_CMD_ONENAND		/* ONENAND support */
-
-#endif
-
 #define CONFIG_OMAP3_SPI
 #define CONFIG_SYS_I2C
 #define CONFIG_SYS_OMAP24_I2C_SPEED	100000
diff --git a/include/configs/omap3_igep00x0.h b/include/configs/omap3_igep00x0.h
index 39f1e545444c9b0c122e121c46441293a71be00b..35d46dc94916cad5631ffd4af0bcd2a3bf9e47d8 100644
--- a/include/configs/omap3_igep00x0.h
+++ b/include/configs/omap3_igep00x0.h
@@ -52,8 +52,6 @@
 #define CONFIG_USBD_MANUFACTURER	"Texas Instruments"
 #define CONFIG_USBD_PRODUCT_NAME	"IGEP"
 
-#define CONFIG_CMD_ONENAND
-
 #ifndef CONFIG_SPL_BUILD
 
 /* Environment */
diff --git a/include/configs/s5p_goni.h b/include/configs/s5p_goni.h
index 9c00138508012b0071206a0a2e1b3a1e2d93ad60..eb17580865ff60896ffad6f89af9ad8318988894 100644
--- a/include/configs/s5p_goni.h
+++ b/include/configs/s5p_goni.h
@@ -51,8 +51,6 @@
 /* PWM */
 #define CONFIG_PWM			1
 
-#define CONFIG_CMD_ONENAND
-
 /* USB Composite download gadget - g_dnl */
 #define CONFIG_SYS_DFU_DATA_BUF_SIZE SZ_32M
 #define DFU_DEFAULT_POLL_TIMEOUT 300
diff --git a/include/configs/smdkc100.h b/include/configs/smdkc100.h
index 3e3575438ac9c4d2597fac3b279eed68659e3e7a..58abac5eef29329679d6e3408a9d2a0eeebb653a 100644
--- a/include/configs/smdkc100.h
+++ b/include/configs/smdkc100.h
@@ -59,8 +59,6 @@
 /***********************************************************
  * Command definition
  ***********************************************************/
-#define CONFIG_CMD_ONENAND
-
 #define CONFIG_MTD_DEVICE
 #define CONFIG_MTD_PARTITIONS
 
diff --git a/include/configs/vct.h b/include/configs/vct.h
index 2cb4ab149cae4ae2faf1defc7ab7e1fca9e8b355..e3c3b0e71f5c87c4f73e5bd46adbe7219f2d7e5f 100644
--- a/include/configs/vct.h
+++ b/include/configs/vct.h
@@ -105,10 +105,6 @@
 #define CONFIG_EHCI_HCD_INIT_AFTER_RESET /* re-init HCD after CMD_RESET */
 #endif /* CONFIG_CMD_USB */
 
-#if defined(CONFIG_VCT_ONENAND)
-#define CONFIG_CMD_ONENAND
-#endif
-
 /*
  * BOOTP options
  */
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 90ed096fee836c55f9ebab1b6e1ba6801eb4a096..b2c0fefae4f5551d30ae60c08eaedc85506efc34 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -293,7 +293,6 @@ CONFIG_CM922T_XA10
 CONFIG_CMDLINE_EDITING
 CONFIG_CMDLINE_PS_SUPPORT
 CONFIG_CMDLINE_TAG
-CONFIG_CMD_ONENAND
 CONFIG_CMD_PCA953X
 CONFIG_CMD_PCA953X_INFO
 CONFIG_CMD_PCI