3 # Patch managed by http://www.holgerschurig.de/patcher.html
6 --- u-boot-1.1.2/common/cmd_mem.c~command-names
7 +++ u-boot-1.1.2/common/cmd_mem.c
8 @@ -1188,56 +1188,56 @@
9 /**************************************************/
10 #if (CONFIG_COMMANDS & CFG_CMD_MEMORY)
12 - md, 3, 1, do_mem_md,
13 - "md - memory display\n",
14 + memdump, 3, 1, do_mem_md,
15 + "memdump - memory display\n",
16 "[.b, .w, .l] address [# of objects]\n - memory display\n"
21 - mm, 2, 1, do_mem_mm,
22 - "mm - memory modify (auto-incrementing)\n",
23 + memmod, 2, 1, do_mem_mm,
24 + "memmod - memory modify (auto-incrementing)\n",
25 "[.b, .w, .l] address\n" " - memory modify, auto increment address\n"
30 - nm, 2, 1, do_mem_nm,
31 - "nm - memory modify (constant address)\n",
32 + memchg, 2, 1, do_mem_nm,
33 + "memchg - memory modify (constant address)\n",
34 "[.b, .w, .l] address\n - memory modify, read and keep address\n"
38 - mw, 4, 1, do_mem_mw,
39 - "mw - memory write (fill)\n",
40 + memfill, 4, 1, do_mem_mw,
41 + "memfill - fill write\n",
42 "[.b, .w, .l] address value [count]\n - write memory\n"
46 - cp, 4, 1, do_mem_cp,
47 - "cp - memory copy\n",
48 + memcp, 4, 1, do_mem_cp,
49 + "memcp - copy memory\n",
50 "[.b, .w, .l] source target count\n - copy memory\n"
54 - cmp, 4, 1, do_mem_cmp,
55 - "cmp - memory compare\n",
56 + memcmp, 4, 1, do_mem_cmp,
57 + "memcmp - compary memory\n",
58 "[.b, .w, .l] addr1 addr2 count\n - compare memory\n"
61 #ifndef CONFIG_CRC32_VERIFY
64 - crc32, 4, 1, do_mem_crc,
65 - "crc32 - checksum calculation\n",
66 + memcrc, 4, 1, do_mem_crc,
67 + "memcrc - checksum memory\n",
68 "address count [addr]\n - compute CRC32 checksum [save at addr]\n"
71 #else /* CONFIG_CRC32_VERIFY */
74 - crc32, 5, 1, do_mem_crc,
75 - "crc32 - checksum calculation\n",
76 + memcrc, 5, 1, do_mem_crc,
77 + "memcrc - checksum memory\n",
78 "address count [addr]\n - compute CRC32 checksum [save at addr]\n"
79 "-v address count crc\n - verify crc of memory area\n"
81 @@ -1245,31 +1245,31 @@
82 #endif /* CONFIG_CRC32_VERIFY */
85 - base, 2, 1, do_mem_base,
86 - "base - print or set address offset\n",
87 + membase, 2, 1, do_mem_base,
88 + "membase - print/set memory offset\n",
89 "\n - print address offset for memory commands\n"
90 - "base off\n - set address offset for memory commands to 'off'\n"
91 + "[offset]\n - set address offset for memory commands to 'offset'\n"
95 - loop, 3, 1, do_mem_loop,
96 - "loop - infinite loop on address range\n",
97 + memloop, 3, 1, do_mem_loop,
98 + "memloop - infinite loop on address range\n",
99 "[.b, .w, .l] address number_of_objects\n"
100 " - loop on a set of addresses\n"
105 - loopw, 4, 1, do_mem_loopw,
106 - "loopw - infinite write loop on address range\n",
107 + memloopw, 4, 1, do_mem_loopw,
108 + "memloopw- infinite write loop on address range\n",
109 "[.b, .w, .l] address number_of_objects data_to_write\n"
110 " - loop on a set of addresses\n"
112 #endif /* CONFIG_LOOPW */
115 - mtest, 4, 1, do_mem_mtest,
116 - "mtest - simple RAM test\n",
117 + memtest, 4, 1, do_mem_mtest,
118 + "memtest - simple RAM test\n",
119 "[start [end [pattern]]]\n"
120 " - simple RAM read/write test\n"
122 --- u-boot-1.1.2/common/cmd_flash.c~command-names
123 +++ u-boot-1.1.2/common/cmd_flash.c
124 @@ -507,30 +507,30 @@
128 - erase, 3, 1, do_flerase,
129 - "erase - erase FLASH memory\n",
130 + flerase, 3, 1, do_flerase,
131 + "flerase - erase FLASH memory\n",
133 " - erase FLASH from addr 'start' to addr 'end'\n"
134 - "erase N:SF[-SL]\n - erase sectors SF-SL in FLASH bank # N\n"
135 - "erase bank N\n - erase FLASH bank # N\n"
136 - "erase all\n - erase all FLASH banks\n"
137 + "flerase N:SF[-SL]\n - erase sectors SF-SL in FLASH bank # N\n"
138 + "flerase bank N\n - erase FLASH bank # N\n"
139 + "flerase all\n - erase all FLASH banks\n"
143 - protect, 4, 1, do_protect,
144 - "protect - enable or disable FLASH write protection\n",
145 + flprot, 4, 1, do_protect,
146 + "flprot - enable or disable FLASH write protection\n",
148 " - protect FLASH from addr 'start' to addr 'end'\n"
149 - "protect on N:SF[-SL]\n"
150 + "flprot on N:SF[-SL]\n"
151 " - protect sectors SF-SL in FLASH bank # N\n"
152 - "protect on bank N\n - protect FLASH bank # N\n"
153 - "protect on all\n - protect all FLASH banks\n"
154 - "protect off start end\n"
155 + "flprot on bank N\n - protect FLASH bank # N\n"
156 + "flprot on all\n - protect all FLASH banks\n"
157 + "flprot off start end\n"
158 " - make FLASH from addr 'start' to addr 'end' writable\n"
159 - "protect off N:SF[-SL]\n"
160 + "flprot off N:SF[-SL]\n"
161 " - make sectors SF-SL writable in FLASH bank # N\n"
162 - "protect off bank N\n - make FLASH bank # N writable\n"
163 - "protect off all\n - make all FLASH banks writable\n"
164 + "flprot off bank N\n - make FLASH bank # N writable\n"
165 + "flprot off all\n - make all FLASH banks writable\n"
168 #endif /* CFG_CMD_FLASH */
169 --- u-boot-1.1.2/common/cmd_bootm.c~command-names
170 +++ u-boot-1.1.2/common/cmd_bootm.c
175 - bootm, CFG_MAXARGS, 1, do_bootm,
176 - "bootm - boot application image from memory\n",
177 + imgboot, CFG_MAXARGS, 1, do_bootm,
178 + "imgboot - boot application image from memory\n",
179 "[addr [arg ...]]\n - boot application image stored in memory\n"
180 "\tpassing arguments 'arg ...'; when booting a Linux kernel,\n"
181 "\t'arg' can be the address of an initrd image\n"
182 @@ -1056,8 +1056,8 @@
186 - iminfo, CFG_MAXARGS, 1, do_iminfo,
187 - "iminfo - print header information for application image\n",
188 + imginfo, CFG_MAXARGS, 1, do_iminfo,
189 + "imginfo - print header information for application image\n",
191 " - print header information for application image starting at\n"
192 " address 'addr' in memory; this includes verification of the\n"
193 @@ -1116,8 +1116,8 @@
197 - imls, 1, 1, do_imls,
198 - "imls - list all images found in flash\n",
199 + imgls, 1, 1, do_imls,
200 + "imgls - list all images found in flash\n",
202 " - Prints information about all images found at sector\n"
203 " boundaries in flash.\n"
204 --- u-boot-1.1.2/common/cmd_jffs2.c~command-names
205 +++ u-boot-1.1.2/common/cmd_jffs2.c
210 - chpart, 2, 0, do_jffs2_chpart,
211 - "chpart\t- change active partition\n",
212 + jffspart, 2, 0, do_jffs2_chpart,
213 + "jffspart\t- change active partition\n",
214 " - change active partition\n"
216 #endif /* CFG_JFFS_SINGLE_PART */
217 @@ -268,22 +268,22 @@
218 /***************************************************/
221 - fsload, 3, 0, do_jffs2_fsload,
222 - "fsload\t- load binary file from a filesystem image\n",
223 + jffsload, 3, 0, do_jffs2_fsload,
224 + "jffsload- load binary file from a filesystem image\n",
225 "[ off ] [ filename ]\n"
226 " - load binary file from flash bank\n"
227 " with offset 'off'\n"
231 - fsinfo, 1, 1, do_jffs2_fsinfo,
232 - "fsinfo\t- print information about filesystems\n",
233 + jffsinfo, 1, 1, do_jffs2_fsinfo,
234 + "jffsinfo- print information about filesystems\n",
235 " - print information about filesystems\n"
239 - ls, 2, 1, do_jffs2_ls,
240 - "ls\t- list files in a directory (default /)\n",
241 + jffsls, 2, 1, do_jffs2_ls,
242 + "jffsls\t- list files in a directory (default /)\n",
244 " - list files in a directory.\n"
246 --- u-boot-1.1.2/common/cmd_nvedit.c~command-names
247 +++ u-boot-1.1.2/common/cmd_nvedit.c
248 @@ -570,19 +570,19 @@
249 /**************************************************/
252 - printenv, CFG_MAXARGS, 1, do_printenv,
253 - "printenv- print environment variables\n",
254 + env, CFG_MAXARGS, 1, do_printenv,
255 + "env - print environment variables\n",
256 "\n - print values of all environment variables\n"
257 - "printenv name ...\n"
259 " - print value of environment variable 'name'\n"
263 - setenv, CFG_MAXARGS, 0, do_setenv,
264 - "setenv - set environment variables\n",
265 + envset, CFG_MAXARGS, 0, do_setenv,
266 + "envset - set environment variables\n",
268 " - set environment variable 'name' to 'value ...'\n"
271 " - delete environment variable 'name'\n"
275 ((CONFIG_COMMANDS & (CFG_CMD_ENV|CFG_CMD_FLASH)) == \
276 (CFG_CMD_ENV|CFG_CMD_FLASH))
278 - saveenv, 1, 0, do_saveenv,
279 - "saveenv - save environment variables to persistent storage\n",
280 + envsave, 1, 0, do_saveenv,
281 + "envsave - save environment variables to persistent storage\n",
285 @@ -600,16 +600,16 @@
286 #if (CONFIG_COMMANDS & CFG_CMD_ASKENV)
289 - askenv, CFG_MAXARGS, 1, do_askenv,
290 - "askenv - get environment variables from stdin\n",
291 + envask, CFG_MAXARGS, 1, do_askenv,
292 + "envask - get environment variables from stdin\n",
293 "name [message] [size]\n"
294 " - get environment variable 'name' from stdin (max 'size' chars)\n"
297 " - get environment variable 'name' from stdin\n"
298 - "askenv name size\n"
299 + "envask name size\n"
300 " - get environment variable 'name' from stdin (max 'size' chars)\n"
301 - "askenv name [message] size\n"
302 - " - display 'message' string and get environment variable 'name'"
303 + "envask name [message] size\n"
304 + " - display 'message' string and get environment variable 'name' "
305 "from stdin (max 'size' chars)\n"
307 #endif /* CFG_CMD_ASKENV */
309 #if (CONFIG_COMMANDS & CFG_CMD_RUN)
310 int do_run (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]);
312 - run, CFG_MAXARGS, 1, do_run,
313 - "run - run commands in an environment variable\n",
314 + envrun, CFG_MAXARGS, 1, do_run,
315 + "envrun - run commands in an environment variable\n",
317 " - run the commands in the environment variable(s) 'var'\n"
319 --- u-boot-1.1.2/common/cmd_cache.c~command-names
320 +++ u-boot-1.1.2/common/cmd_cache.c
325 - icache, 2, 1, do_icache,
326 - "icache - enable or disable instruction cache\n",
327 + cachei, 2, 1, do_icache,
328 + "cachei - enable or disable instruction cache\n",
330 " - enable or disable instruction cache\n"
334 - dcache, 2, 1, do_dcache,
335 - "dcache - enable or disable data cache\n",
336 + cached, 2, 1, do_dcache,
337 + "cached - enable or disable data cache\n",
339 " - enable or disable data (writethrough) cache\n"