summaryrefslogtreecommitdiffstats
path: root/commands
diff options
context:
space:
mode:
authorHolger Schurig <holgerschurig@gmail.com>2014-05-13 10:28:44 +0200
committerSascha Hauer <s.hauer@pengutronix.de>2014-05-14 10:03:47 +0200
commit07d90fdd3944321189506316f057de7a68fcefae (patch)
treec4095fe4d9b2844191dcd1a494e713ae539b92e3 /commands
parent914a79980f59f3e4cc09e6bb4cb87e818ba1514f (diff)
downloadbarebox-07d90fdd3944321189506316f057de7a68fcefae.tar.gz
barebox-07d90fdd3944321189506316f057de7a68fcefae.tar.xz
commands: CMD_MEMORY -> COMPILE_MEMORY
* CMD_MEMORY was defined both in common/Kconfig and commands/Kconfig * that symbol turned not a command on, but just the compilation of commands/mem.c, so rename it accordingly Signed-off-by: Holger Schurig <holgerschurig@gmail.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'commands')
-rw-r--r--commands/Kconfig24
-rw-r--r--commands/Makefile2
2 files changed, 12 insertions, 14 deletions
diff --git a/commands/Kconfig b/commands/Kconfig
index b0981bfe89..753d4578b4 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 f927d2173d..f5aaf1c5b8 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