Merge branch 'u-boot-samsung/master' into 'u-boot-arm/master'

[karo-tx-uboot.git] / include / config_cmd_default.h

diff --git a/include/config_cmd_default.h b/include/config_cmd_default.h
index 0376e44bd367f67a9634dda9e2155a09016e2c1e..73c9544ea0d72e275fe7eb56a50f727f7fed69fe 100644 (file)
--- a/include/config_cmd_default.h
+++ b/include/config_cmd_default.h
@@ -20,21 +20,22 @@
 #define CONFIG_CMD_BOOTD       /* bootd                        */
 #define CONFIG_CMD_CONSOLE     /* coninfo                      */
 #define CONFIG_CMD_ECHO                /* echo arguments               */
-#define CONFIG_CMD_SAVEENV     /* saveenv                      */
-#define CONFIG_CMD_FLASH       /* flinfo, erase, protect       */
+#define CONFIG_CMD_EDITENV     /* editenv                      */
 #define CONFIG_CMD_FPGA                /* FPGA configuration Support   */
 #define CONFIG_CMD_IMI         /* iminfo                       */
+#define CONFIG_CMD_ITEST       /* Integer (and string) test    */
 #ifndef CONFIG_SYS_NO_FLASH
+#define CONFIG_CMD_FLASH       /* flinfo, erase, protect       */
 #define CONFIG_CMD_IMLS                /* List all found images        */
 #endif
-#define CONFIG_CMD_ITEST       /* Integer (and string) test    */
 #define CONFIG_CMD_LOADB       /* loadb                        */
 #define CONFIG_CMD_LOADS       /* loads                        */
-#define CONFIG_CMD_MEMORY      /* md mm nm mw cp cmp crc base loop mtest */
+#define CONFIG_CMD_MEMORY      /* md mm nm mw cp cmp crc base loop */
 #define CONFIG_CMD_MISC                /* Misc functions like sleep etc*/
 #define CONFIG_CMD_NET         /* bootp, tftpboot, rarpboot    */
 #define CONFIG_CMD_NFS         /* NFS support                  */
 #define CONFIG_CMD_RUN         /* run command in env variable  */
+#define CONFIG_CMD_SAVEENV     /* saveenv                      */
 #define CONFIG_CMD_SETGETDCR   /* DCR support on 4xx           */
 #define CONFIG_CMD_SOURCE      /* "source" command support     */
 #define CONFIG_CMD_XIMG                /* Load part of Multi Image     */