Merge branch 'test-fboot-support'

[z180-stamp.git] / avr / command_tbl.c

diff --git a/avr/command_tbl.c b/avr/command_tbl.c
index cbd23821bfbfb33ca63f88d74a970b7655f95088..32730930dbb73f88b7b7f0634c48706a1383b872 100644 (file)
--- a/avr/command_tbl.c
+++ b/avr/command_tbl.c
@@ -16,6 +16,8 @@ extern command_ret_t do_env_default(cmd_tbl_t *, int, int, char * const []);
 extern command_ret_t do_env_set(cmd_tbl_t *, int, int, char * const []);
 extern command_ret_t do_env_save(cmd_tbl_t *, int, int, char * const []);
 extern command_ret_t do_loadf(cmd_tbl_t *, int, int, char * const []);
+extern command_ret_t do_loadcpm3(cmd_tbl_t *, int, int, char * const []);
+extern command_ret_t do_loadihex(cmd_tbl_t *, int, int, char * const []);
 extern command_ret_t do_go(cmd_tbl_t *, int, int, char * const []);
 extern command_ret_t do_restart(cmd_tbl_t *, int, int, char * const []);
 extern command_ret_t do_console(cmd_tbl_t *, int, int, char * const []);
@@ -79,9 +81,10 @@ CMD_TBL_ITEM(
 ),
 CMD_TBL_ITEM(
        echo,   CONFIG_SYS_MAXARGS,     1,      do_echo,
-       "echo args to console",
-       "[args..]\n"
-       "     - echo args to console; \\c suppresses newline"
+       "display a line of text",
+       "[-n] [argument ...]\n"
+       "     - echo the argument(s) to console.\n"
+       "       -n  do not output the trailing newline"
 ),
 CMD_TBL_ITEM(
        sleep ,    2,    1,     do_sleep,
@@ -130,6 +133,20 @@ CMD_TBL_ITEM(
        "load srec_cat prepared image from controller flash",
        ""
 ),
+CMD_TBL_ITEM(
+       loadcpm3, 3,    0,      do_loadcpm3,
+       "load CPM3.SYS file",
+       "[offset] [filename]\n"
+       "    - Load CP/M 3 system file from FAT filesystem. This command makes\n"
+       "      CPMLDR superfluous. Default filename is '"CONFIG_PATH_CPM3SYS"', but\n"
+       "      uses environment variable '"ENV_PATH_CPM3SYS"', if set."
+),
+CMD_TBL_ITEM(
+       loadi,  2,      0,      do_loadihex,
+       "load intel hex file over serial line",
+       "[[-]offset]\n"
+       "    - load Intel-Hex-Record file over serial line with offset 'offset'"
+),
 CMD_TBL_ITEM(
        go,     2,      0,      do_go,
        "start application at address 'addr'",
@@ -149,7 +166,7 @@ CMD_TBL_ITEM(
        ""
 ),
 CMD_TBL_ITEM(
-       connect, 1, 1,  do_console,
+       connect, 1, 0,  do_console,
        "Connect to CPU console i/o",
        ""
 ),
@@ -211,23 +228,21 @@ CMD_TBL_ITEM(
        "    - set address offset for memory commands to 'offset'"
 ),
 CMD_TBL_ITEM(
-       loop,   3,      1,      do_mem_loop,
+       mloop,  3,      1,      do_mem_loop,
        "infinite loop on address range",
        "address number_of_bytes"
 ),
-#ifdef CONFIG_LOOPW
 CMD_TBL_ITEM(
-       loopw,  4,      1,      do_mem_loopw,
+       mloopw, 4,      1,      do_mem_loopw,
        "infinite write loop on address range",
        "address number_of_bytes data_to_write"
 ),
-#endif /* CONFIG_LOOPW */
 
 #ifdef CONFIG_CMD_MEMTEST
 CMD_TBL_ITEM(
-       mtest,  5,      1,      do_mem_mtest,
+       mtest,  4,      1,      do_mem_mtest,
        "simple RAM read/write test",
-       "[start [end [pattern [iterations]]]]"
+       "[start [end [iterations]]]"
 ),
 #endif /* CONFIG_CMD_MEMTEST */
 
@@ -238,7 +253,7 @@ CMD_TBL_ITEM(
        "address count delay(ms)"
 ),
 CMD_TBL_ITEM(
-       mwc,    4,      1,      do_mem_mwc,
+       mwc,    4,      1,      do_mem_mdc,
        "memory write cyclic",
        "address value delay(ms)"
 ),