cmd_mem: Move conditional compilation to Makefile

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>

diff --git a/common/Makefile b/common/Makefile
index a6fd97e4ba05aade8b49d4efb9bfe5519b3add67..8bddf8e89e4f32db3ce3de12c69533a681aa861c 100644 (file)
--- 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 672218b9caff8163eb3e570ea5100574581abd5d..07b08fb055155d7efae191f8bf441fa1765bc343 100644 (file)
--- 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