diff --git a/common/Kconfig b/common/Kconfig
index f628315dbd..7875e5e2e2 100644
--- a/common/Kconfig
+++ b/common/Kconfig
@@ -19,4 +19,10 @@ config CMD_EXPORTENV
 	help
 	  Export environments.
 
+config CMD_GO
+	bool "Enable go command"
+	default y
+	help
+	  Start an application at a given address.
+
 endmenu
diff --git a/include/config_cmd_defaults.h b/include/config_cmd_defaults.h
index 5761d7c3fd..0ef63eee14 100644
--- a/include/config_cmd_defaults.h
+++ b/include/config_cmd_defaults.h
@@ -9,7 +9,6 @@
 #ifndef _CONFIG_CMD_DEFAULTS_H_
 #define _CONFIG_CMD_DEFAULTS_H_
 
-#define CONFIG_CMD_GO 1
 #define CONFIG_CMD_IMPORTENV 1
 
 #endif