diff --git a/common/Kconfig b/common/Kconfig
index 2c42b8e4d0346e339543e908f8d76636f39b7332..0d44993800d64a07ff603e951e9a5aca2d421e8c 100644
--- a/common/Kconfig
+++ b/common/Kconfig
@@ -148,6 +148,12 @@ config CMD_BOOTM
 	help
 	  Boot an application image from the memory.
 
+config CMD_ELF
+	bool "bootelf, bootvx"
+	default y
+	help
+	  Boot an ELF/vxWorks image from the memory.
+
 config CMD_GO
 	bool "go"
 	default y
diff --git a/configs/atngw100_defconfig b/configs/atngw100_defconfig
index 043f6bf9d3f5f59946f56eebf7032a2cae0a83f6..5b01c18892c5266306eeb7b612d9fa62a02dfb2d 100644
--- a/configs/atngw100_defconfig
+++ b/configs/atngw100_defconfig
@@ -5,6 +5,7 @@ CONFIG_AUTOBOOT_KEYED=y
 CONFIG_AUTOBOOT_PROMPT="Press SPACE to abort autoboot in %d seconds\n"
 CONFIG_AUTOBOOT_DELAY_STR="d"
 CONFIG_AUTOBOOT_STOP_STR=" "
+# CONFIG_CMD_ELF is not set
 # CONFIG_CMD_XIMG is not set
 # CONFIG_CMD_FPGA is not set
 # CONFIG_CMD_SOURCE is not set
diff --git a/configs/atngw100mkii_defconfig b/configs/atngw100mkii_defconfig
index c8d910715dd27ae557b15070a07772373dd4bc06..48ea9ba01693c112ea077cc022b8e4e893d5227c 100644
--- a/configs/atngw100mkii_defconfig
+++ b/configs/atngw100mkii_defconfig
@@ -5,6 +5,7 @@ CONFIG_AUTOBOOT_KEYED=y
 CONFIG_AUTOBOOT_PROMPT="Press SPACE to abort autoboot in %d seconds\n"
 CONFIG_AUTOBOOT_DELAY_STR="d"
 CONFIG_AUTOBOOT_STOP_STR=" "
+# CONFIG_CMD_ELF is not set
 # CONFIG_CMD_XIMG is not set
 # CONFIG_CMD_FPGA is not set
 # CONFIG_CMD_SETEXPR is not set
diff --git a/configs/atstk1002_defconfig b/configs/atstk1002_defconfig
index d525868e812763276c617895e088858487a45e18..1b108e55172bc74421bcc4423a678a4dde9ff552 100644
--- a/configs/atstk1002_defconfig
+++ b/configs/atstk1002_defconfig
@@ -5,6 +5,7 @@ CONFIG_AUTOBOOT_KEYED=y
 CONFIG_AUTOBOOT_PROMPT="Press SPACE to abort autoboot in %d seconds\n"
 CONFIG_AUTOBOOT_DELAY_STR="d"
 CONFIG_AUTOBOOT_STOP_STR=" "
+# CONFIG_CMD_ELF is not set
 # CONFIG_CMD_XIMG is not set
 # CONFIG_CMD_FPGA is not set
 # CONFIG_CMD_SOURCE is not set
diff --git a/configs/dbau1000_defconfig b/configs/dbau1000_defconfig
index 5ffe104cea2d7c7942bea479ddc343ab1c439250..c69d4046aab5cf718e9fabefec98c369e564506b 100644
--- a/configs/dbau1000_defconfig
+++ b/configs/dbau1000_defconfig
@@ -3,6 +3,7 @@ CONFIG_TARGET_DBAU1X00=y
 CONFIG_SYS_EXTRA_OPTIONS="DBAU1000"
 CONFIG_SYS_PROMPT="DbAu1xx0 # "
 # CONFIG_CMD_BDI is not set
+# CONFIG_CMD_ELF is not set
 # CONFIG_CMD_RUN is not set
 # CONFIG_CMD_SAVEENV is not set
 # CONFIG_CMD_LOADB is not set
diff --git a/configs/dbau1100_defconfig b/configs/dbau1100_defconfig
index 84e369a7fe899f0763d460979234747eaabd7b4f..2e388120a77bddfc2bf5507c954ee16b8d86bb69 100644
--- a/configs/dbau1100_defconfig
+++ b/configs/dbau1100_defconfig
@@ -3,6 +3,7 @@ CONFIG_TARGET_DBAU1X00=y
 CONFIG_DBAU1100=y
 CONFIG_SYS_PROMPT="DbAu1xx0 # "
 # CONFIG_CMD_BDI is not set
+# CONFIG_CMD_ELF is not set
 # CONFIG_CMD_RUN is not set
 # CONFIG_CMD_SAVEENV is not set
 # CONFIG_CMD_LOADB is not set
diff --git a/configs/dbau1500_defconfig b/configs/dbau1500_defconfig
index 8a9583b486c23c0f0384f079972b736a8a17acd4..f61e7b69754ead802752d53fddef0aff35c21447 100644
--- a/configs/dbau1500_defconfig
+++ b/configs/dbau1500_defconfig
@@ -3,6 +3,7 @@ CONFIG_TARGET_DBAU1X00=y
 CONFIG_DBAU1500=y
 CONFIG_SYS_PROMPT="DbAu1xx0 # "
 # CONFIG_CMD_BDI is not set
+# CONFIG_CMD_ELF is not set
 # CONFIG_CMD_RUN is not set
 # CONFIG_CMD_SAVEENV is not set
 # CONFIG_CMD_LOADB is not set
diff --git a/configs/dbau1550_defconfig b/configs/dbau1550_defconfig
index 333a9223be6a7e778da2646c8f4368e67286414a..7f1bdf4100934880705e8eded57745bc681508e3 100644
--- a/configs/dbau1550_defconfig
+++ b/configs/dbau1550_defconfig
@@ -3,6 +3,7 @@ CONFIG_TARGET_DBAU1X00=y
 CONFIG_DBAU1550=y
 CONFIG_SYS_PROMPT="DbAu1xx0 # "
 # CONFIG_CMD_BDI is not set
+# CONFIG_CMD_ELF is not set
 # CONFIG_CMD_RUN is not set
 # CONFIG_CMD_SAVEENV is not set
 # CONFIG_CMD_FPGA is not set
diff --git a/configs/dbau1550_el_defconfig b/configs/dbau1550_el_defconfig
index 5970e439550dce1e177b5f3b17efa1cd759cf17a..6cd01614d5476e1eeedec1815c6f206d00fc0ae7 100644
--- a/configs/dbau1550_el_defconfig
+++ b/configs/dbau1550_el_defconfig
@@ -4,6 +4,7 @@ CONFIG_DBAU1550=y
 CONFIG_SYS_LITTLE_ENDIAN=y
 CONFIG_SYS_PROMPT="DbAu1xx0 # "
 # CONFIG_CMD_BDI is not set
+# CONFIG_CMD_ELF is not set
 # CONFIG_CMD_RUN is not set
 # CONFIG_CMD_SAVEENV is not set
 # CONFIG_CMD_FPGA is not set
diff --git a/configs/dlvision-10g_defconfig b/configs/dlvision-10g_defconfig
index 4ed14f85d5e9a10bbde1f94d13d95c456b0ed418..04037ba31be74f6bc1bbf87b82959266ebc8ddf4 100644
--- a/configs/dlvision-10g_defconfig
+++ b/configs/dlvision-10g_defconfig
@@ -3,4 +3,5 @@ CONFIG_4xx=y
 CONFIG_TARGET_DLVISION_10G=y
 CONFIG_AUTOBOOT_KEYED=y
 CONFIG_AUTOBOOT_STOP_STR=" "
+# CONFIG_CMD_ELF is not set
 # CONFIG_CMD_NFS is not set
diff --git a/configs/dlvision_defconfig b/configs/dlvision_defconfig
index 7982c17c3812a9303165ecc6d6319d5c47c96c8c..97bdd516b9dd04d6933809b0f47e2ce9cda5c6db 100644
--- a/configs/dlvision_defconfig
+++ b/configs/dlvision_defconfig
@@ -1,4 +1,5 @@
 CONFIG_PPC=y
 CONFIG_4xx=y
 CONFIG_TARGET_DLVISION=y
+# CONFIG_CMD_ELF is not set
 # CONFIG_CMD_NFS is not set
diff --git a/configs/gr_cpci_ax2000_defconfig b/configs/gr_cpci_ax2000_defconfig
index f003d775a4ccc10b3ffb68853581ec2a1ebe7ddb..ddac3ab96db066dc19a64229435ce867817b3a02 100644
--- a/configs/gr_cpci_ax2000_defconfig
+++ b/configs/gr_cpci_ax2000_defconfig
@@ -1,4 +1,5 @@
 CONFIG_SPARC=y
 CONFIG_TARGET_GR_CPCI_AX2000=y
 CONFIG_SYS_TEXT_BASE=0x00000000
+# CONFIG_CMD_ELF is not set
 # CONFIG_CMD_SETEXPR is not set
diff --git a/configs/gr_ep2s60_defconfig b/configs/gr_ep2s60_defconfig
index bbf18081c831c43799babd3b0447aaf13d88a167..0064554aa2f8a3b862d4302c9376e89001fd501a 100644
--- a/configs/gr_ep2s60_defconfig
+++ b/configs/gr_ep2s60_defconfig
@@ -1,4 +1,5 @@
 CONFIG_SPARC=y
 CONFIG_TARGET_GR_EP2S60=y
 CONFIG_SYS_TEXT_BASE=0x00000000
+# CONFIG_CMD_ELF is not set
 # CONFIG_CMD_SETEXPR is not set
diff --git a/configs/gr_xc3s_1500_defconfig b/configs/gr_xc3s_1500_defconfig
index 5c1442dd04c05a5e5d013276d15a3a4c5e503058..a05b709e7b2b2f66ffae258e4bc7aa17108552d4 100644
--- a/configs/gr_xc3s_1500_defconfig
+++ b/configs/gr_xc3s_1500_defconfig
@@ -1,4 +1,5 @@
 CONFIG_SPARC=y
 CONFIG_TARGET_GR_XC3S_1500=y
 CONFIG_SYS_TEXT_BASE=0x00000000
+# CONFIG_CMD_ELF is not sets
 # CONFIG_CMD_SETEXPR is not set
diff --git a/configs/grasshopper_defconfig b/configs/grasshopper_defconfig
index 92a73e22eec4e4d73274910b79ad1bfa0cc04656..6c5c9e38572301f49fe8a1087f7596e5873298d8 100644
--- a/configs/grasshopper_defconfig
+++ b/configs/grasshopper_defconfig
@@ -5,5 +5,6 @@ CONFIG_AUTOBOOT_KEYED=y
 CONFIG_AUTOBOOT_PROMPT="Press SPACE to abort autoboot in %d seconds\n"
 CONFIG_AUTOBOOT_DELAY_STR="d"
 CONFIG_AUTOBOOT_STOP_STR=" "
+# CONFIG_CMD_ELF is not set
 # CONFIG_CMD_FPGA is not set
 # CONFIG_CMD_SETEXPR is not set
diff --git a/configs/grsim_defconfig b/configs/grsim_defconfig
index b83abb650533e6d0f309b9ce28392444b773a286..f0fa23f810646a0eba94fc0d520161f504b7fea5 100644
--- a/configs/grsim_defconfig
+++ b/configs/grsim_defconfig
@@ -2,6 +2,7 @@ CONFIG_SPARC=y
 CONFIG_TARGET_GRSIM=y
 CONFIG_SYS_TEXT_BASE=0x00000000
 # CONFIG_CMD_BOOTD is not set
+# CONFIG_CMD_ELF is not set
 # CONFIG_CMD_IMI is not set
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_EDITENV is not set
diff --git a/configs/grsim_leon2_defconfig b/configs/grsim_leon2_defconfig
index 756a786fa56cb9f2c0843366cae13d29b848baca..9c9c96858245af8049a283d7a3c55700d5aa7ea6 100644
--- a/configs/grsim_leon2_defconfig
+++ b/configs/grsim_leon2_defconfig
@@ -2,6 +2,7 @@ CONFIG_SPARC=y
 CONFIG_TARGET_GRSIM_LEON2=y
 CONFIG_SYS_TEXT_BASE=0x00000000
 # CONFIG_CMD_BOOTD is not set
+# CONFIG_CMD_ELF is not set
 # CONFIG_CMD_IMI is not set
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_EDITENV is not set
diff --git a/configs/io_defconfig b/configs/io_defconfig
index 722d95a73aae11e62427881c4a0e9263f9186c95..7b7180571130bbcefb19462c79c1826a20f79154 100644
--- a/configs/io_defconfig
+++ b/configs/io_defconfig
@@ -3,4 +3,5 @@ CONFIG_4xx=y
 CONFIG_TARGET_IO=y
 CONFIG_AUTOBOOT_KEYED=y
 CONFIG_AUTOBOOT_STOP_STR=" "
+# CONFIG_CMD_ELF is not set
 # CONFIG_CMD_NFS is not set
diff --git a/configs/iocon_defconfig b/configs/iocon_defconfig
index 89e5cf54103c7954f16cf48732b1e8dd418cc094..63f0c37c607072f6cd4a811f548491e336849e34 100644
--- a/configs/iocon_defconfig
+++ b/configs/iocon_defconfig
@@ -3,4 +3,5 @@ CONFIG_4xx=y
 CONFIG_TARGET_IOCON=y
 CONFIG_AUTOBOOT_KEYED=y
 CONFIG_AUTOBOOT_STOP_STR=" "
+# CONFIG_CMD_ELF is not set
 # CONFIG_CMD_NFS is not set
diff --git a/configs/neo_defconfig b/configs/neo_defconfig
index 77eefe912c0f64343c4bef09c450a0620900aa8b..1ef57ad523854db50cc4642f4e8a657c5beadbce 100644
--- a/configs/neo_defconfig
+++ b/configs/neo_defconfig
@@ -1,4 +1,5 @@
 CONFIG_PPC=y
 CONFIG_4xx=y
 CONFIG_TARGET_NEO=y
+# CONFIG_CMD_ELF is not set
 # CONFIG_CMD_NFS is not set
diff --git a/configs/pb1000_defconfig b/configs/pb1000_defconfig
index f24cd0780ed554d17ac4dc11035e07aa11b14142..131014dc97028636142d23e5710b70596982e7b3 100644
--- a/configs/pb1000_defconfig
+++ b/configs/pb1000_defconfig
@@ -3,6 +3,7 @@ CONFIG_TARGET_PB1X00=y
 CONFIG_SYS_EXTRA_OPTIONS="PB1000"
 CONFIG_SYS_PROMPT="Pb1x00 # "
 # CONFIG_CMD_BDI is not set
+# CONFIG_CMD_ELF is not set
 # CONFIG_CMD_RUN is not set
 # CONFIG_CMD_SAVEENV is not set
 # CONFIG_CMD_LOADB is not set
diff --git a/configs/sandbox_defconfig b/configs/sandbox_defconfig
index b2675c706d3ddd8ae20aeb3f072e288d36904cdb..15e7b50a463e7b87ef365fa54ed5e46b215b6f6b 100644
--- a/configs/sandbox_defconfig
+++ b/configs/sandbox_defconfig
@@ -3,6 +3,7 @@ CONFIG_DEFAULT_DEVICE_TREE="sandbox"
 CONFIG_FIT=y
 CONFIG_FIT_VERBOSE=y
 CONFIG_FIT_SIGNATURE=y
+# CONFIG_CMD_ELF is not set
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_SETEXPR is not set
diff --git a/configs/vct_platinum_onenand_small_defconfig b/configs/vct_platinum_onenand_small_defconfig
index 33ce32a0131b14086f18cb0ba3ed0d9def9d5498..47985cd67ee530cf0abd748641dcbec64a24a6bd 100644
--- a/configs/vct_platinum_onenand_small_defconfig
+++ b/configs/vct_platinum_onenand_small_defconfig
@@ -6,6 +6,7 @@ CONFIG_VCT_SMALL_IMAGE=y
 CONFIG_SYS_PROMPT="$ "
 # CONFIG_CMD_BDI is not set
 # CONFIG_CMD_CONSOLE is not set
+# CONFIG_CMD_ELF is not set
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_CRC32 is not set
 # CONFIG_CMD_LOADB is not set
diff --git a/configs/vct_platinum_small_defconfig b/configs/vct_platinum_small_defconfig
index ceb61e1841e36d4b31601c483bd946ab5e4a3fdc..f85d3f788592d64d9ce785874d2b3121b9540bbb 100644
--- a/configs/vct_platinum_small_defconfig
+++ b/configs/vct_platinum_small_defconfig
@@ -5,6 +5,7 @@ CONFIG_VCT_SMALL_IMAGE=y
 CONFIG_SYS_PROMPT="$ "
 # CONFIG_CMD_BDI is not set
 # CONFIG_CMD_CONSOLE is not set
+# CONFIG_CMD_ELF is not set
 # CONFIG_CMD_CRC32 is not set
 # CONFIG_CMD_LOADB is not set
 # CONFIG_CMD_LOADS is not set
diff --git a/configs/vct_platinumavc_onenand_small_defconfig b/configs/vct_platinumavc_onenand_small_defconfig
index 1958fcd25ec7d915492b2aab3e538303a18e594d..77dd4140244c3421499cfd1f396f415946585860 100644
--- a/configs/vct_platinumavc_onenand_small_defconfig
+++ b/configs/vct_platinumavc_onenand_small_defconfig
@@ -6,6 +6,7 @@ CONFIG_VCT_SMALL_IMAGE=y
 CONFIG_SYS_PROMPT="$ "
 # CONFIG_CMD_BDI is not set
 # CONFIG_CMD_CONSOLE is not set
+# CONFIG_CMD_ELF is not set
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_CRC32 is not set
 # CONFIG_CMD_LOADB is not set
diff --git a/configs/vct_platinumavc_small_defconfig b/configs/vct_platinumavc_small_defconfig
index 0ac2def7890e0a232da9fe49f8877dfe69e2b88f..8fe82fc1deeab7e192833751f00418bf07479f9f 100644
--- a/configs/vct_platinumavc_small_defconfig
+++ b/configs/vct_platinumavc_small_defconfig
@@ -5,6 +5,7 @@ CONFIG_VCT_SMALL_IMAGE=y
 CONFIG_SYS_PROMPT="$ "
 # CONFIG_CMD_BDI is not set
 # CONFIG_CMD_CONSOLE is not set
+# CONFIG_CMD_ELF is not set
 # CONFIG_CMD_CRC32 is not set
 # CONFIG_CMD_LOADB is not set
 # CONFIG_CMD_LOADS is not set
diff --git a/configs/vct_premium_onenand_small_defconfig b/configs/vct_premium_onenand_small_defconfig
index 471a005339929bb07f0f1feda046d28fa4bccf90..ac6f42251f1ad7913305f89223474e51d3e9a065 100644
--- a/configs/vct_premium_onenand_small_defconfig
+++ b/configs/vct_premium_onenand_small_defconfig
@@ -6,6 +6,7 @@ CONFIG_VCT_SMALL_IMAGE=y
 CONFIG_SYS_PROMPT="$ "
 # CONFIG_CMD_BDI is not set
 # CONFIG_CMD_CONSOLE is not set
+# CONFIG_CMD_ELF is not set
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_CRC32 is not set
 # CONFIG_CMD_LOADB is not set
diff --git a/configs/vct_premium_small_defconfig b/configs/vct_premium_small_defconfig
index 68c0d9ad5b1bc6e930af4777b29420ddbe0e9e38..329743443279d2fc26a9d009e48f855f4b20f510 100644
--- a/configs/vct_premium_small_defconfig
+++ b/configs/vct_premium_small_defconfig
@@ -5,6 +5,7 @@ CONFIG_VCT_SMALL_IMAGE=y
 CONFIG_SYS_PROMPT="$ "
 # CONFIG_CMD_BDI is not set
 # CONFIG_CMD_CONSOLE is not set
+# CONFIG_CMD_ELF is not set
 # CONFIG_CMD_CRC32 is not set
 # CONFIG_CMD_LOADB is not set
 # CONFIG_CMD_LOADS is not set
diff --git a/include/config_cmd_all.h b/include/config_cmd_all.h
index 4c46ddad2b50a9caf89b51a93ddbc09980c1f260..8832552f318e8a8ccb3116b62dd9a358c62c3b3a 100644
--- a/include/config_cmd_all.h
+++ b/include/config_cmd_all.h
@@ -29,7 +29,6 @@
 #define CONFIG_CMD_DOC		/* Disk-On-Chip Support		*/
 #define CONFIG_CMD_DTT		/* Digital Therm and Thermostat */
 #define CONFIG_CMD_EEPROM	/* EEPROM read/write support	*/
-#define CONFIG_CMD_ELF		/* ELF (VxWorks) load/boot cmd	*/
 #define CONFIG_CMD_EXT2		/* EXT2 Support			*/
 #define CONFIG_CMD_FAT		/* FAT support			*/
 #define CONFIG_CMD_FDC		/* Floppy Disk Support		*/
diff --git a/include/config_distro_defaults.h b/include/config_distro_defaults.h
index d8165cc80e3e8df95f8b4d17e040c9e1cdfa282c..9d1de5508ff9b93007faf2df115b78edcbb5ddd6 100644
--- a/include/config_distro_defaults.h
+++ b/include/config_distro_defaults.h
@@ -49,7 +49,6 @@
 #define CONFIG_CMD_BOOTZ
 #endif
 #define CONFIG_CMD_DHCP
-#define CONFIG_CMD_ELF
 #define CONFIG_CMD_EXT2
 #define CONFIG_CMD_EXT4
 #define CONFIG_CMD_FAT
diff --git a/include/configs/B4860QDS.h b/include/configs/B4860QDS.h
index 1e458f44f6d8ea498bc3060f5b6a4a3914632579..858e25dbc3c85475c6ca701bb36184a399f72e34 100644
--- a/include/configs/B4860QDS.h
+++ b/include/configs/B4860QDS.h
@@ -756,7 +756,6 @@ unsigned long get_board_ddr_clk(void);
 #define CONFIG_CMD_DATE
 #define CONFIG_CMD_DHCP
 #define CONFIG_CMD_EEPROM
-#define CONFIG_CMD_ELF
 #define CONFIG_CMD_ERRATA
 #define CONFIG_CMD_GREPENV
 #define CONFIG_CMD_IRQ
diff --git a/include/configs/BSC9131RDB.h b/include/configs/BSC9131RDB.h
index a7c927759cd8ff31cf0b3b858e96e4457a6e2cf5..226a170c4d0f3957e9c987dd139df76345c8e4a6 100644
--- a/include/configs/BSC9131RDB.h
+++ b/include/configs/BSC9131RDB.h
@@ -342,7 +342,6 @@ extern unsigned long get_sdram_size(void);
  */
 #define CONFIG_CMD_DHCP
 #define CONFIG_CMD_ERRATA
-#define CONFIG_CMD_ELF
 #define CONFIG_CMD_EXT2
 #define CONFIG_CMD_FAT
 #define CONFIG_CMD_IRQ
diff --git a/include/configs/BSC9132QDS.h b/include/configs/BSC9132QDS.h
index 804493e645c5c9d57160f3cf9fa7b466af4a12e0..e54544789a04bc4275804176cd07a3c95a6fbdf2 100644
--- a/include/configs/BSC9132QDS.h
+++ b/include/configs/BSC9132QDS.h
@@ -580,7 +580,6 @@ combinations. this should be removed later
  */
 #define CONFIG_CMD_DATE
 #define CONFIG_CMD_DHCP
-#define CONFIG_CMD_ELF
 #define CONFIG_CMD_ERRATA
 #define CONFIG_CMD_I2C
 #define CONFIG_CMD_IRQ
diff --git a/include/configs/C29XPCIE.h b/include/configs/C29XPCIE.h
index 6c39b1ed2b05eb26dc90fabe8b4d49272f778081..f574994219aa58a8f8ecaa6e8860ca0558f232ab 100644
--- a/include/configs/C29XPCIE.h
+++ b/include/configs/C29XPCIE.h
@@ -494,7 +494,6 @@
  * Command line configuration.
  */
 #define CONFIG_CMD_ERRATA
-#define CONFIG_CMD_ELF
 #define CONFIG_CMD_IRQ
 #define CONFIG_CMD_MII
 #define CONFIG_CMD_PING
diff --git a/include/configs/CPCI2DP.h b/include/configs/CPCI2DP.h
index 638a586492c84965e7778acfbca0108e8644b1e8..ce7bc35dd93c60b4a2b117e6b6f836918861d7b8 100644
--- a/include/configs/CPCI2DP.h
+++ b/include/configs/CPCI2DP.h
@@ -55,7 +55,6 @@
  */
 #define CONFIG_CMD_PCI
 #define CONFIG_CMD_IRQ
-#define CONFIG_CMD_ELF
 #define CONFIG_CMD_I2C
 #define CONFIG_CMD_BSP
 #define CONFIG_CMD_EEPROM
diff --git a/include/configs/CPCI4052.h b/include/configs/CPCI4052.h
index 9c25751c8fbabc459d855cc892e9d74a8f87d6ea..2827a04814a8da6e657fe46e2883d85ebe321665 100644
--- a/include/configs/CPCI4052.h
+++ b/include/configs/CPCI4052.h
@@ -72,7 +72,6 @@
 #define CONFIG_CMD_IRQ
 #define CONFIG_CMD_IDE
 #define CONFIG_CMD_FAT
-#define CONFIG_CMD_ELF
 #define CONFIG_CMD_DATE
 #define CONFIG_CMD_I2C
 #define CONFIG_CMD_MII
diff --git a/include/configs/M5208EVBE.h b/include/configs/M5208EVBE.h
index 5e15dd91b3ee8c439b470875600e8dfb0a39418a..b38a3499a1cd10068b54618ed7f006e5f4c7d90b 100644
--- a/include/configs/M5208EVBE.h
+++ b/include/configs/M5208EVBE.h
@@ -23,7 +23,6 @@
 
 /* Command line configuration */
 #define CONFIG_CMD_CACHE
-#define CONFIG_CMD_ELF
 #undef CONFIG_CMD_I2C
 #define CONFIG_CMD_MII
 #define CONFIG_CMD_PING
diff --git a/include/configs/M52277EVB.h b/include/configs/M52277EVB.h
index d1cadc0165b42f49d2fd17ff10824777854f6ba8..ffee2250bb5bae17c2805391e9280fac68565fb9 100644
--- a/include/configs/M52277EVB.h
+++ b/include/configs/M52277EVB.h
@@ -39,7 +39,6 @@
 /* Command line configuration */
 #define CONFIG_CMD_CACHE
 #define CONFIG_CMD_DATE
-#define CONFIG_CMD_ELF
 #define CONFIG_CMD_I2C
 #define CONFIG_CMD_JFFS2
 #define CONFIG_CMD_REGINFO
diff --git a/include/configs/M5235EVB.h b/include/configs/M5235EVB.h
index 1472672087d9ad2139f04a2e81061d19772ff696..2a198e5cc3560653c14eadbeac037f98a43a9d8e 100644
--- a/include/configs/M5235EVB.h
+++ b/include/configs/M5235EVB.h
@@ -37,7 +37,6 @@
 /* Command line configuration */
 #define CONFIG_CMD_CACHE
 #define CONFIG_CMD_DHCP
-#define CONFIG_CMD_ELF
 #define CONFIG_CMD_I2C
 #define CONFIG_CMD_MII
 #define CONFIG_CMD_PCI
diff --git a/include/configs/M5272C3.h b/include/configs/M5272C3.h
index 006f2d8e9b3df1c2a32ff672f4a718353c434934..718f31fefa6a2ea33976c759eb8fcb5e05491db0 100644
--- a/include/configs/M5272C3.h
+++ b/include/configs/M5272C3.h
@@ -59,7 +59,6 @@
 #define CONFIG_CMD_CACHE
 #define CONFIG_CMD_MII
 #define CONFIG_CMD_PING
-#define CONFIG_CMD_ELF
 
 
 #define CONFIG_BOOTDELAY	5
diff --git a/include/configs/M5275EVB.h b/include/configs/M5275EVB.h
index 116e8e27f99ded3be244c3535e911026e7689bb1..195595fb8406e53256587c3d54d0d06acc586a08 100644
--- a/include/configs/M5275EVB.h
+++ b/include/configs/M5275EVB.h
@@ -58,7 +58,6 @@
 #define CONFIG_CMD_CACHE
 #define CONFIG_CMD_PING
 #define CONFIG_CMD_MII
-#define CONFIG_CMD_ELF
 #define CONFIG_CMD_I2C
 #define CONFIG_CMD_DHCP
 
diff --git a/include/configs/M53017EVB.h b/include/configs/M53017EVB.h
index a48ae6bccd33dee749bd2b3ceed33cb597d77f91..42cbb0f153dfd7dda426349d77d1320b40062e29 100644
--- a/include/configs/M53017EVB.h
+++ b/include/configs/M53017EVB.h
@@ -29,7 +29,6 @@
 /* Command line configuration */
 #define CONFIG_CMD_CACHE
 #define CONFIG_CMD_DATE
-#define CONFIG_CMD_ELF
 #undef CONFIG_CMD_I2C
 #define CONFIG_CMD_MII
 #define CONFIG_CMD_PING
diff --git a/include/configs/M5329EVB.h b/include/configs/M5329EVB.h
index e806b7a3eb11283dae9455217b2d3aa4a247f5f5..b2d544cf4a8e1a85451482d698a0bca0a80d55b2 100644
--- a/include/configs/M5329EVB.h
+++ b/include/configs/M5329EVB.h
@@ -29,7 +29,6 @@
 /* Command line configuration */
 #define CONFIG_CMD_CACHE
 #define CONFIG_CMD_DATE
-#define CONFIG_CMD_ELF
 #define CONFIG_CMD_I2C
 #define CONFIG_CMD_MII
 #define CONFIG_CMD_PING
diff --git a/include/configs/M5373EVB.h b/include/configs/M5373EVB.h
index 1df98f7e481f9b38a4909ba76d7f73a6833269c4..a9062044542b6ac8c03eaa7a48b858434d7b977b 100644
--- a/include/configs/M5373EVB.h
+++ b/include/configs/M5373EVB.h
@@ -29,7 +29,6 @@
 /* Command line configuration */
 #define CONFIG_CMD_CACHE
 #define CONFIG_CMD_DATE
-#define CONFIG_CMD_ELF
 #define CONFIG_CMD_I2C
 #define CONFIG_CMD_MII
 #define CONFIG_CMD_PING
diff --git a/include/configs/M54418TWR.h b/include/configs/M54418TWR.h
index db0ddcd5e4ed1e72f1ee0b045267212e3238b96b..927b7daf8a7746d45f934b92e7a0481b9952dd15 100644
--- a/include/configs/M54418TWR.h
+++ b/include/configs/M54418TWR.h
@@ -41,7 +41,6 @@
 #define CONFIG_CMD_CACHE
 #undef CONFIG_CMD_DATE
 #define CONFIG_CMD_DHCP
-#define CONFIG_CMD_ELF
 #undef CONFIG_CMD_I2C
 #undef CONFIG_CMD_JFFS2
 #undef CONFIG_CMD_UBI
diff --git a/include/configs/M54451EVB.h b/include/configs/M54451EVB.h
index de747a48be223973ee375afe7ae23db5bbd23ee4..61ebb2421477c27f4e00d249a59a4871da1e6245 100644
--- a/include/configs/M54451EVB.h
+++ b/include/configs/M54451EVB.h
@@ -42,7 +42,6 @@
 #define CONFIG_CMD_CACHE
 #define CONFIG_CMD_DATE
 #define CONFIG_CMD_DHCP
-#define CONFIG_CMD_ELF
 #define CONFIG_CMD_I2C
 #undef CONFIG_CMD_JFFS2
 #define CONFIG_CMD_MII
diff --git a/include/configs/M54455EVB.h b/include/configs/M54455EVB.h
index 06da5f0e50e56add393060c4f5640388ec5b6bee..f813dab4b1771381f4bebd338791b8eff98ff7fb 100644
--- a/include/configs/M54455EVB.h
+++ b/include/configs/M54455EVB.h
@@ -42,7 +42,6 @@
 #define CONFIG_CMD_CACHE
 #define CONFIG_CMD_DATE
 #define CONFIG_CMD_DHCP
-#define CONFIG_CMD_ELF
 #define CONFIG_CMD_EXT2
 #define CONFIG_CMD_FAT
 #define CONFIG_CMD_I2C
diff --git a/include/configs/M5475EVB.h b/include/configs/M5475EVB.h
index e30b645efa4cd72ef4de8999b37e50c86a62f3be..81ecbc86eacf6b6759cc53045ca0600743839170 100644
--- a/include/configs/M5475EVB.h
+++ b/include/configs/M5475EVB.h
@@ -31,7 +31,6 @@
 /* Command line configuration */
 #define CONFIG_CMD_CACHE
 #undef CONFIG_CMD_DATE
-#define CONFIG_CMD_ELF
 #define CONFIG_CMD_I2C
 #define CONFIG_CMD_MII
 #define CONFIG_CMD_PCI
diff --git a/include/configs/M5485EVB.h b/include/configs/M5485EVB.h
index 051c9409bdf250fca4f96bd88fc1b34d3a7d31d7..8621d7a8d4f4bd9e64b25b45aa95a530fcb01591 100644
--- a/include/configs/M5485EVB.h
+++ b/include/configs/M5485EVB.h
@@ -31,7 +31,6 @@
 /* Command line configuration */
 #define CONFIG_CMD_CACHE
 #undef CONFIG_CMD_DATE
-#define CONFIG_CMD_ELF
 #define CONFIG_CMD_I2C
 #define CONFIG_CMD_MII
 #define CONFIG_CMD_PCI
diff --git a/include/configs/MIP405.h b/include/configs/MIP405.h
index cb21b7396edb86189269ab8a8430e22a451cab3f..0757e67b57f4228fb9c0ff738dbcc2cdecec694a 100644
--- a/include/configs/MIP405.h
+++ b/include/configs/MIP405.h
@@ -55,7 +55,6 @@
 #define CONFIG_CMD_DATE
 #define CONFIG_CMD_DHCP
 #define CONFIG_CMD_EEPROM
-#define CONFIG_CMD_ELF
 #define CONFIG_CMD_FAT
 #define CONFIG_CMD_I2C
 #define CONFIG_CMD_IDE
diff --git a/include/configs/MPC8536DS.h b/include/configs/MPC8536DS.h
index 131243826d85c49b98abea9d75a2834488022276..7c51eef9d3f47768739abb823b4679ee1a9a067e 100644
--- a/include/configs/MPC8536DS.h
+++ b/include/configs/MPC8536DS.h
@@ -638,7 +638,6 @@
 #define CONFIG_CMD_PING
 #define CONFIG_CMD_I2C
 #define CONFIG_CMD_MII
-#define CONFIG_CMD_ELF
 #define CONFIG_CMD_IRQ
 #define CONFIG_CMD_REGINFO
 
diff --git a/include/configs/MPC8540ADS.h b/include/configs/MPC8540ADS.h
index a42c93690dc1ecae3344e5aff6c6f00ade1072f8..dc6e3954bc5d01a6ffc9dc216516d8a3a2932cb6 100644
--- a/include/configs/MPC8540ADS.h
+++ b/include/configs/MPC8540ADS.h
@@ -353,7 +353,6 @@
  */
 #define CONFIG_CMD_PING
 #define CONFIG_CMD_I2C
-#define CONFIG_CMD_ELF
 #define CONFIG_CMD_IRQ
 
 #if defined(CONFIG_PCI)
diff --git a/include/configs/MPC8541CDS.h b/include/configs/MPC8541CDS.h
index 8942aae3efe3cbc1364c911155daa8298c984d94..bf0360383779fa7e95255078dfd880d805032043 100644
--- a/include/configs/MPC8541CDS.h
+++ b/include/configs/MPC8541CDS.h
@@ -372,7 +372,6 @@ extern unsigned long get_clock_freq(void);
 #define CONFIG_CMD_PING
 #define CONFIG_CMD_I2C
 #define CONFIG_CMD_MII
-#define CONFIG_CMD_ELF
 #define CONFIG_CMD_IRQ
 #define CONFIG_CMD_REGINFO
 
diff --git a/include/configs/MPC8544DS.h b/include/configs/MPC8544DS.h
index 67fac7029418ca2c27d4cf19086a016be2135699..bef28b3d3ad5e170a241c90c4b5a9c4364fe739d 100644
--- a/include/configs/MPC8544DS.h
+++ b/include/configs/MPC8544DS.h
@@ -387,7 +387,6 @@ extern unsigned long get_board_sys_clk(unsigned long dummy);
 #define CONFIG_CMD_PING
 #define CONFIG_CMD_I2C
 #define CONFIG_CMD_MII
-#define CONFIG_CMD_ELF
 #define CONFIG_CMD_IRQ
 #define CONFIG_CMD_REGINFO
 
diff --git a/include/configs/MPC8548CDS.h b/include/configs/MPC8548CDS.h
index 842afe1421cbea924359cd22e1c5e1b894bc5859..2bea60480430a8d9a8a4295ab3b204fe8ea6e999 100644
--- a/include/configs/MPC8548CDS.h
+++ b/include/configs/MPC8548CDS.h
@@ -496,7 +496,6 @@ extern unsigned long get_clock_freq(void);
 #define CONFIG_CMD_PING
 #define CONFIG_CMD_I2C
 #define CONFIG_CMD_MII
-#define CONFIG_CMD_ELF
 #define CONFIG_CMD_IRQ
 #define CONFIG_CMD_REGINFO
 
diff --git a/include/configs/MPC8555CDS.h b/include/configs/MPC8555CDS.h
index 2e8db5a67b0c677a97d5150bb34e738e910e9fb4..80b14cbf4f3eaca89e3c8e6426c9ebff7cb72113 100644
--- a/include/configs/MPC8555CDS.h
+++ b/include/configs/MPC8555CDS.h
@@ -370,7 +370,6 @@ extern unsigned long get_clock_freq(void);
 #define CONFIG_CMD_PING
 #define CONFIG_CMD_I2C
 #define CONFIG_CMD_MII
-#define CONFIG_CMD_ELF
 #define CONFIG_CMD_IRQ
 #define CONFIG_CMD_REGINFO
 
diff --git a/include/configs/MPC8560ADS.h b/include/configs/MPC8560ADS.h
index fabe6bf0cf83869452376856911a18f6c39a281d..e1bc8ccd3253e65ae8671d73a4cccb5e5655f947 100644
--- a/include/configs/MPC8560ADS.h
+++ b/include/configs/MPC8560ADS.h
@@ -389,7 +389,6 @@
  */
 #define CONFIG_CMD_PING
 #define CONFIG_CMD_I2C
-#define CONFIG_CMD_ELF
 #define CONFIG_CMD_IRQ
 #define CONFIG_CMD_REGINFO
 
diff --git a/include/configs/MPC8568MDS.h b/include/configs/MPC8568MDS.h
index 7a2131bb41916ba9bb71608bcd794b0add5c83e3..064bd8509030838cd638c13beaf190e9a4ac461b 100644
--- a/include/configs/MPC8568MDS.h
+++ b/include/configs/MPC8568MDS.h
@@ -392,7 +392,6 @@ extern unsigned long get_clock_freq(void);
 #define CONFIG_CMD_PING
 #define CONFIG_CMD_I2C
 #define CONFIG_CMD_MII
-#define CONFIG_CMD_ELF
 #define CONFIG_CMD_IRQ
 #define CONFIG_CMD_REGINFO
 
diff --git a/include/configs/MPC8569MDS.h b/include/configs/MPC8569MDS.h
index 9e38724710cb4f602d2b712ed8833c973f89a7f1..0af670b2041e407a7b27a9c36d0ce8749a46154b 100644
--- a/include/configs/MPC8569MDS.h
+++ b/include/configs/MPC8569MDS.h
@@ -482,7 +482,6 @@ extern unsigned long get_clock_freq(void);
 #define CONFIG_CMD_PING
 #define CONFIG_CMD_I2C
 #define CONFIG_CMD_MII
-#define CONFIG_CMD_ELF
 #define CONFIG_CMD_IRQ
 #define CONFIG_CMD_REGINFO
 
diff --git a/include/configs/MPC8572DS.h b/include/configs/MPC8572DS.h
index f3334ad26b046cbfd753adc4ca9805d13e8aba20..4b5467b4a840a8a4c2b2b50160d92bcda3a3ddb6 100644
--- a/include/configs/MPC8572DS.h
+++ b/include/configs/MPC8572DS.h
@@ -597,7 +597,6 @@
 #define CONFIG_CMD_PING
 #define CONFIG_CMD_I2C
 #define CONFIG_CMD_MII
-#define CONFIG_CMD_ELF
 #define CONFIG_CMD_REGINFO
 
 #if defined(CONFIG_PCI)
diff --git a/include/configs/P1010RDB.h b/include/configs/P1010RDB.h
index 8ac7000989eb843b7022d937e176f692f06240f2..b85e19570a1d6da06cdc7d0454b3bbc5869cf7a4 100644
--- a/include/configs/P1010RDB.h
+++ b/include/configs/P1010RDB.h
@@ -813,7 +813,6 @@ extern unsigned long get_sdram_size(void);
  */
 #define CONFIG_CMD_DATE
 #define CONFIG_CMD_ERRATA
-#define CONFIG_CMD_ELF
 #define CONFIG_CMD_IRQ
 #define CONFIG_CMD_MII
 #define CONFIG_CMD_PING
diff --git a/include/configs/P1022DS.h b/include/configs/P1022DS.h
index 06b293ff81a51c0fd121b82c910758e79f486b7b..95c81ab4fbd4ec5305617c86f454cbc3189ebac1 100644
--- a/include/configs/P1022DS.h
+++ b/include/configs/P1022DS.h
@@ -678,7 +678,6 @@
 /*
  * Command line configuration.
  */
-#define CONFIG_CMD_ELF
 #define CONFIG_CMD_ERRATA
 #define CONFIG_CMD_IRQ
 #define CONFIG_CMD_I2C
diff --git a/include/configs/P2041RDB.h b/include/configs/P2041RDB.h
index 5468495fb4d012d3459006913a2625c4d4251ded..de205e82caf7cb2bc7bbf6ba44bc7785ecc50217 100644
--- a/include/configs/P2041RDB.h
+++ b/include/configs/P2041RDB.h
@@ -618,7 +618,6 @@ unsigned long get_board_sys_clk(unsigned long dummy);
  * Command line configuration.
  */
 #define CONFIG_CMD_DHCP
-#define CONFIG_CMD_ELF
 #define CONFIG_CMD_ERRATA
 #define CONFIG_CMD_GREPENV
 #define CONFIG_CMD_IRQ
diff --git a/include/configs/PIP405.h b/include/configs/PIP405.h
index c9d08e66002d34dc9f111e4de72b72228d0e096c..4601bc8accc090e86126939fdd0f2df4eabbd041 100644
--- a/include/configs/PIP405.h
+++ b/include/configs/PIP405.h
@@ -53,7 +53,6 @@
 #define CONFIG_CMD_SCSI
 #define CONFIG_CMD_FAT
 #define CONFIG_CMD_DATE
-#define CONFIG_CMD_ELF
 #define CONFIG_CMD_USB
 #define CONFIG_CMD_MII
 #define CONFIG_CMD_SDRAM
diff --git a/include/configs/PLU405.h b/include/configs/PLU405.h
index 3a71ff8617405e60d6eb8e53cd25afb0c48aa027..d5d30926e36db4d8f88ac58eba6377381a2f0483 100644
--- a/include/configs/PLU405.h
+++ b/include/configs/PLU405.h
@@ -66,7 +66,6 @@
 #define CONFIG_CMD_IRQ
 #define CONFIG_CMD_IDE
 #define CONFIG_CMD_FAT
-#define CONFIG_CMD_ELF
 #define CONFIG_CMD_NAND
 #define CONFIG_CMD_DATE
 #define CONFIG_CMD_I2C
diff --git a/include/configs/PMC405DE.h b/include/configs/PMC405DE.h
index 5712298743fd43f5969e774053560ef9c706e1b9..2f35ca9417cdf8e3222814b4b0a572b1e9b6f954 100644
--- a/include/configs/PMC405DE.h
+++ b/include/configs/PMC405DE.h
@@ -59,7 +59,6 @@
 #define CONFIG_CMD_DATE
 #define CONFIG_CMD_DHCP
 #define CONFIG_CMD_EEPROM
-#define CONFIG_CMD_ELF
 #define CONFIG_CMD_I2C
 #define CONFIG_CMD_IRQ
 #define CONFIG_CMD_MII
diff --git a/include/configs/PMC440.h b/include/configs/PMC440.h
index 17bd18031dc6822e102085b8f30dc2f5539d7c0f..fad5744398865bc6842a42bbbce44ff328ec8a2a 100644
--- a/include/configs/PMC440.h
+++ b/include/configs/PMC440.h
@@ -276,7 +276,6 @@
 #define CONFIG_CMD_DHCP
 #define CONFIG_CMD_DTT
 #define CONFIG_CMD_EEPROM
-#define CONFIG_CMD_ELF
 #define CONFIG_CMD_FAT
 #define CONFIG_CMD_I2C
 #define CONFIG_CMD_MII
diff --git a/include/configs/T102xQDS.h b/include/configs/T102xQDS.h
index 92f51f6fd65df0cf46eca2629366bbba023ab810..c9e5ea9c73e3d4ce759d4600a68b9238457b4910 100644
--- a/include/configs/T102xQDS.h
+++ b/include/configs/T102xQDS.h
@@ -850,7 +850,6 @@ unsigned long get_board_ddr_clk(void);
 #define CONFIG_CMD_DATE
 #define CONFIG_CMD_DHCP
 #define CONFIG_CMD_EEPROM
-#define CONFIG_CMD_ELF
 #define CONFIG_CMD_ERRATA
 #define CONFIG_CMD_GREPENV
 #define CONFIG_CMD_IRQ
diff --git a/include/configs/T102xRDB.h b/include/configs/T102xRDB.h
index 324f7108d5a12cf16988018e5359ac26b0da4c08..0601d73d234866149736d234a107e59779727bc2 100644
--- a/include/configs/T102xRDB.h
+++ b/include/configs/T102xRDB.h
@@ -852,7 +852,6 @@ unsigned long get_board_ddr_clk(void);
 #define CONFIG_CMD_DATE
 #define CONFIG_CMD_DHCP
 #define CONFIG_CMD_EEPROM
-#define CONFIG_CMD_ELF
 #define CONFIG_CMD_ERRATA
 #define CONFIG_CMD_GREPENV
 #define CONFIG_CMD_IRQ
diff --git a/include/configs/T1040QDS.h b/include/configs/T1040QDS.h
index 1f4616011af4085e0635abf764cd3b3f8b079ea6..4b735b5494087fa301e81dca94d0308de8762dd4 100644
--- a/include/configs/T1040QDS.h
+++ b/include/configs/T1040QDS.h
@@ -723,7 +723,6 @@ unsigned long get_board_ddr_clk(void);
 #define CONFIG_CMD_DATE
 #define CONFIG_CMD_DHCP
 #define CONFIG_CMD_EEPROM
-#define CONFIG_CMD_ELF
 #define CONFIG_CMD_ERRATA
 #define CONFIG_CMD_GREPENV
 #define CONFIG_CMD_IRQ
diff --git a/include/configs/T104xRDB.h b/include/configs/T104xRDB.h
index 5b61b56a4e779dfc7ceb9b9a7bf1591ee92e72b1..7f8d110c14d7b8bf5233d99b505aaffdcc109d41 100644
--- a/include/configs/T104xRDB.h
+++ b/include/configs/T104xRDB.h
@@ -787,7 +787,6 @@ $(SRCTREE)/board/freescale/t104xrdb/t1042d4_rcw.cfg
 #define CONFIG_CMD_DATE
 #endif
 #define CONFIG_CMD_DHCP
-#define CONFIG_CMD_ELF
 #define CONFIG_CMD_ERRATA
 #define CONFIG_CMD_GREPENV
 #define CONFIG_CMD_IRQ
diff --git a/include/configs/T208xQDS.h b/include/configs/T208xQDS.h
index 23ca0cfcebf7be2df3a69e7aaefda07898272b87..a804cbe9aa26e2c19726cbaa9e031ba8eada5ff2 100644
--- a/include/configs/T208xQDS.h
+++ b/include/configs/T208xQDS.h
@@ -792,7 +792,6 @@ unsigned long get_board_ddr_clk(void);
  * Command line configuration.
  */
 #define CONFIG_CMD_DHCP
-#define CONFIG_CMD_ELF
 #define CONFIG_CMD_ERRATA
 #define CONFIG_CMD_GREPENV
 #define CONFIG_CMD_IRQ
diff --git a/include/configs/T208xRDB.h b/include/configs/T208xRDB.h
index ef42b88854e1b8709d061cb392b02cfb90465c8e..307a0ea02a5f21ffa974cd20cb9531b5c9c816ea 100644
--- a/include/configs/T208xRDB.h
+++ b/include/configs/T208xRDB.h
@@ -748,7 +748,6 @@ unsigned long get_board_ddr_clk(void);
  * Command line configuration.
  */
 #define CONFIG_CMD_DHCP
-#define CONFIG_CMD_ELF
 #define CONFIG_CMD_ERRATA
 #define CONFIG_CMD_MII
 #define CONFIG_CMD_I2C
diff --git a/include/configs/T4240RDB.h b/include/configs/T4240RDB.h
index d43f6b7ea40273510d1cf2d782032cc5bcfab46d..754d182c3a4aa610b08c22de2e3eba2659c7afb5 100644
--- a/include/configs/T4240RDB.h
+++ b/include/configs/T4240RDB.h
@@ -318,7 +318,6 @@
  * Command line configuration.
  */
 #define CONFIG_CMD_DHCP
-#define CONFIG_CMD_ELF
 #define CONFIG_CMD_ERRATA
 #define CONFIG_CMD_GREPENV
 #define CONFIG_CMD_IRQ
diff --git a/include/configs/TQM823L.h b/include/configs/TQM823L.h
index 9b9217ebc11281403b093cf9264ef609baec045a..cea314915f699516aada9edf7e8949e7fef6bcf8 100644
--- a/include/configs/TQM823L.h
+++ b/include/configs/TQM823L.h
@@ -109,7 +109,6 @@
 #define CONFIG_CMD_ASKENV
 #define CONFIG_CMD_DATE
 #define CONFIG_CMD_DHCP
-#define CONFIG_CMD_ELF
 #define CONFIG_CMD_EXT2
 #define CONFIG_CMD_IDE
 #define CONFIG_CMD_JFFS2
diff --git a/include/configs/TQM823M.h b/include/configs/TQM823M.h
index 5240e0f0b17152fa3d5bfe00db6c57f9e9fd69eb..85215b132c16c55f7cdda7d9188918fdef5042f0 100644
--- a/include/configs/TQM823M.h
+++ b/include/configs/TQM823M.h
@@ -107,7 +107,6 @@
 #define CONFIG_CMD_ASKENV
 #define CONFIG_CMD_DATE
 #define CONFIG_CMD_DHCP
-#define CONFIG_CMD_ELF
 #define CONFIG_CMD_EXT2
 #define CONFIG_CMD_IDE
 #define CONFIG_CMD_JFFS2
diff --git a/include/configs/TQM850L.h b/include/configs/TQM850L.h
index edadf55f51cc0109fd8c95554972242266bd0b92..97a9fa7ebea1b720f61036eb8384efe9b2d3048d 100644
--- a/include/configs/TQM850L.h
+++ b/include/configs/TQM850L.h
@@ -97,7 +97,6 @@
 #define CONFIG_CMD_ASKENV
 #define CONFIG_CMD_DATE
 #define CONFIG_CMD_DHCP
-#define CONFIG_CMD_ELF
 #define CONFIG_CMD_EXT2
 #define CONFIG_CMD_IDE
 #define CONFIG_CMD_JFFS2
diff --git a/include/configs/TQM850M.h b/include/configs/TQM850M.h
index 166bb2c6c04b3f2d6f524c2980a1efc53e8321a0..636ffc830bc4b6c926b3275da4967b278936f87b 100644
--- a/include/configs/TQM850M.h
+++ b/include/configs/TQM850M.h
@@ -97,7 +97,6 @@
 #define CONFIG_CMD_ASKENV
 #define CONFIG_CMD_DATE
 #define CONFIG_CMD_DHCP
-#define CONFIG_CMD_ELF
 #define CONFIG_CMD_EXT2
 #define CONFIG_CMD_IDE
 #define CONFIG_CMD_JFFS2
diff --git a/include/configs/TQM855L.h b/include/configs/TQM855L.h
index 8b16ad2750dcbb0cc236bf950e86e5840af6c83a..3c82c73e3ea327e4b9efd48f0f8f106d3824cee0 100644
--- a/include/configs/TQM855L.h
+++ b/include/configs/TQM855L.h
@@ -100,7 +100,6 @@
 #define CONFIG_CMD_ASKENV
 #define CONFIG_CMD_DATE
 #define CONFIG_CMD_DHCP
-#define CONFIG_CMD_ELF
 #define CONFIG_CMD_EXT2
 #define CONFIG_CMD_IDE
 #define CONFIG_CMD_JFFS2
diff --git a/include/configs/TQM855M.h b/include/configs/TQM855M.h
index 8a05fa4860a09b2213e7044d0bc7ce4b0d3fe6a5..66f9a88f9c128d64819a4424ab79e7de0d440138 100644
--- a/include/configs/TQM855M.h
+++ b/include/configs/TQM855M.h
@@ -129,7 +129,6 @@
 #define CONFIG_CMD_ASKENV
 #define CONFIG_CMD_DATE
 #define CONFIG_CMD_DHCP
-#define CONFIG_CMD_ELF
 #define CONFIG_CMD_EXT2
 #define CONFIG_CMD_EEPROM
 #define CONFIG_CMD_IDE
diff --git a/include/configs/TQM860L.h b/include/configs/TQM860L.h
index bf3a25b99335eb6c674129b158610c6576a9ed18..3e20c7161d19f0a34b87e927e964c4c2a677565c 100644
--- a/include/configs/TQM860L.h
+++ b/include/configs/TQM860L.h
@@ -100,7 +100,6 @@
 #define CONFIG_CMD_ASKENV
 #define CONFIG_CMD_DATE
 #define CONFIG_CMD_DHCP
-#define CONFIG_CMD_ELF
 #define CONFIG_CMD_EXT2
 #define CONFIG_CMD_IDE
 #define CONFIG_CMD_JFFS2
diff --git a/include/configs/TQM860M.h b/include/configs/TQM860M.h
index 47e5c6cae19ede86cc33bfedc35ef7a31b399c1e..be1cd3adc5acf4f83af3dd638166efdacf3757c9 100644
--- a/include/configs/TQM860M.h
+++ b/include/configs/TQM860M.h
@@ -100,7 +100,6 @@
 #define CONFIG_CMD_ASKENV
 #define CONFIG_CMD_DATE
 #define CONFIG_CMD_DHCP
-#define CONFIG_CMD_ELF
 #define CONFIG_CMD_EXT2
 #define CONFIG_CMD_IDE
 #define CONFIG_CMD_JFFS2
diff --git a/include/configs/TQM862L.h b/include/configs/TQM862L.h
index fa892a9152c12d8bb52db7f98967a6dc2733901f..f07b903314ebf716b1077dcfa7376351853823ef 100644
--- a/include/configs/TQM862L.h
+++ b/include/configs/TQM862L.h
@@ -103,7 +103,6 @@
 #define CONFIG_CMD_ASKENV
 #define CONFIG_CMD_DATE
 #define CONFIG_CMD_DHCP
-#define CONFIG_CMD_ELF
 #define CONFIG_CMD_EXT2
 #define CONFIG_CMD_IDE
 #define CONFIG_CMD_JFFS2
diff --git a/include/configs/TQM862M.h b/include/configs/TQM862M.h
index 13319f2cfb1c35ed676487a4769d446f5b7fb2dc..c887a397009993d80a648e5a3c25e48778aa23f8 100644
--- a/include/configs/TQM862M.h
+++ b/include/configs/TQM862M.h
@@ -103,7 +103,6 @@
 #define CONFIG_CMD_ASKENV
 #define CONFIG_CMD_DATE
 #define CONFIG_CMD_DHCP
-#define CONFIG_CMD_ELF
 #define CONFIG_CMD_EXT2
 #define CONFIG_CMD_IDE
 #define CONFIG_CMD_JFFS2
diff --git a/include/configs/TQM866M.h b/include/configs/TQM866M.h
index 0e378f29db8b23ff96c1dc90429c379b1747bd5b..a037b4fce5ce609ab00cd3ae624f0e916eaaa2a1 100644
--- a/include/configs/TQM866M.h
+++ b/include/configs/TQM866M.h
@@ -143,7 +143,6 @@
 #define CONFIG_CMD_ASKENV
 #define CONFIG_CMD_DHCP
 #define CONFIG_CMD_EEPROM
-#define CONFIG_CMD_ELF
 #define CONFIG_CMD_EXT2
 #define CONFIG_CMD_IDE
 #define CONFIG_CMD_JFFS2
diff --git a/include/configs/UCP1020.h b/include/configs/UCP1020.h
index 629be997b6055c533d58ea059ef3d28d34221152..08011172415c4d68ee8df02b78b9a8171dbc8706 100644
--- a/include/configs/UCP1020.h
+++ b/include/configs/UCP1020.h
@@ -494,7 +494,6 @@
 #define CONFIG_CMD_I2C
 #define CONFIG_CMD_MII
 #define CONFIG_CMD_DATE
-#define CONFIG_CMD_ELF
 #define CONFIG_CMD_I2C
 #define CONFIG_CMD_IRQ
 #define CONFIG_CMD_MII
diff --git a/include/configs/VCMA9.h b/include/configs/VCMA9.h
index 5b2e09222bf46a74bf0a429a644e80faf951682d..bfcfb405fad0aecfd5ab58f8b70d964d91795024 100644
--- a/include/configs/VCMA9.h
+++ b/include/configs/VCMA9.h
@@ -55,7 +55,6 @@
 #define CONFIG_CMD_USB
 #define CONFIG_CMD_REGINFO
 #define CONFIG_CMD_DATE
-#define CONFIG_CMD_ELF
 #define CONFIG_CMD_DHCP
 #define CONFIG_CMD_PING
 #define CONFIG_CMD_BSP
diff --git a/include/configs/VOM405.h b/include/configs/VOM405.h
index ddd6377516a6fa8e51efeeebc9389228c2b228f8..99ee78b885b6b431c013826f53262ccefdd96f98 100644
--- a/include/configs/VOM405.h
+++ b/include/configs/VOM405.h
@@ -62,7 +62,6 @@
 #define CONFIG_CMD_DHCP
 #define CONFIG_CMD_BSP
 #define CONFIG_CMD_IRQ
-#define CONFIG_CMD_ELF
 #define CONFIG_CMD_I2C
 #define CONFIG_CMD_MII
 #define CONFIG_CMD_PING
diff --git a/include/configs/amcc-common.h b/include/configs/amcc-common.h
index 37dac7d13112aca5ccc0e3ea5499ff068e99c6b3..c5ef6509507dc474f649c3fda413236ae04da8d8 100644
--- a/include/configs/amcc-common.h
+++ b/include/configs/amcc-common.h
@@ -60,7 +60,6 @@
 #define CONFIG_CMD_DHCP
 #define CONFIG_CMD_DIAG
 #define CONFIG_CMD_EEPROM
-#define CONFIG_CMD_ELF
 #define CONFIG_CMD_GREPENV
 #define CONFIG_CMD_I2C
 #define CONFIG_CMD_IRQ
diff --git a/include/configs/arcangel4.h b/include/configs/arcangel4.h
index a342d7ef92423f6885f804a356eadbae370fa984..63f61ae4679576c38016d5d73b34c4102325818d 100644
--- a/include/configs/arcangel4.h
+++ b/include/configs/arcangel4.h
@@ -41,7 +41,6 @@
 /*
  * Command line configuration
  */
-#define CONFIG_CMD_ELF
 
 #define CONFIG_OF_LIBFDT
 
diff --git a/include/configs/astro_mcf5373l.h b/include/configs/astro_mcf5373l.h
index 1c3a1c978c13f445ce025d28ff207f15753574eb..860615119cbc6fd58f2003b4677cfdf25a0344bf 100644
--- a/include/configs/astro_mcf5373l.h
+++ b/include/configs/astro_mcf5373l.h
@@ -61,7 +61,6 @@
 
 #define CONFIG_CMD_CACHE
 #define CONFIG_CMD_DATE
-#define CONFIG_CMD_ELF
 #define CONFIG_CMD_I2C
 #if ENABLE_JFFS
 #define CONFIG_CMD_JFFS2
diff --git a/include/configs/axs101.h b/include/configs/axs101.h
index 7cb885323aa17207f72d2331d799ec95a3d44e89..450291c6c011659be6bc3704df056438ff0b5c93 100644
--- a/include/configs/axs101.h
+++ b/include/configs/axs101.h
@@ -123,7 +123,6 @@
  */
 #define CONFIG_CMD_DHCP
 #define CONFIG_CMD_EEPROM
-#define CONFIG_CMD_ELF
 #define CONFIG_CMD_FAT
 #define CONFIG_CMD_I2C
 #define CONFIG_CMD_MMC
diff --git a/include/configs/bf537-minotaur.h b/include/configs/bf537-minotaur.h
index 6674d28605b15c900144e8102dd497397b84b80b..c57c8628bf904fec9cd0b3fd767c688656d13fe6 100644
--- a/include/configs/bf537-minotaur.h
+++ b/include/configs/bf537-minotaur.h
@@ -153,7 +153,6 @@
 #define CONFIG_CMD_BOOTLDR
 #define CONFIG_CMD_CACHE
 #define CONFIG_CMD_DATE
-#define CONFIG_CMD_ELF
 #define CONFIG_CMD_I2C
 #define CONFIG_CMD_SF
 
diff --git a/include/configs/bf537-srv1.h b/include/configs/bf537-srv1.h
index 15d912e89ad26b7a235dff5ad143a515990f6b29..90aeeec5d1e5744d973b233ab78618b51e6dfc98 100644
--- a/include/configs/bf537-srv1.h
+++ b/include/configs/bf537-srv1.h
@@ -152,7 +152,6 @@
 #define CONFIG_CMD_BOOTLDR
 #define CONFIG_CMD_CACHE
 #define CONFIG_CMD_DATE
-#define CONFIG_CMD_ELF
 #define CONFIG_CMD_I2C
 #define CONFIG_CMD_SF
 
diff --git a/include/configs/bfin_adi_common.h b/include/configs/bfin_adi_common.h
index 7b2faf29cbee061833a5d45bd0aa78749ad76197..a07505041ec8723da34f76d32d8f9a839d165f66 100644
--- a/include/configs/bfin_adi_common.h
+++ b/include/configs/bfin_adi_common.h
@@ -80,7 +80,6 @@
 # define CONFIG_CMD_BOOTLDR
 # define CONFIG_CMD_CACHE
 # define CONFIG_CMD_CPLBINFO
-# define CONFIG_CMD_ELF
 # define CONFIG_CMD_GPIO
 # define CONFIG_CMD_KGDB
 # define CONFIG_CMD_LDRINFO
diff --git a/include/configs/blackstamp.h b/include/configs/blackstamp.h
index c0197ca0e6295ffc1d1888b3d797eb8727968405..3b7a47f8d6c5aaffc9d6e140b5524679210bde6e 100644
--- a/include/configs/blackstamp.h
+++ b/include/configs/blackstamp.h
@@ -117,7 +117,6 @@
 #define CONFIG_CMD_CPLBINFO
 #define CONFIG_CMD_DATE
 #define CONFIG_CMD_SF
-#define CONFIG_CMD_ELF
 
 #define CONFIG_BOOTDELAY     5
 #define CONFIG_BOOTCOMMAND   "run ramboot"
diff --git a/include/configs/blackvme.h b/include/configs/blackvme.h
index 4752b072a1032a3844ef621082e5bd4a77d2cdb7..5b15e0efba75e3740b9a583b242d94786f13046f 100644
--- a/include/configs/blackvme.h
+++ b/include/configs/blackvme.h
@@ -156,7 +156,6 @@
 #define CONFIG_CMD_CACHE
 #define CONFIG_CMD_CPLBINFO
 #define CONFIG_CMD_SF
-#define CONFIG_CMD_ELF
 
 /*
  * Default: boot from SPI flash.
diff --git a/include/configs/controlcenterd.h b/include/configs/controlcenterd.h
index 9a1f6d0782c6b93f760a326832b7472996a25476..c87904885327449322a5b51d96a66eb9cec96640 100644
--- a/include/configs/controlcenterd.h
+++ b/include/configs/controlcenterd.h
@@ -388,7 +388,6 @@
 
 #ifndef CONFIG_TRAILBLAZER
 
-#define CONFIG_CMD_ELF
 #define CONFIG_CMD_ERRATA
 #define CONFIG_CMD_EXT2
 #define CONFIG_CMD_FAT
diff --git a/include/configs/corenet_ds.h b/include/configs/corenet_ds.h
index 2919220f71510b18040c945fb238c64d45211d60..878fda2f807cc18a3ad90376deb629ab9c0de207 100644
--- a/include/configs/corenet_ds.h
+++ b/include/configs/corenet_ds.h
@@ -628,7 +628,6 @@
  * Command line configuration.
  */
 #define CONFIG_CMD_DHCP
-#define CONFIG_CMD_ELF
 #define CONFIG_CMD_ERRATA
 #define CONFIG_CMD_GREPENV
 #define CONFIG_CMD_IRQ
diff --git a/include/configs/dbau1x00.h b/include/configs/dbau1x00.h
index 46e3a6ce38c483056cfb7710fdfbd25050bf4c24..3be44d40868b123ce90eb790cd148c5f834193ed 100644
--- a/include/configs/dbau1x00.h
+++ b/include/configs/dbau1x00.h
@@ -75,7 +75,6 @@
  * Command line configuration.
  */
 #undef CONFIG_CMD_BEDBUG
-#undef CONFIG_CMD_ELF
 #undef CONFIG_CMD_FAT
 #undef CONFIG_CMD_MII
 
diff --git a/include/configs/digsy_mtc.h b/include/configs/digsy_mtc.h
index a7af35196ba853c63b5d5b70563d085a6637e19b..02b8f91d339a3b4cbe86ca0cf1b97ba04abec7d9 100644
--- a/include/configs/digsy_mtc.h
+++ b/include/configs/digsy_mtc.h
@@ -107,7 +107,6 @@
 #define CONFIG_CMD_DHCP
 #define CONFIG_CMD_DIAG
 #define CONFIG_CMD_EEPROM
-#define CONFIG_CMD_ELF
 #define CONFIG_CMD_EXT2
 #define CONFIG_CMD_FAT
 #define CONFIG_CMD_I2C
diff --git a/include/configs/dlvision-10g.h b/include/configs/dlvision-10g.h
index e6bfe58e98dfbf2755fd685c075c01dd445bc764..e39f8ba7afb7d8939a1e7f36d15f17a0ceb96984 100644
--- a/include/configs/dlvision-10g.h
+++ b/include/configs/dlvision-10g.h
@@ -68,7 +68,6 @@
 #undef CONFIG_CMD_DHCP
 #undef CONFIG_CMD_DIAG
 #undef CONFIG_CMD_EEPROM
-#undef CONFIG_CMD_ELF
 #undef CONFIG_CMD_I2C
 #undef CONFIG_CMD_IRQ
 
diff --git a/include/configs/dlvision.h b/include/configs/dlvision.h
index 0299d16e83246cb5184d2eb1cf7e1204c5753853..3c0553489e33253e4d52420b769e1a88455a5900 100644
--- a/include/configs/dlvision.h
+++ b/include/configs/dlvision.h
@@ -64,7 +64,6 @@
 #undef CONFIG_CMD_DHCP
 #undef CONFIG_CMD_DIAG
 #undef CONFIG_CMD_EEPROM
-#undef CONFIG_CMD_ELF
 #undef CONFIG_CMD_I2C
 #undef CONFIG_CMD_IRQ
 
diff --git a/include/configs/io.h b/include/configs/io.h
index f5b09b616236fe6ee6211771dacfa092e6db812a..7d863fafde0871d1d8168199abaf68db90e7ef16 100644
--- a/include/configs/io.h
+++ b/include/configs/io.h
@@ -68,7 +68,6 @@
 #undef CONFIG_CMD_DHCP
 #undef CONFIG_CMD_DIAG
 #undef CONFIG_CMD_EEPROM
-#undef CONFIG_CMD_ELF
 #undef CONFIG_CMD_I2C
 #undef CONFIG_CMD_IRQ
 
diff --git a/include/configs/iocon.h b/include/configs/iocon.h
index f7ae6631ccaae267f979250652392217b3825c2f..a4d05e559b2a5fb0c7d9cae938f1826ae39d0b41 100644
--- a/include/configs/iocon.h
+++ b/include/configs/iocon.h
@@ -64,7 +64,6 @@
 #define CONFIG_CMD_CACHE
 #define CONFIG_CMD_FPGAD
 #undef CONFIG_CMD_EEPROM
-#undef CONFIG_CMD_ELF
 #undef CONFIG_CMD_I2C
 #undef CONFIG_CMD_IRQ
 
diff --git a/include/configs/km/km_arm.h b/include/configs/km/km_arm.h
index 15fca1abe614dd13cf38de6bbf27f9501e952621..5e0f483e4758f25f5ac26960626af2c9cf913afb 100644
--- a/include/configs/km/km_arm.h
+++ b/include/configs/km/km_arm.h
@@ -122,7 +122,6 @@
 /*
  * Commands configuration
  */
-#define CONFIG_CMD_ELF
 #define CONFIG_CMD_MTDPARTS
 
 /*
diff --git a/include/configs/lsxl.h b/include/configs/lsxl.h
index 18372584fb5f18dfe37f1c6d4926e0fe01ae2f72..a57e328dfda3ce4c4303d1bfcb5ae3ec6ea64cd1 100644
--- a/include/configs/lsxl.h
+++ b/include/configs/lsxl.h
@@ -55,7 +55,6 @@
  */
 #define CONFIG_CMD_BOOTZ
 #define CONFIG_CMD_DHCP
-#define CONFIG_CMD_ELF
 #define CONFIG_CMD_ENV
 #define CONFIG_CMD_EXT2
 #define CONFIG_CMD_FAT
diff --git a/include/configs/lwmon5.h b/include/configs/lwmon5.h
index 26136a52cee2f6e68e3cf1266e4d6c32c401c423..2d93d44a3a7657f81ea63351eb4b8162a1e7b3ca 100644
--- a/include/configs/lwmon5.h
+++ b/include/configs/lwmon5.h
@@ -415,7 +415,6 @@
 #define CONFIG_CMD_DHCP
 #define CONFIG_CMD_DIAG
 #define CONFIG_CMD_EEPROM
-#define CONFIG_CMD_ELF
 #define CONFIG_CMD_FAT
 #define CONFIG_CMD_I2C
 #define CONFIG_CMD_IRQ
diff --git a/include/configs/malta.h b/include/configs/malta.h
index 2f33f63b1cf5441b09e6007d911e72b2b709ddff..4d3751a10c3350dd9200d504e28e90c10c89d0e1 100644
--- a/include/configs/malta.h
+++ b/include/configs/malta.h
@@ -122,7 +122,6 @@
  */
 #define CONFIG_CMD_DATE
 #define CONFIG_CMD_DHCP
-#define CONFIG_CMD_ELF
 #define CONFIG_CMD_IDE
 #define CONFIG_CMD_PCI
 #define CONFIG_CMD_PING
diff --git a/include/configs/mecp5123.h b/include/configs/mecp5123.h
index a8b4b24470a4cdc52c31fb80d28bb705154f36a1..84f1a4008499a237710e7cc26fb347c3cb0279fb 100644
--- a/include/configs/mecp5123.h
+++ b/include/configs/mecp5123.h
@@ -309,7 +309,6 @@
 #undef CONFIG_CMD_EXT2
 #define CONFIG_CMD_FAT
 #define CONFIG_CMD_JFFS2
-#define CONFIG_CMD_ELF
 #define CONFIG_DOS_PARTITION
 
 /*
diff --git a/include/configs/motionpro.h b/include/configs/motionpro.h
index 3b97d91e582c4e8b7285790d2e0486f85ee90363..6eb6e518f0cf42e2a857de56a17ab759007c741e 100644
--- a/include/configs/motionpro.h
+++ b/include/configs/motionpro.h
@@ -41,7 +41,6 @@
 #define CONFIG_CMD_DHCP
 #define CONFIG_CMD_DTT
 #define CONFIG_CMD_EEPROM
-#define CONFIG_CMD_ELF
 #define CONFIG_CMD_FAT
 #define CONFIG_CMD_I2C
 #define CONFIG_CMD_IDE
diff --git a/include/configs/munices.h b/include/configs/munices.h
index b1b6acd448aaccc86fa82353443fb6c85adb87f8..072bd958a0db9c65741b60fa48b135b89048b98e 100644
--- a/include/configs/munices.h
+++ b/include/configs/munices.h
@@ -28,7 +28,6 @@
  * Command line configuration.
  */
 #define CONFIG_CMD_ASKENV
-#define CONFIG_CMD_ELF
 #define CONFIG_CMD_IMMAP
 #define CONFIG_CMD_PING
 #define CONFIG_CMD_REGINFO
diff --git a/include/configs/neo.h b/include/configs/neo.h
index 33cee43097e532ae02adad53256cff6d6a6e08e0..f1783662a47d9cffd9c09b46b10c60d2f027622f 100644
--- a/include/configs/neo.h
+++ b/include/configs/neo.h
@@ -67,7 +67,6 @@
 #undef CONFIG_CMD_DHCP
 #undef CONFIG_CMD_DIAG
 #undef CONFIG_CMD_EEPROM
-#undef CONFIG_CMD_ELF
 #undef CONFIG_CMD_I2C
 #undef CONFIG_CMD_IRQ
 
diff --git a/include/configs/nitrogen6x.h b/include/configs/nitrogen6x.h
index b1137713e1ea8cdb5b39fc7bb8ae47fe570253b4..9160971a800b58fcf963a6aec8979a6b18d7293e 100644
--- a/include/configs/nitrogen6x.h
+++ b/include/configs/nitrogen6x.h
@@ -330,7 +330,6 @@
 #define CONFIG_PCIE_IMX
 #endif
 
-#define CONFIG_CMD_ELF
 
 #define CONFIG_USB_GADGET
 #define CONFIG_CMD_USB_MASS_STORAGE
diff --git a/include/configs/openrisc-generic.h b/include/configs/openrisc-generic.h
index 23929c2746e2b020989113c536d1a3241dd7c954..d53e4196781c6da28a0a208884baa616868dde84 100644
--- a/include/configs/openrisc-generic.h
+++ b/include/configs/openrisc-generic.h
@@ -115,7 +115,6 @@
  * Command line configuration.
  */
 #define CONFIG_CMD_IRQ
-#define CONFIG_CMD_ELF
 #define CONFIG_CMD_BSP
 
 #define CONFIG_CMD_MII
diff --git a/include/configs/origen.h b/include/configs/origen.h
index 21d8e7ac48bd85de8e520516f454ad6ced7a1e21..ef80bf60cab0ea118ca751fdda54c2ba0fda5a20 100644
--- a/include/configs/origen.h
+++ b/include/configs/origen.h
@@ -51,7 +51,6 @@
 #define S5P_CHECK_LPA			0xABAD0000
 
 #undef CONFIG_CMD_PING
-#define CONFIG_CMD_ELF
 #define CONFIG_CMD_DHCP
 #define CONFIG_CMD_EXT2
 #define CONFIG_CMD_FS_GENERIC
diff --git a/include/configs/p1_p2_rdb_pc.h b/include/configs/p1_p2_rdb_pc.h
index af89e6b3b1681bc85c7d5f8003cb202b42508076..362cf3081769d672f34714d8795b5e40aa28c9f9 100644
--- a/include/configs/p1_p2_rdb_pc.h
+++ b/include/configs/p1_p2_rdb_pc.h
@@ -895,7 +895,6 @@
 #define CONFIG_CMD_I2C
 #define CONFIG_CMD_MII
 #define CONFIG_CMD_DATE
-#define CONFIG_CMD_ELF
 #define CONFIG_CMD_REGINFO
 
 /*
diff --git a/include/configs/p1_twr.h b/include/configs/p1_twr.h
index e9cc274c7336ea3c5ef0f71399d0ed265c1f1b84..588a6c5ebf820ebd3e051992f4482365d2343fae 100644
--- a/include/configs/p1_twr.h
+++ b/include/configs/p1_twr.h
@@ -425,7 +425,6 @@ extern unsigned long get_board_sys_clk(unsigned long dummy);
 #define CONFIG_CMD_PING
 #define CONFIG_CMD_I2C
 #define CONFIG_CMD_MII
-#define CONFIG_CMD_ELF
 #define CONFIG_CMD_REGINFO
 
 /*
diff --git a/include/configs/pb1x00.h b/include/configs/pb1x00.h
index 516d38144a07dd6d3aa9cccfa40375e78f9f6e12..41b7393c0ef300e811ed4af3a6b12b4386cb8c96 100644
--- a/include/configs/pb1x00.h
+++ b/include/configs/pb1x00.h
@@ -168,13 +168,11 @@
  * Command line configuration.
  */
 #define CONFIG_CMD_DHCP
-#define CONFIG_CMD_ELF
 #define CONFIG_CMD_MII
 #define CONFIG_CMD_PING
 
 #undef CONFIG_CMD_FAT
 #undef CONFIG_CMD_IDE
-#undef CONFIG_CMD_ELF
 #undef CONFIG_CMD_BEDBUG
 
 #endif	/* __CONFIG_H */
diff --git a/include/configs/pcm052.h b/include/configs/pcm052.h
index 150698ecaa952d70d52a54aeac00583f296323b0..18f45af1fa768fe0f2c32b0600ffe82ee40502c6 100644
--- a/include/configs/pcm052.h
+++ b/include/configs/pcm052.h
@@ -216,9 +216,6 @@
 		"nand erase.part ramdisk; " \
 		"nand write ${ram_addr} ramdisk ${filesize}; fi\0"
 
-/* miscellaneous commands */
-#define CONFIG_CMD_ELF
-
 /* Miscellaneous configurable options */
 #define CONFIG_SYS_LONGHELP		/* undef to save memory */
 #define CONFIG_SYS_HUSH_PARSER		/* use "hush" command parser */
diff --git a/include/configs/qemu-mips.h b/include/configs/qemu-mips.h
index a7ec8f54c5585e142e59f680d5498d086647d647..9395bdad07225afb574fe80823a7fd33c7800a92 100644
--- a/include/configs/qemu-mips.h
+++ b/include/configs/qemu-mips.h
@@ -45,7 +45,6 @@
 /*
  * Command line configuration.
  */
-#define CONFIG_CMD_ELF
 #define CONFIG_CMD_FAT
 #define CONFIG_CMD_EXT2
 #define CONFIG_CMD_DHCP
diff --git a/include/configs/qemu-mips64.h b/include/configs/qemu-mips64.h
index 4de15bfb75611f5fbda52214ea88136f9b03ed52..53ff80232e209bed7268657c317212d7e9191258 100644
--- a/include/configs/qemu-mips64.h
+++ b/include/configs/qemu-mips64.h
@@ -45,7 +45,6 @@
 /*
  * Command line configuration.
  */
-#define CONFIG_CMD_ELF
 #define CONFIG_CMD_FAT
 #define CONFIG_CMD_EXT2
 #define CONFIG_CMD_DHCP
diff --git a/include/configs/qemu-ppce500.h b/include/configs/qemu-ppce500.h
index 45f5e7821574368ff20fad6666008d2381753bce..5cd090614dd5495d7399ccd63f64c029bd5a67ec 100644
--- a/include/configs/qemu-ppce500.h
+++ b/include/configs/qemu-ppce500.h
@@ -158,7 +158,6 @@ extern unsigned long long get_phys_ccsrbar_addr_early(void);
  * Command line configuration.
  */
 #define CONFIG_CMD_DHCP
-#define CONFIG_CMD_ELF
 #define CONFIG_CMD_BOOTZ
 #define CONFIG_CMD_GREPENV
 #define CONFIG_CMD_IRQ
diff --git a/include/configs/sandbox.h b/include/configs/sandbox.h
index 32e3a9ba559476b5e1bf8f482c9ae0360aaf0182..c96ec905db9136ed2cd48288ebfed5e1551d1079 100644
--- a/include/configs/sandbox.h
+++ b/include/configs/sandbox.h
@@ -141,7 +141,6 @@
 #define CONFIG_IP_DEFRAG
 
 /* Can't boot elf images */
-#undef CONFIG_CMD_ELF
 
 #define CONFIG_CMD_HASH
 #define CONFIG_HASH_VERIFY
diff --git a/include/configs/sbc8548.h b/include/configs/sbc8548.h
index 0717156c6bd1331a9c5e51214a253c5666c69672..87e562e171be50f652f803da0a4b70b6ae858cbd 100644
--- a/include/configs/sbc8548.h
+++ b/include/configs/sbc8548.h
@@ -539,7 +539,6 @@
 #define CONFIG_CMD_PING
 #define CONFIG_CMD_I2C
 #define CONFIG_CMD_MII
-#define CONFIG_CMD_ELF
 #define CONFIG_CMD_REGINFO
 
 #if defined(CONFIG_PCI)
diff --git a/include/configs/smdk2410.h b/include/configs/smdk2410.h
index a6bfa76bf05ebcfe821c3d21bf19e650cd907441..fb3850259ccacd674d185f31e4559b608781a66d 100644
--- a/include/configs/smdk2410.h
+++ b/include/configs/smdk2410.h
@@ -79,7 +79,6 @@
 #define CONFIG_CMD_CACHE
 #define CONFIG_CMD_DATE
 #define CONFIG_CMD_DHCP
-#define CONFIG_CMD_ELF
 #define CONFIG_CMD_NAND
 #define CONFIG_CMD_PING
 #define CONFIG_CMD_REGINFO
diff --git a/include/configs/smdkc100.h b/include/configs/smdkc100.h
index 4ec9c650dd5edc0fbc617344e74c16126906786a..1d9ce92746bc0d7fd51d2503a3be8f9ea0382a59 100644
--- a/include/configs/smdkc100.h
+++ b/include/configs/smdkc100.h
@@ -68,7 +68,6 @@
 #define CONFIG_CMD_CACHE
 #define CONFIG_CMD_REGINFO
 #define CONFIG_CMD_ONENAND
-#define CONFIG_CMD_ELF
 #define CONFIG_CMD_FAT
 #define CONFIG_CMD_MTDPARTS
 
diff --git a/include/configs/smdkv310.h b/include/configs/smdkv310.h
index dbba88b09c895d679a1f3b1df98ed38dc79161a3..217cfc04ac7420ee4a4d3c0791c05c6309ded62e 100644
--- a/include/configs/smdkv310.h
+++ b/include/configs/smdkv310.h
@@ -43,7 +43,6 @@
 #define CONFIG_ENV_OVERWRITE
 
 #define CONFIG_CMD_PING
-#define CONFIG_CMD_ELF
 #define CONFIG_CMD_DHCP
 
 /* MMC SPL */
diff --git a/include/configs/t4qds.h b/include/configs/t4qds.h
index d3138feb70af9ff048cea69a5263b35185dcac15..26028df21a9e90c111ee32a8d9e1f8809040b7bf 100644
--- a/include/configs/t4qds.h
+++ b/include/configs/t4qds.h
@@ -273,7 +273,6 @@
  * Command line configuration.
  */
 #define CONFIG_CMD_DHCP
-#define CONFIG_CMD_ELF
 #define CONFIG_CMD_ERRATA
 #define CONFIG_CMD_GREPENV
 #define CONFIG_CMD_IRQ
diff --git a/include/configs/tb100.h b/include/configs/tb100.h
index 41c2c729502bb7e81acda44af6846f9ff71e7b12..e3c41ef4bd94a585faeddd9deaa4ac2cb3b219ac 100644
--- a/include/configs/tb100.h
+++ b/include/configs/tb100.h
@@ -69,7 +69,6 @@
  * Command line configuration
  */
 #define CONFIG_CMD_DHCP
-#define CONFIG_CMD_ELF
 #define CONFIG_CMD_PING
 
 #define CONFIG_OF_LIBFDT
diff --git a/include/configs/vct.h b/include/configs/vct.h
index 80f6a60d84f908f016bb1f5598604cb5ccfe08ec..92726c8214be199f39e6102cae28f8620690a4b6 100644
--- a/include/configs/vct.h
+++ b/include/configs/vct.h
@@ -84,7 +84,6 @@
  * Commands
  */
 #define CONFIG_CMD_DHCP
-#define CONFIG_CMD_ELF
 #define CONFIG_CMD_EEPROM
 #define CONFIG_CMD_I2C
 
@@ -288,7 +287,6 @@ int vct_gpio_get(int pin);
 #undef CONFIG_CMD_DHCP
 #undef CONFIG_CMD_EEPROM
 #undef CONFIG_CMD_EEPROM
-#undef CONFIG_CMD_ELF
 #undef CONFIG_CMD_FAT
 #undef CONFIG_CMD_I2C
 #undef CONFIG_CMD_I2C
diff --git a/include/configs/vme8349.h b/include/configs/vme8349.h
index bc4a99838391e3b62930d751dd4fb8dcfbb09afd..a6f5d6a4ea3290fd57f979afb87e2b4907ec8e8c 100644
--- a/include/configs/vme8349.h
+++ b/include/configs/vme8349.h
@@ -373,7 +373,6 @@
     #undef CONFIG_CMD_ENV
 #endif
 
-#define CONFIG_CMD_ELF
 /* Pass Ethernet MAC to VxWorks */
 #define CONFIG_SYS_VXWORKS_MAC_PTR	0x000043f0
 
diff --git a/include/configs/x86-common.h b/include/configs/x86-common.h
index 44765f64410be4fe7a4590e28f82cc1552ca38e7..faadab83ce6e407a8a9ffc1e0b98da96d5de0ebb 100644
--- a/include/configs/x86-common.h
+++ b/include/configs/x86-common.h
@@ -115,7 +115,6 @@
 #define CONFIG_CMD_EXT2
 
 #define CONFIG_CMD_ZBOOT
-#define CONFIG_CMD_ELF
 
 #define CONFIG_BOOTARGS		\
 	"root=/dev/sdb3 init=/sbin/init rootwait ro"
diff --git a/include/configs/xilinx-ppc.h b/include/configs/xilinx-ppc.h
index 309d68d281335ed6431de6e58a1c0d11e0f8da05..6bd6be86e1a91cff97003070e5d0af76409783cd 100644
--- a/include/configs/xilinx-ppc.h
+++ b/include/configs/xilinx-ppc.h
@@ -29,7 +29,6 @@
 #define CONFIG_CMD_ASKENV
 #define CONFIG_CMD_CACHE
 #define CONFIG_CMD_DIAG
-#define CONFIG_CMD_ELF
 #define CONFIG_CMD_IRQ
 #define CONFIG_CMD_REGINFO
 #undef CONFIG_CMD_JFFS2
diff --git a/include/configs/xilinx_zynqmp.h b/include/configs/xilinx_zynqmp.h
index da87188e84a2ccad0cb8eddf717ca35b16bd4dbb..ed09b7f67e73dc662870a43f1b67b932b662a995 100644
--- a/include/configs/xilinx_zynqmp.h
+++ b/include/configs/xilinx_zynqmp.h
@@ -73,7 +73,6 @@
 #define CONFIG_CMD_FAT
 #define CONFIG_CMD_FS_GENERIC
 #define CONFIG_DOS_PARTITION
-#define CONFIG_CMD_ELF
 #define CONFIG_MP
 
 #define CONFIG_CMD_MII
diff --git a/include/configs/xpedite1000.h b/include/configs/xpedite1000.h
index 4fafb5a77b3e5832b6034993ccd4fa83e08f50a3..37a31c4797f94d982472d5cae569b699a11353b2 100644
--- a/include/configs/xpedite1000.h
+++ b/include/configs/xpedite1000.h
@@ -191,7 +191,6 @@ extern void out32(unsigned int, unsigned long);
 #define CONFIG_CMD_DATE
 #define CONFIG_CMD_DHCP
 #define CONFIG_CMD_EEPROM
-#define CONFIG_CMD_ELF
 #define CONFIG_CMD_I2C
 #define CONFIG_CMD_IRQ
 #define CONFIG_CMD_JFFS2
diff --git a/include/configs/xpedite517x.h b/include/configs/xpedite517x.h
index b5d1126d5978868564475fd1594cfe47ab1386b7..51781daa7f08c41d9c1e7df062dac0141e2b5790 100644
--- a/include/configs/xpedite517x.h
+++ b/include/configs/xpedite517x.h
@@ -532,7 +532,6 @@ extern unsigned long get_board_sys_clk(unsigned long dummy);
 #define CONFIG_CMD_DS4510_INFO
 #define CONFIG_CMD_DTT
 #define CONFIG_CMD_EEPROM
-#define CONFIG_CMD_ELF
 #define CONFIG_CMD_I2C
 #define CONFIG_CMD_IRQ
 #define CONFIG_CMD_JFFS2
diff --git a/include/configs/xpedite520x.h b/include/configs/xpedite520x.h
index 34a124c9d9fc5977d34a9c1ca5cf5f186371baa4..e48960b8019564dff022fc6bc9794c8323c65c08 100644
--- a/include/configs/xpedite520x.h
+++ b/include/configs/xpedite520x.h
@@ -315,7 +315,6 @@
 #define CONFIG_CMD_DATE
 #define CONFIG_CMD_DHCP
 #define CONFIG_CMD_EEPROM
-#define CONFIG_CMD_ELF
 #define CONFIG_CMD_I2C
 #define CONFIG_CMD_JFFS2
 #define CONFIG_CMD_MII
diff --git a/include/configs/xpedite537x.h b/include/configs/xpedite537x.h
index 0d2423499d993a203cfcbe12ed2b76ea77f419e6..3645cb28d436a2b9c153b938b362aad42fb07e92 100644
--- a/include/configs/xpedite537x.h
+++ b/include/configs/xpedite537x.h
@@ -387,7 +387,6 @@ extern unsigned long get_board_ddr_clk(unsigned long dummy);
 #define CONFIG_CMD_DS4510_INFO
 #define CONFIG_CMD_DTT
 #define CONFIG_CMD_EEPROM
-#define CONFIG_CMD_ELF
 #define CONFIG_CMD_I2C
 #define CONFIG_CMD_JFFS2
 #define CONFIG_CMD_MII
diff --git a/include/configs/xpedite550x.h b/include/configs/xpedite550x.h
index f30d1996c01b87c2b3f01ea7625941904629dac7..7bf0ccac7fa2d38ff8ff81d40a3edb074041619e 100644
--- a/include/configs/xpedite550x.h
+++ b/include/configs/xpedite550x.h
@@ -371,7 +371,6 @@ extern unsigned long get_board_ddr_clk(unsigned long dummy);
 #define CONFIG_CMD_DHCP
 #define CONFIG_CMD_DTT
 #define CONFIG_CMD_EEPROM
-#define CONFIG_CMD_ELF
 #define CONFIG_CMD_I2C
 #define CONFIG_CMD_JFFS2
 #define CONFIG_CMD_MII
diff --git a/include/configs/zmx25.h b/include/configs/zmx25.h
index 81b9ce40d9e372b5357b397d0ab7a7fd2ba9944d..b7134ebc20d15ea262593f9c501fb8fa451eaaec 100644
--- a/include/configs/zmx25.h
+++ b/include/configs/zmx25.h
@@ -84,7 +84,6 @@
  */
 #define CONFIG_CMD_DHCP
 #define CONFIG_CMD_PING
-#define CONFIG_CMD_ELF
 #define CONFIG_CMD_FAT
 #define CONFIG_CMD_USB
 
diff --git a/include/configs/zynq-common.h b/include/configs/zynq-common.h
index e7ab50ad24c33b0a347cb08a6d9b8dc4f75be348..873c42d3a1c03a9b8fed67af3e1802ca341d4b6b 100644
--- a/include/configs/zynq-common.h
+++ b/include/configs/zynq-common.h
@@ -289,7 +289,6 @@
 /* Boot FreeBSD/vxWorks from an ELF image */
 #if defined(CONFIG_ZYNQ_BOOT_FREEBSD)
 # define CONFIG_API
-# define CONFIG_CMD_ELF
 # define CONFIG_SYS_MMC_MAX_DEVICE	1
 #endif