From: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Date: Wed, 10 Sep 2008 20:48:05 +0000 (+0200)
Subject: cmd_mem: Move conditional compilation to Makefile
X-Git-Tag: v2008.10-rc2~9^2^2~4
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=b64b775e7546ed138df360ceb3a71ee358cb9a01;p=oweals%2Fu-boot.git

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 a6fd97e4ba..8bddf8e89e 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 672218b9ca..07b08fb055 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