diff --git a/README b/README
index bc3e905828594afa1c311beae8ee484033ae009c..f34cffa9c5d130f5d235db74219c5c9d4d240ba9 100644
--- a/README
+++ b/README
@@ -644,6 +644,7 @@ The following options need to be configured:
 		CONFIG_CMD_FDOS		* Dos diskette Support
 		CONFIG_CMD_FLASH	  flinfo, erase, protect
 		CONFIG_CMD_FPGA		  FPGA device initialization support
+		CONFIG_CMD_GO		* the 'go' command (exec code)
 		CONFIG_CMD_HWFLOW	* RTS/CTS hw flow control
 		CONFIG_CMD_I2C		* I2C serial bus support
 		CONFIG_CMD_IDE		* IDE harddisk support
diff --git a/common/cmd_boot.c b/common/cmd_boot.c
index 7b603d3502f2a7bec3cc111b9490e43dc568b658..0afd93964d7af31dba01ada22b00a429326be1f8 100644
--- a/common/cmd_boot.c
+++ b/common/cmd_boot.c
@@ -28,6 +28,8 @@
 #include <command.h>
 #include <net.h>
 
+#ifdef CONFIG_CMD_GO
+
 /* Allow ports to override the default behavior */
 __attribute__((weak))
 unsigned long do_go_exec (ulong (*entry)(int, char * const []), int argc, char * const argv[])
@@ -67,6 +69,8 @@ U_BOOT_CMD(
 	"      passing 'arg' as arguments"
 );
 
+#endif
+
 U_BOOT_CMD(
 	reset, 1, 0,	do_reset,
 	"Perform RESET of the CPU",
diff --git a/include/config_cmd_defaults.h b/include/config_cmd_defaults.h
index 6adebdbb1fee150dc27575b314703bfb7a1c0749..79c04955f8cad35014a79993a182be74b49d64d6 100644
--- a/include/config_cmd_defaults.h
+++ b/include/config_cmd_defaults.h
@@ -11,6 +11,7 @@
 
 #define CONFIG_CMD_BOOTM 1
 #define CONFIG_CMD_EXPORTENV 1
+#define CONFIG_CMD_GO 1
 #define CONFIG_CMD_IMPORTENV 1
 
 #endif