diff options
author | Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> | 2008-09-10 22:48:05 +0200 |
---|---|---|
committer | Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> | 2008-09-10 22:48:05 +0200 |
commit | b64b775e7546ed138df360ceb3a71ee358cb9a01 (patch) | |
tree | 989bbc258d479cfae5f4db1c1268b646cd4d03d9 /common | |
parent | 8a40fb148efa442d6526eac46a2001e4c64d28ff (diff) |
cmd_mem: Move conditional compilation to Makefile
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Diffstat (limited to 'common')
-rw-r--r-- | common/Makefile | 2 | ||||
-rw-r--r-- | common/cmd_mem.c | 4 |
2 files changed, 1 insertions, 5 deletions
diff --git a/common/Makefile b/common/Makefile index a6fd97e4ba0..8bddf8e89e4 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 672218b9caf..07b08fb0551 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 |