From a3ffa97f40dc81f2d6b07ee964f2340fe0c1ba97 Mon Sep 17 00:00:00 2001 From: Sascha Hauer Date: Tue, 15 Dec 2009 09:11:09 +0100 Subject: rename U-Boot-v2 project to barebox This has been done with the following script: find -path ./.git -prune -o -type f -print0 | xargs -0 -r sed -i \ -e 's/u2boot/barebox/g' \ -e 's/U2Boot/barebox/g' \ -e 's/U-boot V2/barebox/g' \ -e 's/u-boot v2/barebox/g' \ -e 's/U-Boot V2/barebox/g' \ -e 's/U-Boot-v2/barebox/g' \ -e 's/U_BOOT/BAREBOX/g' \ -e 's/UBOOT/BAREBOX/g' \ -e 's/uboot/barebox/g' \ -e 's/u-boot/barebox/g' \ -e 's/u_boot/barebox/g' \ -e 's/U-Boot/barebox/g' \ -e 's/U-boot/barebox/g' \ -e 's/U-BOOT/barebox/g' find -path ./.git -prune -o \( -name "*u-boot*" -o -name "*uboot*" -o -name "*u_boot*" \) -print0 | \ xargs -0 -r rename 's/u[-_]?boot/barebox/' It needs some manual fixup following in the next patch Signed-off-by: Sascha Hauer --- commands/bmp.c | 6 +++--- commands/bootm.c | 12 ++++++------ commands/cat.c | 6 +++--- commands/cd.c | 6 +++--- commands/clear.c | 4 ++-- commands/cp.c | 6 +++--- commands/crc.c | 6 +++--- commands/dfu.c | 10 +++++----- commands/echo.c | 4 ++-- commands/edit.c | 6 +++--- commands/exec.c | 4 ++-- commands/export.c | 6 +++--- commands/false.c | 4 ++-- commands/flash.c | 18 +++++++++--------- commands/go.c | 6 +++--- commands/gpio.c | 24 ++++++++++++------------ commands/help.c | 8 ++++---- commands/insmod.c | 6 +++--- commands/loadb.c | 12 ++++++------ commands/loadenv.c | 6 +++--- commands/loads.c | 8 ++++---- commands/ls.c | 6 +++--- commands/lsmod.c | 4 ++-- commands/mem.c | 30 +++++++++++++++--------------- commands/meminfo.c | 4 ++-- commands/memtest.c | 6 +++--- commands/mkdir.c | 6 +++--- commands/mount.c | 8 ++++---- commands/nand.c | 6 +++--- commands/net.c | 30 +++++++++++++++--------------- commands/partition.c | 12 ++++++------ commands/printenv.c | 6 +++--- commands/pwd.c | 4 ++-- commands/readline.c | 6 +++--- commands/reginfo.c | 4 ++-- commands/reset.c | 4 ++-- commands/rm.c | 6 +++--- commands/rmdir.c | 6 +++--- commands/saveenv.c | 6 +++--- commands/setenv.c | 6 +++--- commands/sleep.c | 4 ++-- commands/test.c | 8 ++++---- commands/timeout.c | 6 +++--- commands/true.c | 4 ++-- commands/umount.c | 6 +++--- commands/version.c | 4 ++-- commands/xyzModem.c | 2 +- 47 files changed, 181 insertions(+), 181 deletions(-) (limited to 'commands') diff --git a/commands/bmp.c b/commands/bmp.c index 181639a7d9..51989e14f9 100644 --- a/commands/bmp.c +++ b/commands/bmp.c @@ -201,9 +201,9 @@ static const __maybe_unused char cmd_bmp_help[] = " -y y offset (default center)\n" " -o render offscreen\n"; -U_BOOT_CMD_START(bmp) +BAREBOX_CMD_START(bmp) .cmd = do_bmp, .usage = "show a bmp image", - U_BOOT_CMD_HELP(cmd_bmp_help) -U_BOOT_CMD_END + BAREBOX_CMD_HELP(cmd_bmp_help) +BAREBOX_CMD_END diff --git a/commands/bootm.c b/commands/bootm.c index 350d826356..849d4c20dd 100644 --- a/commands/bootm.c +++ b/commands/bootm.c @@ -106,7 +106,7 @@ static const char *image_os(image_header_t *hdr) case IH_OS_LINUX: os = "Linux"; break; case IH_OS_VXWORKS: os = "VxWorks"; break; case IH_OS_QNX: os = "QNX"; break; - case IH_OS_U_BOOT: os = "U-Boot"; break; + case IH_OS_BAREBOX: os = "barebox"; break; case IH_OS_RTEMS: os = "RTEMS"; break; #ifdef CONFIG_ARTOS case IH_OS_ARTOS: os = "ARTOS"; break; @@ -457,11 +457,11 @@ static const __maybe_unused char cmd_bootm_help[] = " -h show advanced options\n"; -U_BOOT_CMD_START(bootm) +BAREBOX_CMD_START(bootm) .cmd = do_bootm, .usage = "boot application image", - U_BOOT_CMD_HELP(cmd_bootm_help) -U_BOOT_CMD_END + BAREBOX_CMD_HELP(cmd_bootm_help) +BAREBOX_CMD_END #ifdef CONFIG_CMD_IMI static int do_iminfo ( cmd_tbl_t *cmdtp, int argc, char *argv[]) @@ -522,7 +522,7 @@ static int image_info (ulong addr) return 0; } -U_BOOT_CMD( +BAREBOX_CMD( iminfo, 1, do_iminfo, "iminfo - print header information for application image\n", "addr [addr ...]\n" @@ -589,7 +589,7 @@ void bz_internal_error(int errcode) * @page boot_preparation Preparing for Boot * * This chapter describes what's to be done to forward the control from - * U-Boot to Linux. This part describes the generic part, below you can find + * barebox to Linux. This part describes the generic part, below you can find * the architecture specific part. * * - @subpage arm_boot_preparation diff --git a/commands/cat.c b/commands/cat.c index 59b93a90d8..c0a93d89d4 100644 --- a/commands/cat.c +++ b/commands/cat.c @@ -90,11 +90,11 @@ static const __maybe_unused char cmd_cat_help[] = "Concatenate files on stdout. Currently only printable characters\n" "and \\n and \\t are printed, but this should be optional\n"; -U_BOOT_CMD_START(cat) +BAREBOX_CMD_START(cat) .cmd = do_cat, .usage = "concatenate file(s)", - U_BOOT_CMD_HELP(cmd_cat_help) -U_BOOT_CMD_END + BAREBOX_CMD_HELP(cmd_cat_help) +BAREBOX_CMD_END /** * @page cat_command cat (concatenate) diff --git a/commands/cd.c b/commands/cd.c index 973ef78407..50e40b629e 100644 --- a/commands/cd.c +++ b/commands/cd.c @@ -51,11 +51,11 @@ static const __maybe_unused char cmd_cd_help[] = "Usage: cd [directory]\n" "change to directory. If called without argument, change to /\n"; -U_BOOT_CMD_START(cd) +BAREBOX_CMD_START(cd) .cmd = do_cd, .usage = "change working directory", - U_BOOT_CMD_HELP(cmd_cd_help) -U_BOOT_CMD_END + BAREBOX_CMD_HELP(cmd_cd_help) +BAREBOX_CMD_END /** * @page cd_command cd (change working directory) diff --git a/commands/clear.c b/commands/clear.c index 2d51574cd0..178842845f 100644 --- a/commands/clear.c +++ b/commands/clear.c @@ -31,7 +31,7 @@ static int do_clear (cmd_tbl_t *cmdtp, int argc, char *argv[]) return 0; } -U_BOOT_CMD_START(clear) +BAREBOX_CMD_START(clear) .cmd = do_clear, .usage = "clear screen", -U_BOOT_CMD_END +BAREBOX_CMD_END diff --git a/commands/cp.c b/commands/cp.c index d0cb570a6f..aa7b410e51 100644 --- a/commands/cp.c +++ b/commands/cp.c @@ -84,11 +84,11 @@ static const __maybe_unused char cmd_cp_help[] = "filename (not a target directory).\n" "This command is file based only. See memcpy for memory copy\n"; -U_BOOT_CMD_START(cp) +BAREBOX_CMD_START(cp) .cmd = do_cp, .usage = "copy files", - U_BOOT_CMD_HELP(cmd_cp_help) -U_BOOT_CMD_END + BAREBOX_CMD_HELP(cmd_cp_help) +BAREBOX_CMD_END /** * @page cp_command cp: Copy file diff --git a/commands/crc.c b/commands/crc.c index b2dbfc78cc..17188c7e10 100644 --- a/commands/crc.c +++ b/commands/crc.c @@ -116,9 +116,9 @@ static const __maybe_unused char cmd_crc_help[] = " -f Use file instead of memory\n" " -v Verfify\n"; -U_BOOT_CMD_START(crc32) +BAREBOX_CMD_START(crc32) .cmd = do_crc, .usage = "crc32 checksum calculation", - U_BOOT_CMD_HELP(cmd_crc_help) -U_BOOT_CMD_END + BAREBOX_CMD_HELP(cmd_crc_help) +BAREBOX_CMD_END diff --git a/commands/dfu.c b/commands/dfu.c index c8a598c22b..fe865efb90 100644 --- a/commands/dfu.c +++ b/commands/dfu.c @@ -101,7 +101,7 @@ static int do_dfu(cmd_tbl_t *cmdtp, int argc, char *argv[]) struct usb_dfu_pdata pdata; char *endptr, *argstr; struct usb_dfu_dev *dfu_alts = NULL; - char *manufacturer = "U-Boot"; + char *manufacturer = "barebox"; char *productname = CONFIG_BOARDINFO; u16 idVendor = 0, idProduct = 0; @@ -165,7 +165,7 @@ out: static const __maybe_unused char cmd_dfu_help[] = "Usage: dfu [OPTION]... description\n" "start dfu firmware update\n" -" -m Manufacturer string (U-Boot)\n" +" -m Manufacturer string (barebox)\n" " -p product string (" CONFIG_BOARDINFO ")\n" " -V vendor id\n" " -P product id\n" @@ -173,8 +173,8 @@ static const __maybe_unused char cmd_dfu_help[] = "device1(name1)[sr],device2(name2)[sr]\n" "where s is for save mode and r for read back of firmware\n"; -U_BOOT_CMD_START(dfu) +BAREBOX_CMD_START(dfu) .cmd = do_dfu, .usage = "Device firmware update", - U_BOOT_CMD_HELP(cmd_dfu_help) -U_BOOT_CMD_END + BAREBOX_CMD_HELP(cmd_dfu_help) +BAREBOX_CMD_END diff --git a/commands/echo.c b/commands/echo.c index 44206ad555..49bd44ed8e 100644 --- a/commands/echo.c +++ b/commands/echo.c @@ -96,8 +96,8 @@ no_optarg_out: return 1; } -U_BOOT_CMD_START(echo) +BAREBOX_CMD_START(echo) .cmd = do_echo, .usage = "echo args to console", -U_BOOT_CMD_END +BAREBOX_CMD_END diff --git a/commands/edit.c b/commands/edit.c index 8d3df6fa52..6503edfc88 100644 --- a/commands/edit.c +++ b/commands/edit.c @@ -561,12 +561,12 @@ static const __maybe_unused char cmd_edit_help[] = static const __maybe_unused char cmd_edit_usage[] = "edit a file"; -U_BOOT_CMD_START(edit) +BAREBOX_CMD_START(edit) .cmd = do_edit, .aliases = edit_aliases, .usage = cmd_edit_usage, - U_BOOT_CMD_HELP(cmd_edit_help) -U_BOOT_CMD_END + BAREBOX_CMD_HELP(cmd_edit_help) +BAREBOX_CMD_END /** diff --git a/commands/exec.c b/commands/exec.c index aeb769d573..ce0a0a9900 100644 --- a/commands/exec.c +++ b/commands/exec.c @@ -53,7 +53,7 @@ out: return 1; } -U_BOOT_CMD_START(exec) +BAREBOX_CMD_START(exec) .cmd = do_exec, .usage = "execute a script", -U_BOOT_CMD_END +BAREBOX_CMD_END diff --git a/commands/export.c b/commands/export.c index 750a83f3b0..3e2f84d9f8 100644 --- a/commands/export.c +++ b/commands/export.c @@ -55,11 +55,11 @@ static const __maybe_unused char cmd_export_help[] = "Usage: export [=value]...\n" "export an environment variable to subsequently executed scripts\n"; -U_BOOT_CMD_START(export) +BAREBOX_CMD_START(export) .cmd = do_export, .usage = "export environment variables", - U_BOOT_CMD_HELP(cmd_export_help) -U_BOOT_CMD_END + BAREBOX_CMD_HELP(cmd_export_help) +BAREBOX_CMD_END /** * @page export_command export: Export an environment variable diff --git a/commands/false.c b/commands/false.c index 94878a6fbd..fec3fdf713 100644 --- a/commands/false.c +++ b/commands/false.c @@ -29,8 +29,8 @@ static int do_false (cmd_tbl_t *cmdtp, int argc, char *argv[]) return 1; } -U_BOOT_CMD_START(false) +BAREBOX_CMD_START(false) .cmd = do_false, .usage = "do nothing, unsuccessfully", -U_BOOT_CMD_END +BAREBOX_CMD_END diff --git a/commands/flash.c b/commands/flash.c index d630783f15..ec793c5312 100644 --- a/commands/flash.c +++ b/commands/flash.c @@ -89,11 +89,11 @@ static const __maybe_unused char cmd_erase_help[] = "Erase a flash device or parts of a device if an area specification\n" "is given\n"; -U_BOOT_CMD_START(erase) +BAREBOX_CMD_START(erase) .cmd = do_flerase, .usage = "erase FLASH memory", - U_BOOT_CMD_HELP(cmd_erase_help) -U_BOOT_CMD_END + BAREBOX_CMD_HELP(cmd_erase_help) +BAREBOX_CMD_END /** @page erase_command erase Erase flash memory * @@ -166,17 +166,17 @@ static const __maybe_unused char cmd_protect_help[] = "(un)protect a flash device or parts of a device if an area specification\n" "is given\n"; -U_BOOT_CMD_START(protect) +BAREBOX_CMD_START(protect) .cmd = do_protect, .usage = "enable FLASH write protection", - U_BOOT_CMD_HELP(cmd_protect_help) -U_BOOT_CMD_END + BAREBOX_CMD_HELP(cmd_protect_help) +BAREBOX_CMD_END -U_BOOT_CMD_START(unprotect) +BAREBOX_CMD_START(unprotect) .cmd = do_protect, .usage = "disable FLASH write protection", - U_BOOT_CMD_HELP(cmd_protect_help) -U_BOOT_CMD_END + BAREBOX_CMD_HELP(cmd_protect_help) +BAREBOX_CMD_END /** @page protect_command protect Protect a flash memory * diff --git a/commands/go.c b/commands/go.c index 283b6d49be..e720e32352 100644 --- a/commands/go.c +++ b/commands/go.c @@ -78,8 +78,8 @@ static const __maybe_unused char cmd_go_help[] = "If addr does not start with a digit it is interpreted as a filename\n" "in which case the file is memmapped and executed\n"; -U_BOOT_CMD_START(go) +BAREBOX_CMD_START(go) .cmd = do_go, .usage = "start application at address or file", - U_BOOT_CMD_HELP(cmd_go_help) -U_BOOT_CMD_END + BAREBOX_CMD_HELP(cmd_go_help) +BAREBOX_CMD_END diff --git a/commands/gpio.c b/commands/gpio.c index ec6b28813e..58bf8b6378 100644 --- a/commands/gpio.c +++ b/commands/gpio.c @@ -39,11 +39,11 @@ static int do_gpio_get_value(cmd_tbl_t *cmdtp, int argc, char *argv[]) static const __maybe_unused char cmd_gpio_get_value_help[] = "Usage: gpio_set_value \n"; -U_BOOT_CMD_START(gpio_get_value) +BAREBOX_CMD_START(gpio_get_value) .cmd = do_gpio_get_value, .usage = "return a gpio's value", - U_BOOT_CMD_HELP(cmd_gpio_get_value_help) -U_BOOT_CMD_END + BAREBOX_CMD_HELP(cmd_gpio_get_value_help) +BAREBOX_CMD_END static int do_gpio_set_value(cmd_tbl_t *cmdtp, int argc, char *argv[]) { @@ -63,11 +63,11 @@ static int do_gpio_set_value(cmd_tbl_t *cmdtp, int argc, char *argv[]) static const __maybe_unused char cmd_gpio_set_value_help[] = "Usage: gpio_set_value \n"; -U_BOOT_CMD_START(gpio_set_value) +BAREBOX_CMD_START(gpio_set_value) .cmd = do_gpio_set_value, .usage = "set a gpio's output value", - U_BOOT_CMD_HELP(cmd_gpio_set_value_help) -U_BOOT_CMD_END + BAREBOX_CMD_HELP(cmd_gpio_set_value_help) +BAREBOX_CMD_END static int do_gpio_direction_input(cmd_tbl_t *cmdtp, int argc, char *argv[]) { @@ -88,11 +88,11 @@ static int do_gpio_direction_input(cmd_tbl_t *cmdtp, int argc, char *argv[]) static const __maybe_unused char cmd_do_gpio_direction_input_help[] = "Usage: gpio_direction_input \n"; -U_BOOT_CMD_START(gpio_direction_input) +BAREBOX_CMD_START(gpio_direction_input) .cmd = do_gpio_direction_input, .usage = "set a gpio as output", - U_BOOT_CMD_HELP(cmd_do_gpio_direction_input_help) -U_BOOT_CMD_END + BAREBOX_CMD_HELP(cmd_do_gpio_direction_input_help) +BAREBOX_CMD_END static int do_gpio_direction_output(cmd_tbl_t *cmdtp, int argc, char *argv[]) { @@ -114,9 +114,9 @@ static int do_gpio_direction_output(cmd_tbl_t *cmdtp, int argc, char *argv[]) static const __maybe_unused char cmd_gpio_direction_output_help[] = "Usage: gpio_direction_output \n"; -U_BOOT_CMD_START(gpio_direction_output) +BAREBOX_CMD_START(gpio_direction_output) .cmd = do_gpio_direction_output, .usage = "set a gpio as output", - U_BOOT_CMD_HELP(cmd_gpio_direction_output_help) -U_BOOT_CMD_END + BAREBOX_CMD_HELP(cmd_gpio_direction_output_help) +BAREBOX_CMD_END diff --git a/commands/help.c b/commands/help.c index 1a8bc9b17e..d8c67cddbe 100644 --- a/commands/help.c +++ b/commands/help.c @@ -41,7 +41,7 @@ static int do_help (cmd_tbl_t * cmdtp, int argc, char *argv[]) /* command help (long version) */ if ((cmdtp = find_cmd(argv[1])) != NULL) { - u_boot_cmd_usage(cmdtp); + barebox_cmd_usage(cmdtp); return 0; } else { printf ("Unknown command '%s' - try 'help'" @@ -61,10 +61,10 @@ static const __maybe_unused char cmd_help_help[] = static const char *help_aliases[] = { "?", NULL}; -U_BOOT_CMD_START(help) +BAREBOX_CMD_START(help) .cmd = do_help, .aliases = help_aliases, .usage = "print online help", - U_BOOT_CMD_HELP(cmd_help_help) -U_BOOT_CMD_END + BAREBOX_CMD_HELP(cmd_help_help) +BAREBOX_CMD_END diff --git a/commands/insmod.c b/commands/insmod.c index 82858bf825..e14af49f7d 100644 --- a/commands/insmod.c +++ b/commands/insmod.c @@ -35,8 +35,8 @@ static int do_insmod (cmd_tbl_t *cmdtp, int argc, char *argv[]) static const __maybe_unused char cmd_insmod_help[] = "Usage: insmod \n"; -U_BOOT_CMD_START(insmod) +BAREBOX_CMD_START(insmod) .cmd = do_insmod, .usage = "insert a module", - U_BOOT_CMD_HELP(cmd_insmod_help) -U_BOOT_CMD_END + BAREBOX_CMD_HELP(cmd_insmod_help) +BAREBOX_CMD_END diff --git a/commands/loadb.c b/commands/loadb.c index a942d36097..efb1a3cd80 100644 --- a/commands/loadb.c +++ b/commands/loadb.c @@ -806,17 +806,17 @@ static const __maybe_unused char cmd_loadb_help[] = "console baudrate" " -c - Create file if it is not present - default disabled"; #ifdef CONFIG_CMD_LOADB -U_BOOT_CMD_START(loadb) +BAREBOX_CMD_START(loadb) .cmd = do_load_serial_bin, .usage = "Load binary file over serial line (kermit mode)", - U_BOOT_CMD_HELP(cmd_loadb_help) -U_BOOT_CMD_END + BAREBOX_CMD_HELP(cmd_loadb_help) +BAREBOX_CMD_END #endif #ifdef CONFIG_CMD_LOADY -U_BOOT_CMD_START(loady) +BAREBOX_CMD_START(loady) .cmd = do_load_serial_bin, .usage = "Load binary file over serial line (ymodem mode)", - U_BOOT_CMD_HELP(cmd_loadb_help) -U_BOOT_CMD_END + BAREBOX_CMD_HELP(cmd_loadb_help) +BAREBOX_CMD_END #endif diff --git a/commands/loadenv.c b/commands/loadenv.c index 1250aa74bc..8b885abf23 100644 --- a/commands/loadenv.c +++ b/commands/loadenv.c @@ -50,11 +50,11 @@ static const __maybe_unused char cmd_loadenv_help[] = "If ommitted defaults to /env and defaults to /dev/env0.\n" "Note that envfs can only handle files. Directories are skipped silently.\n"; -U_BOOT_CMD_START(loadenv) +BAREBOX_CMD_START(loadenv) .cmd = do_loadenv, .usage = "load environment from persistent storage", - U_BOOT_CMD_HELP(cmd_loadenv_help) -U_BOOT_CMD_END + BAREBOX_CMD_HELP(cmd_loadenv_help) +BAREBOX_CMD_END /** * @page loadenv_command loadenv diff --git a/commands/loads.c b/commands/loads.c index 0d03597585..2578c1525d 100644 --- a/commands/loads.c +++ b/commands/loads.c @@ -380,7 +380,7 @@ write_record (char *buf) # endif /* CFG_CMD_SAVES */ #ifdef CFG_LOADS_BAUD_CHANGE -U_BOOT_CMD( +BAREBOX_CMD( loads, 3, 0, do_load_serial, "loads - load S-Record file over serial line\n", "[ off ] [ baud ]\n" @@ -389,7 +389,7 @@ U_BOOT_CMD( ); #else /* ! CFG_LOADS_BAUD_CHANGE */ -U_BOOT_CMD( +BAREBOX_CMD( loads, 2, 0, do_load_serial, "loads - load S-Record file over serial line\n", "[ off ]\n" @@ -404,7 +404,7 @@ U_BOOT_CMD( #if (CONFIG_COMMANDS & CFG_CMD_SAVES) #ifdef CFG_LOADS_BAUD_CHANGE -U_BOOT_CMD( +BAREBOX_CMD( saves, 4, 0, do_save_serial, "saves - save S-Record file over serial line\n", "[ off ] [size] [ baud ]\n" @@ -412,7 +412,7 @@ U_BOOT_CMD( " with offset 'off', size 'size' and baudrate 'baud'\n" ); #else /* ! CFG_LOADS_BAUD_CHANGE */ -U_BOOT_CMD( +BAREBOX_CMD( saves, 3, 0, do_save_serial, "saves - save S-Record file over serial line\n", "[ off ] [size]\n" diff --git a/commands/ls.c b/commands/ls.c index 6e085ae353..4d880e514a 100644 --- a/commands/ls.c +++ b/commands/ls.c @@ -199,8 +199,8 @@ static const __maybe_unused char cmd_ls_help[] = "List information about the FILEs (the current directory by default).\n" " -R list subdirectories recursively\n"; -U_BOOT_CMD_START(ls) +BAREBOX_CMD_START(ls) .cmd = do_ls, .usage = "list a file or directory", - U_BOOT_CMD_HELP(cmd_ls_help) -U_BOOT_CMD_END + BAREBOX_CMD_HELP(cmd_ls_help) +BAREBOX_CMD_END diff --git a/commands/lsmod.c b/commands/lsmod.c index ffca8405a4..696304d11b 100644 --- a/commands/lsmod.c +++ b/commands/lsmod.c @@ -12,7 +12,7 @@ static int do_lsmod (cmd_tbl_t *cmdtp, int argc, char *argv[]) return 0; } -U_BOOT_CMD_START(lsmod) +BAREBOX_CMD_START(lsmod) .cmd = do_lsmod, .usage = "list modules", -U_BOOT_CMD_END +BAREBOX_CMD_END diff --git a/commands/mem.c b/commands/mem.c index 01fdfdbb67..f06bc64f01 100644 --- a/commands/mem.c +++ b/commands/mem.c @@ -232,11 +232,11 @@ static const __maybe_unused char cmd_md_help[] = "respectively\n"; -U_BOOT_CMD_START(md) +BAREBOX_CMD_START(md) .cmd = do_mem_md, .usage = "memory display", - U_BOOT_CMD_HELP(cmd_md_help) -U_BOOT_CMD_END + BAREBOX_CMD_HELP(cmd_md_help) +BAREBOX_CMD_END static int do_mem_mw ( cmd_tbl_t *cmdtp, int argc, char *argv[]) { @@ -295,11 +295,11 @@ static const __maybe_unused char cmd_mw_help[] = "Write value(s) to the specifies region.\n" "see 'help md' for supported options.\n"; -U_BOOT_CMD_START(mw) +BAREBOX_CMD_START(mw) .cmd = do_mem_mw, .usage = "memory write (fill)", - U_BOOT_CMD_HELP(cmd_mw_help) -U_BOOT_CMD_END + BAREBOX_CMD_HELP(cmd_mw_help) +BAREBOX_CMD_END static int do_mem_cmp(cmd_tbl_t *cmdtp, int argc, char *argv[]) { @@ -404,11 +404,11 @@ static const __maybe_unused char cmd_memcmp_help[] = "be left unspecified in which case the whole file is\n" "compared\n"; -U_BOOT_CMD_START(memcmp) +BAREBOX_CMD_START(memcmp) .cmd = do_mem_cmp, .usage = "memory compare", - U_BOOT_CMD_HELP(cmd_memcmp_help) -U_BOOT_CMD_END + BAREBOX_CMD_HELP(cmd_memcmp_help) +BAREBOX_CMD_END static int do_mem_cp(cmd_tbl_t *cmdtp, int argc, char *argv[]) { @@ -500,11 +500,11 @@ static const __maybe_unused char cmd_memcpy_help[] = "\n" "Copy memory at of bytes to \n"; -U_BOOT_CMD_START(memcpy) +BAREBOX_CMD_START(memcpy) .cmd = do_mem_cp, .usage = "memory copy", - U_BOOT_CMD_HELP(cmd_memcpy_help) -U_BOOT_CMD_END + BAREBOX_CMD_HELP(cmd_memcpy_help) +BAREBOX_CMD_END static int do_memset(cmd_tbl_t *cmdtp, int argc, char *argv[]) { @@ -565,11 +565,11 @@ static const __maybe_unused char cmd_memset_help[] = "\n" "Fill the first n bytes of area with byte c\n"; -U_BOOT_CMD_START(memset) +BAREBOX_CMD_START(memset) .cmd = do_memset, .usage = "memory fill", - U_BOOT_CMD_HELP(cmd_memset_help) -U_BOOT_CMD_END + BAREBOX_CMD_HELP(cmd_memset_help) +BAREBOX_CMD_END static struct file_operations memops = { .read = mem_read, diff --git a/commands/meminfo.c b/commands/meminfo.c index 04b32b7df2..76caf0a4ff 100644 --- a/commands/meminfo.c +++ b/commands/meminfo.c @@ -30,7 +30,7 @@ static int do_meminfo (cmd_tbl_t *cmdtp, int argc, char *argv[]) return 0; } -U_BOOT_CMD_START(meminfo) +BAREBOX_CMD_START(meminfo) .cmd = do_meminfo, .usage = "print info about memory usage", -U_BOOT_CMD_END +BAREBOX_CMD_END diff --git a/commands/memtest.c b/commands/memtest.c index d2c61200bf..4038aceb7b 100644 --- a/commands/memtest.c +++ b/commands/memtest.c @@ -347,9 +347,9 @@ static const __maybe_unused char cmd_mtest_help[] = #endif "\nsimple RAM read/write test\n"; -U_BOOT_CMD_START(mtest) +BAREBOX_CMD_START(mtest) .cmd = do_mem_mtest, .usage = "simple RAM test", - U_BOOT_CMD_HELP(cmd_mtest_help) -U_BOOT_CMD_END + BAREBOX_CMD_HELP(cmd_mtest_help) +BAREBOX_CMD_END diff --git a/commands/mkdir.c b/commands/mkdir.c index db1514bef5..d5f58f0279 100644 --- a/commands/mkdir.c +++ b/commands/mkdir.c @@ -63,8 +63,8 @@ static const __maybe_unused char cmd_mkdir_help[] = "Usage: mkdir [directories]\n" "Create new directories\n"; -U_BOOT_CMD_START(mkdir) +BAREBOX_CMD_START(mkdir) .cmd = do_mkdir, .usage = "make directories", - U_BOOT_CMD_HELP(cmd_mkdir_help) -U_BOOT_CMD_END + BAREBOX_CMD_HELP(cmd_mkdir_help) +BAREBOX_CMD_END diff --git a/commands/mount.c b/commands/mount.c index 66767f7828..41735c8349 100644 --- a/commands/mount.c +++ b/commands/mount.c @@ -70,11 +70,11 @@ static const __maybe_unused char cmd_mount_help[] = " must be an empty directory descending directly from the\n" "root directory.\n"; -U_BOOT_CMD_START(mount) +BAREBOX_CMD_START(mount) .cmd = do_mount, .usage = "mount a filesystem to a device", - U_BOOT_CMD_HELP(cmd_mount_help) -U_BOOT_CMD_END + BAREBOX_CMD_HELP(cmd_mount_help) +BAREBOX_CMD_END /** @page mount_command mount * Usage: mount [\ \ \] @@ -90,7 +90,7 @@ U_BOOT_CMD_END * root directory. */ -/** @page how_mount_works How mount works in U-Boot +/** @page how_mount_works How mount works in barebox * * Mounting a filesystem ontop of a device is working like devices and drivers * are finding together. diff --git a/commands/nand.c b/commands/nand.c index 256ef4f97c..cbf1058d20 100644 --- a/commands/nand.c +++ b/commands/nand.c @@ -349,8 +349,8 @@ static const __maybe_unused char cmd_nand_help[] = " -d deregister a bad block aware device\n" " -b mark block at offset ofs as bad\n"; -U_BOOT_CMD_START(nand) +BAREBOX_CMD_START(nand) .cmd = do_nand, .usage = "", - U_BOOT_CMD_HELP(cmd_nand_help) -U_BOOT_CMD_END + BAREBOX_CMD_HELP(cmd_nand_help) +BAREBOX_CMD_END diff --git a/commands/net.c b/commands/net.c index 9114606a8e..df06227de4 100644 --- a/commands/net.c +++ b/commands/net.c @@ -86,11 +86,11 @@ static const __maybe_unused char cmd_tftp_help[] = "Usage: tftp [localfile]\n" "Load a file via network using BootP/TFTP protocol.\n"; -U_BOOT_CMD_START(tftp) +BAREBOX_CMD_START(tftp) .cmd = do_tftpb, .usage = "Load file using tftp protocol", - U_BOOT_CMD_HELP(cmd_tftp_help) -U_BOOT_CMD_END + BAREBOX_CMD_HELP(cmd_tftp_help) +BAREBOX_CMD_END /** * @page tftp_command tftp @@ -130,11 +130,11 @@ static int do_rarpb (cmd_tbl_t *cmdtp, int argc, char *argv[]) return 0; } -U_BOOT_CMD_START(rarpboot) +BAREBOX_CMD_START(rarpboot) .cmd = do_rarpb, .usage = "boot image via network using rarp/tftp protocol", - U_BOOT_CMD_HELP("[loadAddress] [bootfilename]\n") -U_BOOT_CMD_END + BAREBOX_CMD_HELP("[loadAddress] [bootfilename]\n") +BAREBOX_CMD_END #endif /* CONFIG_NET_RARP */ #ifdef CONFIG_NET_NFS @@ -147,11 +147,11 @@ static const __maybe_unused char cmd_nfs_help[] = "Usage: nfs [localfile]\n" "Load a file via network using nfs protocol.\n"; -U_BOOT_CMD_START(nfs) +BAREBOX_CMD_START(nfs) .cmd = do_nfs, .usage = "boot image via network using nfs protocol", - U_BOOT_CMD_HELP(cmd_nfs_help) -U_BOOT_CMD_END + BAREBOX_CMD_HELP(cmd_nfs_help) +BAREBOX_CMD_END #endif /* CONFIG_NET_NFS */ @@ -250,11 +250,11 @@ static int do_cdp (cmd_tbl_t *cmdtp, int argc, char *argv[]) return 0; } -U_BOOT_CMD_START(cdp) +BAREBOX_CMD_START(cdp) .cmd = do_cdp, .usage = "Perform CDP network configuration", - U_BOOT_CMD_HELP("[loadAddress] [host ip addr:bootfilename]\n") -U_BOOT_CMD_END + BAREBOX_CMD_HELP("[loadAddress] [host ip addr:bootfilename]\n") +BAREBOX_CMD_END #endif /* CONFIG_NET_CDP */ @@ -286,9 +286,9 @@ static int do_ethact (cmd_tbl_t *cmdtp, int argc, char *argv[]) static const __maybe_unused char cmd_ethact_help[] = "Usage: ethact [ethx]\n"; -U_BOOT_CMD_START(ethact) +BAREBOX_CMD_START(ethact) .cmd = do_ethact, .usage = "set current ethernet device", - U_BOOT_CMD_HELP(cmd_ethact_help) -U_BOOT_CMD_END + BAREBOX_CMD_HELP(cmd_ethact_help) +BAREBOX_CMD_END diff --git a/commands/partition.c b/commands/partition.c index 09991a2449..3cb7b612f5 100755 --- a/commands/partition.c +++ b/commands/partition.c @@ -154,11 +154,11 @@ static const __maybe_unused char cmd_addpart_help[] = "\n" "Note: That this command has to be reworked and will probably change it's API."; -U_BOOT_CMD_START(addpart) +BAREBOX_CMD_START(addpart) .cmd = do_addpart, .usage = "adds a partition table to a device", - U_BOOT_CMD_HELP(cmd_addpart_help) -U_BOOT_CMD_END + BAREBOX_CMD_HELP(cmd_addpart_help) +BAREBOX_CMD_END /** @page addpart_command addpart Add a partition to a device * @@ -199,11 +199,11 @@ static const __maybe_unused char cmd_delpart_help[] = "Usage: delpart FILE...\n" "Delete partitions previously added to a device with addpart.\n"; -U_BOOT_CMD_START(delpart) +BAREBOX_CMD_START(delpart) .cmd = do_delpart, .usage = "delete partition(s)", - U_BOOT_CMD_HELP(cmd_delpart_help) -U_BOOT_CMD_END + BAREBOX_CMD_HELP(cmd_delpart_help) +BAREBOX_CMD_END /** @page delpart_command delpart Delete a partition * diff --git a/commands/printenv.c b/commands/printenv.c index a7efd142cc..5490980c79 100644 --- a/commands/printenv.c +++ b/commands/printenv.c @@ -71,11 +71,11 @@ static const __maybe_unused char cmd_printenv_help[] = " - print value of environment variable 'name'\n"; -U_BOOT_CMD_START(printenv) +BAREBOX_CMD_START(printenv) .cmd = do_printenv, .usage = "print environment variables", - U_BOOT_CMD_HELP(cmd_printenv_help) -U_BOOT_CMD_END + BAREBOX_CMD_HELP(cmd_printenv_help) +BAREBOX_CMD_END /** * @page printenv_command printenv diff --git a/commands/pwd.c b/commands/pwd.c index 683a2407be..6c3cbb976d 100644 --- a/commands/pwd.c +++ b/commands/pwd.c @@ -29,7 +29,7 @@ static int do_pwd (cmd_tbl_t *cmdtp, int argc, char *argv[]) return 0; } -U_BOOT_CMD_START(pwd) +BAREBOX_CMD_START(pwd) .cmd = do_pwd, .usage = "print working directory", -U_BOOT_CMD_END +BAREBOX_CMD_END diff --git a/commands/readline.c b/commands/readline.c index 9b12da3015..55c288cb8d 100644 --- a/commands/readline.c +++ b/commands/readline.c @@ -49,9 +49,9 @@ static const __maybe_unused char cmd_readline_help[] = "Usage: readline VAR\n" "readline reads a line of user input into variable VAR.\n"; -U_BOOT_CMD_START(readline) +BAREBOX_CMD_START(readline) .cmd = do_readline, .usage = "prompt for user input", - U_BOOT_CMD_HELP(cmd_readline_help) -U_BOOT_CMD_END + BAREBOX_CMD_HELP(cmd_readline_help) +BAREBOX_CMD_END diff --git a/commands/reginfo.c b/commands/reginfo.c index fe0b776e59..f11a73c85d 100644 --- a/commands/reginfo.c +++ b/commands/reginfo.c @@ -29,7 +29,7 @@ static int do_reginfo (cmd_tbl_t *cmdtp, int argc, char *argv[]) return 0; } -U_BOOT_CMD_START(reginfo) +BAREBOX_CMD_START(reginfo) .cmd = do_reginfo, .usage = "print register information", -U_BOOT_CMD_END +BAREBOX_CMD_END diff --git a/commands/reset.c b/commands/reset.c index 1e9b74fef8..f148623525 100644 --- a/commands/reset.c +++ b/commands/reset.c @@ -31,7 +31,7 @@ static int cmd_reset (cmd_tbl_t *cmdtp, int argc, char *argv[]) return 1; } -U_BOOT_CMD_START(reset) +BAREBOX_CMD_START(reset) .cmd = cmd_reset, .usage = "Perform RESET of the CPU", -U_BOOT_CMD_END +BAREBOX_CMD_END diff --git a/commands/rm.c b/commands/rm.c index a5b29d2553..869460694f 100644 --- a/commands/rm.c +++ b/commands/rm.c @@ -46,8 +46,8 @@ static const __maybe_unused char cmd_rm_help[] = "Usage: rm [FILES]\n" "Remove files\n"; -U_BOOT_CMD_START(rm) +BAREBOX_CMD_START(rm) .cmd = do_rm, .usage = "remove files", - U_BOOT_CMD_HELP(cmd_rm_help) -U_BOOT_CMD_END + BAREBOX_CMD_HELP(cmd_rm_help) +BAREBOX_CMD_END diff --git a/commands/rmdir.c b/commands/rmdir.c index 1248b8b9a5..3531f32d7f 100644 --- a/commands/rmdir.c +++ b/commands/rmdir.c @@ -25,8 +25,8 @@ static const __maybe_unused char cmd_rmdir_help[] = "Usage: rmdir [directories]\n" "Remove directories. The directories have to be empty.\n"; -U_BOOT_CMD_START(rmdir) +BAREBOX_CMD_START(rmdir) .cmd = do_rmdir, .usage = "remove directorie(s)", - U_BOOT_CMD_HELP(cmd_rmdir_help) -U_BOOT_CMD_END + BAREBOX_CMD_HELP(cmd_rmdir_help) +BAREBOX_CMD_END diff --git a/commands/saveenv.c b/commands/saveenv.c index fadd6747f6..6a9da5cabb 100644 --- a/commands/saveenv.c +++ b/commands/saveenv.c @@ -101,11 +101,11 @@ static const __maybe_unused char cmd_saveenv_help[] = "If ommitted defaults to /env and defaults to /dev/env0.\n" "Note that envfs can only handle files. Directories are skipped silently.\n"; -U_BOOT_CMD_START(saveenv) +BAREBOX_CMD_START(saveenv) .cmd = do_saveenv, .usage = "save environment to persistent storage", - U_BOOT_CMD_HELP(cmd_saveenv_help) -U_BOOT_CMD_END + BAREBOX_CMD_HELP(cmd_saveenv_help) +BAREBOX_CMD_END /** * @page saveenv_command saveenv diff --git a/commands/setenv.c b/commands/setenv.c index 944c21592c..16b81776a2 100644 --- a/commands/setenv.c +++ b/commands/setenv.c @@ -45,11 +45,11 @@ static const __maybe_unused char cmd_setenv_help[] = " - delete environment variable 'name'\n"; -U_BOOT_CMD_START(setenv) +BAREBOX_CMD_START(setenv) .cmd = do_setenv, .usage = "set environment variables", - U_BOOT_CMD_HELP(cmd_setenv_help) -U_BOOT_CMD_END + BAREBOX_CMD_HELP(cmd_setenv_help) +BAREBOX_CMD_END /** * @page setenv_command setenv: set an environment variable diff --git a/commands/sleep.c b/commands/sleep.c index 4a7aef083c..d88f39efb9 100644 --- a/commands/sleep.c +++ b/commands/sleep.c @@ -43,7 +43,7 @@ static int do_sleep (cmd_tbl_t *cmdtp, int argc, char *argv[]) return 0; } -U_BOOT_CMD_START(sleep) +BAREBOX_CMD_START(sleep) .cmd = do_sleep, .usage = "delay execution for n seconds", -U_BOOT_CMD_END +BAREBOX_CMD_END diff --git a/commands/test.c b/commands/test.c index fa01bc0d91..afabe1234d 100644 --- a/commands/test.c +++ b/commands/test.c @@ -1,7 +1,7 @@ /* * test.c - sh like test * - * Originally based on U-Boots do_test, but mostly reimplemented + * Originally based on bareboxs do_test, but mostly reimplemented * for smaller binary size * * Copyright (c) 2007 Sascha Hauer , Pengutronix @@ -229,9 +229,9 @@ static const __maybe_unused char cmd_test_help[] = static const __maybe_unused char cmd_test_usage[] = "minimal test like /bin/sh"; -U_BOOT_CMD_START(test) +BAREBOX_CMD_START(test) .aliases = test_aliases, .cmd = do_test, .usage = cmd_test_usage, - U_BOOT_CMD_HELP(cmd_test_help) -U_BOOT_CMD_END + BAREBOX_CMD_HELP(cmd_test_help) +BAREBOX_CMD_END diff --git a/commands/timeout.c b/commands/timeout.c index b0fd906f9c..dfbefc9c75 100644 --- a/commands/timeout.c +++ b/commands/timeout.c @@ -102,9 +102,9 @@ static const __maybe_unused char cmd_timeout_help[] = " -r interrupt on return\n" " -s silent mode\n"; -U_BOOT_CMD_START(timeout) +BAREBOX_CMD_START(timeout) .cmd = do_timeout, .usage = "wait for a specified timeout", - U_BOOT_CMD_HELP(cmd_timeout_help) -U_BOOT_CMD_END + BAREBOX_CMD_HELP(cmd_timeout_help) +BAREBOX_CMD_END diff --git a/commands/true.c b/commands/true.c index 61381ab0df..4697a81157 100644 --- a/commands/true.c +++ b/commands/true.c @@ -29,8 +29,8 @@ static int do_true (cmd_tbl_t *cmdtp, int argc, char *argv[]) return 0; } -U_BOOT_CMD_START(true) +BAREBOX_CMD_START(true) .cmd = do_true, .usage = "do nothing, successfully", -U_BOOT_CMD_END +BAREBOX_CMD_END diff --git a/commands/umount.c b/commands/umount.c index d0ac5256e8..0dc517a322 100644 --- a/commands/umount.c +++ b/commands/umount.c @@ -42,8 +42,8 @@ static const __maybe_unused char cmd_umount_help[] = "Usage: umount \n" "umount a filesystem mounted on a specific mountpoint\n"; -U_BOOT_CMD_START(umount) +BAREBOX_CMD_START(umount) .cmd = do_umount, .usage = "umount a filesystem", - U_BOOT_CMD_HELP(cmd_umount_help) -U_BOOT_CMD_END + BAREBOX_CMD_HELP(cmd_umount_help) +BAREBOX_CMD_END diff --git a/commands/version.c b/commands/version.c index a9626809bf..425f430f14 100644 --- a/commands/version.c +++ b/commands/version.c @@ -31,8 +31,8 @@ static int do_version (cmd_tbl_t *cmdtp, int argc, char *argv[]) return 0; } -U_BOOT_CMD_START(version) +BAREBOX_CMD_START(version) .cmd = do_version, .usage = "print monitor version", -U_BOOT_CMD_END +BAREBOX_CMD_END diff --git a/commands/xyzModem.c b/commands/xyzModem.c index 7f6955c5ae..e034658eb9 100644 --- a/commands/xyzModem.c +++ b/commands/xyzModem.c @@ -3,7 +3,7 @@ * @brief RedBoot stream handler for xyzModem protocol * * FileName: commands/xyzModem.c - * Originally from U-Boot V1 xyzModem.c + * Originally from barebox V1 xyzModem.c */ /* * 2008 - Nishanth Menon -- cgit v1.2.3