diff --git a/README b/README
index f34cffa9c5d130f5d235db74219c5c9d4d240ba9..b25814c638df292553da2dcb10a7510cb3dffedb 100644
--- a/README
+++ b/README
@@ -625,6 +625,7 @@ The following options need to be configured:
 		CONFIG_CMD_BOOTD	  bootd
 		CONFIG_CMD_CACHE	* icache, dcache
 		CONFIG_CMD_CONSOLE	  coninfo
+		CONFIG_CMD_CRC32	* crc32
 		CONFIG_CMD_DATE		* support for RTC, date/time...
 		CONFIG_CMD_DHCP		* DHCP support
 		CONFIG_CMD_DIAG		* Diagnostics
diff --git a/common/cmd_mem.c b/common/cmd_mem.c
index 4b524cfc160396e7b64bc5424cbc4c525dfe8760..4f64bdac5c0bfed84df3d0d09d90ac2cd885e52b 100644
--- a/common/cmd_mem.c
+++ b/common/cmd_mem.c
@@ -1077,6 +1077,8 @@ mod_mem(cmd_tbl_t *cmdtp, int incrflag, int flag, int argc, char * const argv[])
 	return 0;
 }
 
+#ifdef CONFIG_CMD_CRC32
+
 #ifndef CONFIG_CRC32_VERIFY
 
 int do_mem_crc (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
@@ -1161,6 +1163,8 @@ usage:
 }
 #endif	/* CONFIG_CRC32_VERIFY */
 
+#endif
+
 #ifdef CONFIG_CMD_MD5SUM
 int do_md5sum(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 {
@@ -1277,6 +1281,8 @@ U_BOOT_CMD(
 	"[.b, .w, .l] addr1 addr2 count"
 );
 
+#ifdef CONFIG_CMD_CRC32
+
 #ifndef CONFIG_CRC32_VERIFY
 
 U_BOOT_CMD(
@@ -1296,6 +1302,8 @@ U_BOOT_CMD(
 
 #endif	/* CONFIG_CRC32_VERIFY */
 
+#endif
+
 U_BOOT_CMD(
 	base,	2,	1,	do_mem_base,
 	"print or set address offset",
diff --git a/include/config_cmd_defaults.h b/include/config_cmd_defaults.h
index 79c04955f8cad35014a79993a182be74b49d64d6..a55b268b9b37c71fd730416d426602777912d0d1 100644
--- a/include/config_cmd_defaults.h
+++ b/include/config_cmd_defaults.h
@@ -1,7 +1,7 @@
 /*
  * config_cmd_defaults.h - sane defaults for everyone
  *
- * Copyright (c) 2010 Analog Devices Inc.
+ * Copyright (c) 2010-2011 Analog Devices Inc.
  *
  * Licensed under the GPL-2 or later.
  */
@@ -10,6 +10,7 @@
 #define _CONFIG_CMD_DEFAULTS_H_
 
 #define CONFIG_CMD_BOOTM 1
+#define CONFIG_CMD_CRC32 1
 #define CONFIG_CMD_EXPORTENV 1
 #define CONFIG_CMD_GO 1
 #define CONFIG_CMD_IMPORTENV 1