diff --git a/README b/README
index 99c10c2f471ddcd0f4d407b1057361b8a847bf7e..34d1860410492fecd0af2c24dc3b034b5a374263 100644
--- a/README
+++ b/README
@@ -841,7 +841,6 @@ The following options need to be configured:
 					  that work for multiple fs types
 		CONFIG_CMD_FS_UUID	* Look up a filesystem UUID
 		CONFIG_CMD_SAVEENV	  saveenv
-		CONFIG_CMD_FDC		* Floppy Disk Support
 		CONFIG_CMD_FAT		* FAT command support
 		CONFIG_CMD_FLASH	  flinfo, erase, protect
 		CONFIG_CMD_FPGA		  FPGA device initialization support
diff --git a/cmd/Kconfig b/cmd/Kconfig
index cc959f6a4a3d72caa670b96611e84ab385d77440..99082c14f2319b6089e2769cdfc56de4aa24b92f 100644
--- a/cmd/Kconfig
+++ b/cmd/Kconfig
@@ -604,6 +604,11 @@ config CMD_GPIO
 	help
 	  GPIO support.
 
+config CMD_FDC
+	bool "fdcboot - Boot from floppy device"
+	help
+	  The 'fdtboot' command allows booting an image from a floppy disk.
+
 endmenu
 
 
diff --git a/configs/PIP405_defconfig b/configs/PIP405_defconfig
index bd421eab9c5909afe53e49ef5bb4bb49edfd9b30..e366ac13554f0e20697533d0454347e6473d0306 100644
--- a/configs/PIP405_defconfig
+++ b/configs/PIP405_defconfig
@@ -14,6 +14,7 @@ CONFIG_HUSH_PARSER=y
 CONFIG_CMD_EEPROM=y
 CONFIG_CMD_I2C=y
 CONFIG_CMD_USB=y
+CONFIG_CMD_FDC=y
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_CMD_DHCP=y
 CONFIG_CMD_MII=y
diff --git a/include/config_cmd_all.h b/include/config_cmd_all.h
index a8242049139cc77e0fac4e9332be1898e6d5dacd..9b3d88a1f8e850000230758511c3e5fa4e4ab29e 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_FDC		/* Floppy Disk Support		*/
 #define CONFIG_CMD_FUSE		/* Device fuse support		*/
 #define CONFIG_CMD_GETTIME	/* Get time since boot         */
 #define CONFIG_CMD_HASH		/* calculate hash / digest	*/
diff --git a/include/configs/PIP405.h b/include/configs/PIP405.h
index 84b1a730331e73bd984c257c5a53c68fec627bb2..eb1f0e26c59c02ae488713af51746c75d8ac3030 100644
--- a/include/configs/PIP405.h
+++ b/include/configs/PIP405.h
@@ -41,7 +41,6 @@
 #define CONFIG_CMD_PCI
 #define CONFIG_CMD_IRQ
 #define CONFIG_CMD_REGINFO
-#define CONFIG_CMD_FDC
 #define CONFIG_SCSI
 #define CONFIG_CMD_SDRAM
 #define CONFIG_CMD_SAVES
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 6887a0e4af950ccdbc0fd511402973d1a46e50d8..59981c31e7e5e1297ca23b2f33a3594fda3222ea 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -383,7 +383,6 @@ CONFIG_CM922T_XA10
 CONFIG_CMDLINE_EDITING
 CONFIG_CMDLINE_PS_SUPPORT
 CONFIG_CMDLINE_TAG
-CONFIG_CMD_FDC
 CONFIG_CMD_FDT_MAX_DUMP
 CONFIG_CMD_FPGAD
 CONFIG_CMD_FPGA_LOADBP