diff --git a/cmd/Kconfig b/cmd/Kconfig
index 3dfc94a1822db3f53aa5d9d9c8474fdbff16bb20..a5c557e5b2697be92610fcd17a93d087602f7465 100644
--- a/cmd/Kconfig
+++ b/cmd/Kconfig
@@ -1369,6 +1369,17 @@ config CMD_SCSI
 	  scan the bus, reset the bus, read and write data and get information
 	  about devices.
 
+config CMD_YAFFS2
+	bool "yaffs2 - Access of YAFFS2 filesystem"
+	depends on YAFFS2
+	default y
+	help
+	  This provides commands for accessing a YAFFS2 filesystem. Yet
+	  Another Flash Filesystem 2 is a filesystem designed specifically
+	  for NAND flash. It incorporates bad-block management and ensures
+	  that device writes are sequential regardless of filesystem
+	  activity.
+
 endmenu
 
 menu "Debug commands"
diff --git a/cmd/Makefile b/cmd/Makefile
index a85fe25ddaaa7b83a283ba1dfdba39a4d396f762..1bf6e3f71182c3a092bcfcecf069d0e86e27126d 100644
--- a/cmd/Makefile
+++ b/cmd/Makefile
@@ -132,7 +132,7 @@ obj-$(CONFIG_CMD_FS_UUID) += fs_uuid.o
 obj-$(CONFIG_CMD_USB_MASS_STORAGE) += usb_mass_storage.o
 obj-$(CONFIG_CMD_THOR_DOWNLOAD) += thordown.o
 obj-$(CONFIG_CMD_XIMG) += ximg.o
-obj-$(CONFIG_YAFFS2) += yaffs2.o
+obj-$(CONFIG_CMD_YAFFS2) += yaffs2.o
 obj-$(CONFIG_CMD_SPL) += spl.o
 obj-$(CONFIG_CMD_ZIP) += zip.o
 obj-$(CONFIG_CMD_ZFS) += zfs.o
diff --git a/fs/Kconfig b/fs/Kconfig
index e6438ad0ea3958216461ba98f9d38b09cc57a2bc..e6803ac8cb2bba4717cc2012d66ed6301a63cc41 100644
--- a/fs/Kconfig
+++ b/fs/Kconfig
@@ -18,4 +18,6 @@ source "fs/ubifs/Kconfig"
 
 source "fs/cramfs/Kconfig"
 
+source "fs/yaffs2/Kconfig"
+
 endmenu
diff --git a/fs/yaffs2/Kconfig b/fs/yaffs2/Kconfig
new file mode 100644
index 0000000000000000000000000000000000000000..45ffdf6c26ffd60ff816558d56c4bfd3b19bb79d
--- /dev/null
+++ b/fs/yaffs2/Kconfig
@@ -0,0 +1,7 @@
+config YAFFS2
+	bool "YAFFS2 filesystem support"
+	help
+	  This provides access to YAFFS2 filesystems. Yet Another Flash
+	  Filesystem 2 is a filesystem designed specifically for NAND flash.
+	  It incorporates bad-block management and ensures that device
+	  writes are sequential regardless of filesystem activity.