summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--common/Makefile2
-rw-r--r--common/cmd_mem.c4
2 files changed, 1 insertions, 5 deletions
diff --git a/common/Makefile b/common/Makefile
index a6fd97e..8bddf8e 100644
--- a/common/Makefile
+++ b/common/Makefile
@@ -113,7 +113,7 @@ COBJS-$(CONFIG_CMD_LICENSE) += cmd_license.o
COBJS-y += cmd_load.o
COBJS-$(CONFIG_LOGBUFFER) += cmd_log.o
COBJS-$(CONFIG_ID_EEPROM) += cmd_mac.o
-COBJS-y += cmd_mem.o
+COBJS-$(CONFIG_CMD_MEMORY) += cmd_mem.o
COBJS-$(CONFIG_CMD_MFSL) += cmd_mfsl.o
COBJS-$(CONFIG_MII) += miiphyutil.o
COBJS-$(CONFIG_CMD_MII) += miiphyutil.o
diff --git a/common/cmd_mem.c b/common/cmd_mem.c
index 672218b..07b08fb 100644
--- a/common/cmd_mem.c
+++ b/common/cmd_mem.c
@@ -37,8 +37,6 @@
#endif
#include <watchdog.h>
-#if defined(CONFIG_CMD_MEMORY)
-
#ifdef CMD_MEM_DEBUG
#define PRINTF(fmt,args...) printf (fmt ,##args)
#else
@@ -1306,5 +1304,3 @@ U_BOOT_CMD(
"srcaddr dstaddr [dstsize]\n"
);
#endif /* CONFIG_CMD_UNZIP */
-
-#endif