diff --git a/arch/arm/configs/omap3430_sdp3430_per_uart_defconfig b/arch/arm/configs/omap3430_sdp3430_per_uart_defconfig
index 013d00058..445866f66 100644
--- a/arch/arm/configs/omap3430_sdp3430_per_uart_defconfig
+++ b/arch/arm/configs/omap3430_sdp3430_per_uart_defconfig
@@ -1,7 +1,7 @@
 CONFIG_ARCH_OMAP=y
 # CONFIG_OMAP3_COPY_CLOCK_SRAM is not set
 CONFIG_ARM_OPTIMZED_STRING_FUNCTIONS=y
-# CONFIG_CMD_MEMORY is not set
+# CONFIG_COMPILE_MEMORY is not set
 CONFIG_TEXT_BASE=0x40200000
 CONFIG_MEMORY_LAYOUT_FIXED=y
 CONFIG_STACK_BASE=0x87BF7F10
diff --git a/arch/arm/configs/omap3_evm_defconfig b/arch/arm/configs/omap3_evm_defconfig
index 3fe2647fd..90ace31e6 100644
--- a/arch/arm/configs/omap3_evm_defconfig
+++ b/arch/arm/configs/omap3_evm_defconfig
@@ -2,7 +2,7 @@ CONFIG_ARCH_OMAP=y
 # CONFIG_OMAP3_COPY_CLOCK_SRAM is not set
 CONFIG_MACH_OMAP3EVM=y
 CONFIG_AEABI=y
-# CONFIG_CMD_MEMORY is not set
+# CONFIG_COMPILE_MEMORY is not set
 CONFIG_TEXT_BASE=0x40200000
 CONFIG_MEMORY_LAYOUT_FIXED=y
 CONFIG_STACK_BASE=0x87BF7F10
diff --git a/arch/arm/configs/phytec-phycard-omap3_defconfig b/arch/arm/configs/phytec-phycard-omap3_defconfig
index b0378b377..748d04ac0 100644
--- a/arch/arm/configs/phytec-phycard-omap3_defconfig
+++ b/arch/arm/configs/phytec-phycard-omap3_defconfig
@@ -18,7 +18,7 @@ CONFIG_DEFCONFIG_LIST="$ARCH_DEFCONFIG"
 CONFIG_GREGORIAN_CALENDER=y
 CONFIG_HAS_KALLSYMS=y
 CONFIG_HAS_MODULES=y
-CONFIG_CMD_MEMORY=y
+CONFIG_COMPILE_MEMORY=y
 CONFIG_ENV_HANDLING=y
 CONFIG_GENERIC_GPIO=y
 CONFIG_BLOCK=y
diff --git a/arch/arm/configs/tx51stk5_defconfig b/arch/arm/configs/tx51stk5_defconfig
index 6578f4d69..faa4397f1 100644
--- a/arch/arm/configs/tx51stk5_defconfig
+++ b/arch/arm/configs/tx51stk5_defconfig
@@ -18,7 +18,7 @@ CONFIG_ARM_UNWIND=y
 CONFIG_GREGORIAN_CALENDER=y
 CONFIG_HAS_KALLSYMS=y
 CONFIG_HAS_MODULES=y
-CONFIG_CMD_MEMORY=y
+CONFIG_COMPILE_MEMORY=y
 CONFIG_ENV_HANDLING=y
 CONFIG_GENERIC_GPIO=y
 CONFIG_BLOCK=y
diff --git a/commands/Kconfig b/commands/Kconfig
index b0981bfe8..753d4578b 100644
--- a/commands/Kconfig
+++ b/commands/Kconfig
@@ -12,6 +12,11 @@ config HAS_POWEROFF
 
 if COMMAND_SUPPORT
 
+config COMPILE_MEMORY
+	bool
+	help
+	  Turns on compilation of mem.c
+
 menu "Commands"
 
 
@@ -1196,13 +1201,6 @@ endmenu
 
 menu "Memory"
 
-config CMD_MEMORY
-	bool
-	default y
-	help
-	  TODO This is actually not a command, but turns in the /dev/mem device
-	  and common memory options (e.g. range parsing).
-
 config CMD_CRC
 	tristate
 	select CRC32
@@ -1228,7 +1226,7 @@ config CMD_CRC_CMP
 config CMD_MD
 	tristate
 	default y
-	select CMD_MEMORY
+	select COMPILE_MEMORY
 	prompt "md"
 	help
 	  Memory display
@@ -1252,7 +1250,7 @@ config CMD_MD
 config CMD_MEMCMP
 	tristate
 	default y
-	select CMD_MEMORY
+	select COMPILE_MEMORY
 	prompt "memcmp"
 	help
 	  Memory compare
@@ -1274,7 +1272,7 @@ config CMD_MEMCMP
 config CMD_MEMCPY
 	tristate
 	default y
-	select CMD_MEMORY
+	select COMPILE_MEMORY
 	prompt "memcpy"
 	help
 	  Memory copy
@@ -1293,7 +1291,7 @@ config CMD_MEMCPY
 config CMD_MEMSET
 	tristate
 	default y
-	select CMD_MEMORY
+	select COMPILE_MEMORY
 	prompt "memset"
 	help
 	  Memory fill
@@ -1326,7 +1324,7 @@ config CMD_MEMTEST
 
 config CMD_MM
 	tristate
-	select CMD_MEMORY
+	select COMPILE_MEMORY
 	prompt "memory modify (mm)"
 	help
 	  Memory modify with mask
@@ -1344,7 +1342,7 @@ config CMD_MM
 config CMD_MW
 	tristate
 	default y
-	select CMD_MEMORY
+	select COMPILE_MEMORY
 	prompt "mw"
 	help
 	  Memory write
diff --git a/commands/Makefile b/commands/Makefile
index f927d2173..f5aaf1c5b 100644
--- a/commands/Makefile
+++ b/commands/Makefile
@@ -1,4 +1,5 @@
 obj-$(CONFIG_STDDEV)		+= stddev.o
+obj-$(CONFIG_COMPILE_MEMORY)	+= mem.o
 obj-$(CONFIG_CMD_BOOTM)		+= bootm.o
 obj-$(CONFIG_CMD_UIMAGE)	+= uimage.o
 obj-$(CONFIG_CMD_LINUX16)	+= linux16.o
@@ -6,7 +7,6 @@ obj-$(CONFIG_CMD_LOADB)		+= loadb.o
 obj-$(CONFIG_CMD_LOADY)		+= loadxy.o
 obj-$(CONFIG_CMD_LOADS)		+= loads.o
 obj-$(CONFIG_CMD_ECHO)		+= echo.o
-obj-$(CONFIG_CMD_MEMORY)	+= mem.o
 obj-$(CONFIG_CMD_MD)		+= md.o
 obj-$(CONFIG_CMD_MM)		+= mm.o
 obj-$(CONFIG_CMD_MW)		+= mw.o
diff --git a/common/Kconfig b/common/Kconfig
index 0031cc877..20ce60ccd 100644
--- a/common/Kconfig
+++ b/common/Kconfig
@@ -21,9 +21,6 @@ config HAS_KALLSYMS
 config HAS_MODULES
 	bool
 
-config CMD_MEMORY
-	bool
-
 config ENV_HANDLING
 	select CRC32
 	bool