diff --git a/Documentation/commands.dox b/Documentation/commands.dox index 50e383f..135787c 100644 --- a/Documentation/commands.dox +++ b/Documentation/commands.dox @@ -1,15 +1,19 @@ /** * @page command_reference Supported Shell Commands - - @subpage sh_command - @subpage cat_command - @subpage cd_command - @subpage cp_command + - @subpage devinfo_command + - @subpage edit_command + - @subpage export_command + - @subpage tftp_command + - @subpage loadenv_command + - @subpage mount_command - @subpage printenv_command - @subpage saveenv_command - - @subpage loadenv_command - @subpage setenv_command - - @subpage export_command - - @subpage mount_command + - @subpage sh_command + - @subpage rarp_command */ diff --git a/arch/arm/mach-arm.dox b/arch/arm/mach-arm.dox index 8443b73..862b339 100644 --- a/arch/arm/mach-arm.dox +++ b/arch/arm/mach-arm.dox @@ -12,22 +12,22 @@ to: "runtime address != link address". You should only use branches and do not refer to fixed data. This implies the use of assembler code only. -The ARM CPU starts at lable in one of the corresponding start-*.S +The ARM CPU starts at lable \ in one of the corresponding start-*.S files. After some basic hardware setup it can call a function - if not disabled. This call is intended to give all +\ if not disabled. This call is intended to give all developers a chance to use a standard reset vector file, but also do some special things required only on their specific CPU. -After handling some MMU related things can be called (if +After handling some MMU related things \ can be called (if not disabled). This is a board specific function for SDRAM setup for example. As its board specific, your can do whatever you need to bring your board up. -When returns it will be assumed there is now a working +When \ returns it will be assumed there is now a working RAM that can be used for all further steps. Next step is relocation of U-Boot itself. It gets copied to RAM and the last -assembler instruction is a jump into . This target address is -the first C instruction in U-Boot. At this point of time: +assembler instruction is a jump into \. This target address is +the first C instruction in U-Boot. At this point of time:\n "runtime address == link address". */ diff --git a/board/board.dox b/board/board.dox index 4bc308d..a4c6dc5 100644 --- a/board/board.dox +++ b/board/board.dox @@ -5,27 +5,33 @@ @section board_add_files Files/Directories to be added - - board/ - - board//.c - - board//.dox - - board//Makefile - - include/configs/.h - - arch//configs/_defconfig + - board/\ + - board/\/Makefile + - board/\/\.c + - board/\/\.dox + - include/configs/\.h + - arch/\/configs/\_defconfig -Makefile +@subsection board_makefile board/\Makefile +@verbatim obj-y += all files that builds the BSP (Assembler and/or C files) +@endverbatim -@subsection board_doxygen board//.dox +@subsection board_basefile board/\\.c + +TBD + +@subsection board_doxygen board/\/\.dox This file should describe in short words your new board, what CPU it uses, what resources are provided and features it supports. Use the doxygen style for this kind of documentation. Below you find a -template for this kind of file +template for this kind of file: -@code -** <@>page +@verbatim +/** @page This board uses an based CPU. The board is shipped with: @@ -35,24 +41,24 @@ and so on. -* -@endcode +*/ +@endverbatim To make your new shiny file visible in the automatically generated documentation you must sort in the used page lable ("" in the -template above) into Documentation/boards.dox as +template above) into Documentation/boards.dox as: -@code +@verbatim ... - <@>subpage + @subpage ... -@endcode +@endverbatim at the right architecture. @note Consider to use an unique page lable. -@subsection board_lscript board//u-boot.ld.S +@subsection board_lscript board/\/u-boot.ld.S If your board needs a special binary U-Boot layout, you can provide a local board linker script file. This will replace the generic one provided by your @@ -60,21 +66,25 @@ Add this file with -@code - extra-y += -@endcode +@verbatim + extra-y += +@endverbatim -in your local Makefile to the list of files, forwarded to the last linking step. +in your local \b Makefile to the list of files, forwarded to the last linking step. + +@section board_defconfig arch/\/configs/\_defconfig + +TBD @section board_mod_files These files needs to be modified: - modify board/board.doc - - modify arch//Kconfig + - modify arch/\/Kconfig - add your board (MACH_*) to the list - add your default text base address for this architecture (ARCH_TEXT_BASE) - add BOARDINFO with valueable info for your board - - modify arch//Makefile: - - add board-$(MACH_*) = + - modify arch/\/Makefile: + - add board-$(MACH_*) = \ First, the new board should be visible in the menu. diff --git a/commands/cat.c b/commands/cat.c index af33eca..6596612 100644 --- a/commands/cat.c +++ b/commands/cat.c @@ -97,7 +97,7 @@ /** * @page cat_command cat (concatenate) * - * Usage is: cat [ ...] + * Usage is: cat \ [\ ...] * * Concatenate files to stdout. Currently only printable characters * and \\n and \\t are printed, but this should be optional diff --git a/commands/cd.c b/commands/cd.c index 08c3a2d..5d5cacb 100644 --- a/commands/cd.c +++ b/commands/cd.c @@ -61,7 +61,8 @@ /** * @page cd_command cd (change working directory) * - * Usage is: cd [] + * Usage is: cd [\] * - * Change to . If called without argument, change to / (root) + * Change to \. If called without argument, change to \b / + * (root) */ diff --git a/commands/cp.c b/commands/cp.c index e26ff1f..a89bb97 100644 --- a/commands/cp.c +++ b/commands/cp.c @@ -151,7 +151,7 @@ /** * @page cp_command cp (copy) * - * Usage: cp [] + * Usage: cp \ [\] \ * * FIXME */ diff --git a/commands/edit.c b/commands/edit.c index 0795d88..3a685eb 100644 --- a/commands/edit.c +++ b/commands/edit.c @@ -1,6 +1,4 @@ /* - * edit.c - A tiny editor implementation - * * Copyright (c) 2007 Sascha Hauer , Pengutronix * * See file CREDITS for list of people who contributed to this @@ -20,6 +18,11 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +/** + * @file + * @brief A tiny editor implementation + */ + #include #include #include @@ -398,6 +401,7 @@ return 1; } + /* check if we are called as "sedit" insted of "edit" */ if (*argv[0] == 's') smartscroll = 1; @@ -564,3 +568,18 @@ .usage = "edit a file", U_BOOT_CMD_HELP(cmd_edit_help) U_BOOT_CMD_END + + +/** + * @page edit_command edit (editor) + * + * Usage is: [s]edit \ + * + * This is a very small editor. It's only features are moving the cursor with + * the usual keys and typing characters. + * + * \b \ quits the editor without saving,\n + * \b \ quits the editor with saving the current file. + * + * If called as \c sedit the editor uses ansi codes to scroll the screen. + */ diff --git a/commands/environment.c b/commands/environment.c index b5517aa..01e7cfe 100644 --- a/commands/environment.c +++ b/commands/environment.c @@ -227,13 +227,13 @@ /** * @page saveenv_command saveenv * - * Usage: saveenv [] [] + * Usage: saveenv [\] [\] * - * Save the files in to the persistent storage device . - * is normally a block in flash, but could be any other file. + * Save the files in \ to the persistent storage device \. + * \ is normally a block in flash, but could be any other file. * - * If ommitted defaults to /env and defaults to - * /dev/env0. + * If ommitted \ defaults to \b /env and \ defaults to + * \b /dev/env0. * * @note envfs can only handle files. Directories are skipped silently. */ @@ -372,12 +372,12 @@ /** * @page loadenv_command loadenv * - * Usage: loadenv [] [] + * Usage: loadenv [\] [\] * - * Load the persistent storage contained in to the directory . + * Load the persistent storage contained in \ to the directory \. * - * If ommitted defaults to /env and defaults to - * /dev/env0. + * If ommitted \ defaults to /env and \ defaults to + * \b /dev/env0. * * @note envfs can only handle files. Directories are skipped silently. */ diff --git a/commands/mount.c b/commands/mount.c index dd04bde..03b63f0 100644 --- a/commands/mount.c +++ b/commands/mount.c @@ -80,16 +80,16 @@ U_BOOT_CMD_END /** @page mount_command mount - * Usage: mount [ ] + * Usage: mount [\ \ \] * - * Mounts a filesystem of a given on a to a . - * can be one of /dev/ * or some arbitrary string if no + * Mounts a filesystem of a given \ on a \ to a \. + * \ can be one of /dev/ * or some arbitrary string if no * device is needed for this driver (for example ramfs). * - * is the filesystem driver to use. Try the 'devinfo' command + * \ is the filesystem driver to use. Try the 'devinfo' command * for a list of available drivers. * - * must be an empty directory descending directly from the + * \ must be an empty directory descending directly from the * root directory. */ diff --git a/commands/net.c b/commands/net.c index d12559e..b9c372a 100644 --- a/commands/net.c +++ b/commands/net.c @@ -1,6 +1,4 @@ /* - * tftp, rarpboot, dhcp, nfs, cdp - Boot support - * * (C) Copyright 2000 * Wolfgang Denk, DENX Software Engineering, wd@denx.de. * @@ -23,6 +21,11 @@ * MA 02111-1307 USA */ +/** + * @file + * @brief tftp, rarpboot, dhcp, nfs, cdp - Boot support + */ + #include #include #include @@ -102,6 +105,16 @@ U_BOOT_CMD_HELP(cmd_tftp_help) U_BOOT_CMD_END +/** + * @page tftp_command tftp + * + * Usage is: tftp \ [\] + * + * Load a file via network using BootP/TFTP protocol. FIXME: Where to find it + * after loading? + * @note This command is available only, if enabled in the menuconfig. + */ + #ifdef CONFIG_NET_RARP static int do_rarpb (cmd_tbl_t *cmdtp, int argc, char *argv[]) { @@ -116,6 +129,16 @@ U_BOOT_CMD_END #endif /* CONFIG_NET_RARP */ +/** + * @page rarp_command rarp + * + * Usage is: FIXME + * + * Load a file via network using rarp/tftp protocol. FIXME: Where to find it + * after loading? + * @note This command is available only, if enabled in the menuconfig. + */ + #ifdef CONFIG_NET_DHCP static int do_dhcp (cmd_tbl_t *cmdtp, int argc, char *argv[]) { diff --git a/common/env.c b/common/env.c index 98789e0..96a8ed0 100644 --- a/common/env.c +++ b/common/env.c @@ -306,12 +306,12 @@ /** * @page printenv_command printenv * - * Usage: printenv [] + * Usage: printenv [\] * * Print environment variables. - * If was given, it prints out its content if the environment variable - * exists. - * Without the argument all current environment variables are printed. + * If \ was given, it prints out its content if the environment variable + * \ exists. + * Without the \ argument all current environment variables are printed. */ #ifdef CONFIG_SIMPLE_PARSER @@ -342,14 +342,14 @@ /** * @page setenv_command setenv * - * Usage: setenv [] + * Usage: setenv \ [\] * - * Set environment variable to - * If no was given, the variable will be removed. + * Set environment variable \ to \ + * If no \ was given, the variable \ will be removed. * * This command can be replaced by using the simpler form in the hush: * - * = + * \ = \ * * @note This command is only required if the simple * parser (not the hush) is in use. @@ -394,7 +394,7 @@ /** * @page export_command export * - * Usage: export [=value]... + * Usage: export \[=value]... * * Export an environment variable to subsequently executed scripts */ diff --git a/common/hush.c b/common/hush.c index d85f857..c05b564 100644 --- a/common/hush.c +++ b/common/hush.c @@ -1574,15 +1574,15 @@ /** @page sh_command Starting shell * - * Usage: sh [] + * Usage: sh \ [\] * - * Execute a shell script named and forward (if given) - * to it. + * Execute a shell script named \ and forward (if given) + * \ to it. * - * Usage: . [] - * or source [] + * Usage: . \ [\] + * or source \ [\] * - * Read and execute commands from in the current shell environment, - * forward (if given) to it and return the exit status of the last + * Read and execute commands from \ in the current shell environment, + * forward (if given) \ to it and return the exit status of the last * command executed from filename. */ diff --git a/lib/driver.c b/lib/driver.c index a356b4e..e7c98a4 100644 --- a/lib/driver.c +++ b/lib/driver.c @@ -20,6 +20,11 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +/** + * @file + * @brief U-Boot's driver model, and devinfo command + */ + #include #include #include @@ -321,7 +326,7 @@ "Usage: devinfo [DEVICE]\n" "If called without arguments devinfo shows a summary about known devices and\n" "drivers. If called with a device path as argument devinfo shows more detailed\n" -"informations about this device and its parameters.\n"; +"information about this device and its parameters.\n"; U_BOOT_CMD_START(devinfo) .maxargs = 2, @@ -329,3 +334,30 @@ .usage = "display info about devices and drivers", U_BOOT_CMD_HELP(cmd_devinfo_help) U_BOOT_CMD_END + +/** + * @page devinfo_command devinfo + * + * Usage is: devinfo /dev/\ + * + * If called without arguments devinfo shows a summary about known devices and + * drivers. If called with a device path as argument devinfo shows more + * detailed information about this device and its parameters. + * + * Example from an MPC5200 based system: +@verbatim + uboot:/ devinfo /dev/eth0 + base : 0x1002b000 + size : 0x00000000 + driver: fec_mpc5xxx + + no info available for eth0 + Parameters: + ip = 192.168.23.197 + ethaddr = 80:81:82:83:84:86 + gateway = 192.168.23.1 + netmask = 255.255.255.0 + serverip = 192.168.23.2 +@endverbatim + * + */