Whitebox
/
u-boot
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

common/cmd_*.c: sparse fixes

Browse Source 
cmd_boot.c:40:5: warning: symbol 'do_go' was not declared. Should it be static?
cmd_bootm.c:164:6: warning: symbol '__arch_preboot_os' was not declared. Should it be static?
cmd_bootm.c:477:5: warning: symbol 'do_bootm_subcommand' was not declared. Should it be static?
cmd_bootm.c:1022:1: error: directive in argument list
cmd_bootm.c:1028:1: error: directive in argument list
cmd_bootm.c:1029:1: error: directive in argument list
cmd_bootm.c:1036:1: error: directive in argument list
cmd_bootm.c:1042:1: error: directive in argument list
cmd_bootm.c:1044:1: error: directive in argument list
cmd_bootm.c:1045:1: error: directive in argument list
cmd_bootm.c:1047:1: error: directive in argument list
cmd_bootm.c:1089:5: warning: symbol 'do_iminfo' was not declared. Should it be static?
cmd_bootm.c:1176:5: warning: symbol 'do_imls' was not declared. Should it be static?
cmd_bootm.c:1654:1: error: directive in argument list
cmd_bootm.c:1660:1: error: directive in argument list
cmd_console.c:32:5: warning: symbol 'do_coninfo' was not declared. Should it be s
cmd_date.c:46:5: warning: symbol 'do_date' was not declared. Should it be static?
cmd_echo.c:27:5: warning: symbol 'do_echo' was not declared. Should it be static?
cmd_exit.c:27:5: warning: symbol 'do_exit' was not declared. Should it be static?
cmd_fat.c:97:5: warning: symbol 'do_fat_ls' was not declared. Should it be static?
cmd_fat.c:136:5: warning: symbol 'do_fat_fsinfo' was not declared. Should it be s
cmd_fdt.c:66:5: warning: symbol 'do_fdt' was not declared. Should it be static?
cmd_fdt.c:542:43: warning: incorrect type in assignment (different base types)
cmd_fdt.c:542:43:    expected unsigned int [unsigned] [usertype] <noident>
cmd_fdt.c:542:43:    got restricted __be32 [usertype] <noident>
cmd_fdt.c:679:42: warning: cast to restricted __be32
cmd_fdt.c:820:1: error: directive in argument list
cmd_fdt.c:822:1: error: directive in argument list
cmd_flash.c:292:5: warning: symbol 'do_flinfo' was not declared. Should it be static?
cmd_flash.c:324:5: warning: symbol 'do_flerase' was not declared. Should it be static?
cmd_flash.c:457:5: warning: symbol 'do_protect' was not declared. Should it be st
cmd_help.c:27:5: warning: symbol 'do_help' was not declared. Should it be static?
cmd_i2c.c:136:6: warning: symbol '__def_i2c_init_board' was not declared. Should it be static?
cmd_i2c.c:144:14: warning: symbol '__def_i2c_get_bus_speed' was not declared. Should it be static?
cmd_i2c.c:151:5: warning: symbol '__def_i2c_set_bus_speed' was not declared. Should it be static?
cmd_i2c.c:1322:1: error: directive in argument list
cmd_i2c.c:1324:1: error: directive in argument list
cmd_i2c.c:1326:1: error: directive in argument list
cmd_i2c.c:1328:1: error: directive in argument list
cmd_i2c.c:1337:1: error: directive in argument list
cmd_i2c.c:1339:1: error: directive in argument list
cmd_irq.c:27:5: warning: symbol 'do_interrupts' was not declared. Should it be static?
cmd_itest.c:133:5: warning: symbol 'binary_test' was not declared. Should it be static?
cmd_itest.c:158:5: warning: symbol 'do_itest' was not declared. Should it be stat
cmd_load.c:54:5: warning: symbol 'do_load_serial' was not declared. Should it be static?
cmd_load.c:431:6: warning: symbol 'his_eol' was not declared. Should it be static?
cmd_load.c:432:6: warning: symbol 'his_pad_count' was not declared. Should it be static?
cmd_load.c:433:6: warning: symbol 'his_pad_char' was not declared. Should it be static?
cmd_load.c:434:6: warning: symbol 'his_quote' was not declared. Should it be static?
cmd_load.c:436:5: warning: symbol 'do_load_serial_bin' was not declared. Should it be static?
cmd_load.c:549:6: warning: symbol 'send_pad' was not declared. Should it be static?
cmd_load.c:558:6: warning: symbol 'ktrans' was not declared. Should it be static?
cmd_load.c:568:5: warning: symbol 'chk1' was not declared. Should it be static?
cmd_load.c:578:6: warning: symbol 's1_sendpacket' was not declared. Should it be static?
cmd_load.c:587:6: warning: symbol 'send_ack' was not declared. Should it be static?
cmd_load.c:600:6: warning: symbol 'send_nack' was not declared. Should it be static?
cmd_load.c:614:6: warning: symbol 'os_data_init' was not declared. Should it be static?
cmd_load.c:615:6: warning: symbol 'os_data_char' was not declared. Should it be static?
cmd_load.c:657:6: warning: symbol 'k_data_init' was not declared. Should it be static?
cmd_load.c:663:6: warning: symbol 'k_data_save' was not declared. Should it be static?
cmd_load.c:669:6: warning: symbol 'k_data_restore' was not declared. Should it be static?
cmd_load.c:675:6: warning: symbol 'k_data_char' was not declared. Should it be static?
cmd_load.c:693:6: warning: symbol 'send_parms' was not declared. Should it be static?
cmd_load.c:694:6: warning: symbol 'send_ptr' was not declared. Should it be static?
cmd_load.c:698:6: warning: symbol 'handle_send_packet' was not declared. Should i
cmd_mdio.c:60:5: warning: symbol 'mdio_write_ranges' was not declared. Should it be static?
cmd_mdio.c:82:5: warning: symbol 'mdio_read_ranges' was not declared. Should it be static?
cmd_mdio.c:115:5: warning: symbol 'extract_reg_range' was not declared. Should it be static?
cmd_mdio.c:144:5: warning: symbol 'extract_phy_range' was not declared. Should it
cmd_mem.c:54:5: warning: symbol 'do_mem_md' was not declared. Should it be static?
cmd_mem.c:150:5: warning: symbol 'do_mem_mm' was not declared. Should it be static?
cmd_mem.c:154:5: warning: symbol 'do_mem_nm' was not declared. Should it be static?
cmd_mem.c:159:5: warning: symbol 'do_mem_mw' was not declared. Should it be static?
cmd_mem.c:256:5: warning: symbol 'do_mem_cmp' was not declared. Should it be static?
cmd_mem.c:326:5: warning: symbol 'do_mem_cp' was not declared. Should it be static?
cmd_mem.c:436:5: warning: symbol 'do_mem_base' was not declared. Should it be static?
cmd_mem.c:449:5: warning: symbol 'do_mem_loop' was not declared. Should it be static?
cmd_mem.c:595:5: warning: symbol 'do_mem_mtest' was not declared. Should it be static?
cmd_mem.c:618:26: warning: Using plain integer as NULL pointer
cmd_mem.c:1057:5: warning: symbol 'do_mem_crc' was not declared. Should it be static?
cmd_misc.c:30:5: warning: symbol 'do_sleep' was not declared. Should it be static
cmd_mmc.c:118:5: warning: symbol 'do_mmcinfo' was not declared. Should it be static?
cmd_mmc.c:272:32: warning: Using plain integer as NULL pointer
cmd_mmc.c:150:5: warning: symbol 'do_mmcops' was not declared. Should it be stati
cmd_mp.c:27:1: warning: symbol 'cpu_cmd' was not declared. Should it be static?
cmd_mp.c:85:1: error: directive in argument list
cmd_mp.c:88:1: error: directive in argument list
cmd_mtdparts.c:150:18: warning: symbol 'mtdids' was not declared. Should it be static?
cmd_mtdparts.c:153:18: warning: symbol 'devices' was not declared. Should it be static?
cmd_mtdparts.c:713:5: warning: symbol 'mtd_device_validate' was not declared. Should it be static?
cmd_mtdparts.c:1887:5: warning: symbol 'do_chpart' was not declared. Should it be static?
cmd_mtdparts.c:1925:5: warning: symbol 'do_mtdparts' was not declared. Should it be static?
cmd_mtdparts.c:2060:1: error: directive in argument list
cmd_mtdparts.c:2063:1: error: directive in argument list
cmd_mtdparts.c:2066:1: error: directive in argument list
cmd_mtdparts.c:2071:1: error: directive in argument list
cmd_mtdparts.c:2073:1: error: directive in argument list
cmd_nand.c:377:18: error: bad constant expression
cmd_nand.c:431:5: warning: symbol 'do_nand' was not declared. Should it be static?
cmd_nand.c:796:1: error: directive in argument list
cmd_nand.c:801:1: error: directive in argument list
cmd_nand.c:802:1: error: directive in argument list
cmd_nand.c:806:1: error: directive in argument list
cmd_nand.c:819:1: error: directive in argument list
cmd_nand.c:824:1: error: directive in argument list
cmd_nand.c:825:1: error: directive in argument list
cmd_nand.c:831:1: error: directive in argument list
cmd_nand.c:918:5: warning: symbol 'do_nandboot' was not declared. Should it be static?
cmd_net.c:33:5: warning: symbol 'do_bootp' was not declared. Should it be static?
cmd_net.c:107:5: warning: symbol 'do_dhcp' was not declared. Should it be static?
cmd_net.c:120:5: warning: symbol 'do_nfs' was not declared. Should it be static?
cmd_nvedit.c:138:5: warning: symbol 'do_env_print' was not declared. Should it be static?
cmd_nvedit.c:323:5: warning: symbol '_do_env_set' was not declared. Should it be static?
cmd_nvedit.c:435:5: warning: symbol 'do_env_set' was not declared. Should it be static?
cmd_nvedit.c:514:5: warning: symbol 'do_env_edit' was not declared. Should it be static?
cmd_nvedit.c:620:5: warning: symbol 'do_env_save' was not declared. Should it be static?
cmd_nvedit.c:1016:1: error: directive in argument list
cmd_nvedit.c:1018:1: error: directive in argument list
cmd_nvedit.c:1021:1: error: directive in argument list
cmd_nvedit.c:1023:1: error: directive in argument list
cmd_nvedit.c:1024:1: error: directive in argument list
cmd_nvedit.c:1026:1: error: directive in argument list
cmd_nvedit.c:1027:1: error: directive in argument list
cmd_nvedit.c:1029:1: error: directive in argument list
cmd_nvedit.c:1030:1: error: directive in argument list
cmd_nvedit.c:1032:1: error: directive in argument list
cmd_nvedit.c:1034:1: error: directive in argument list
cmd_nvedit.c:1036:1: error: directive in argument list
cmd_nvedit.c:1037:1: error: directive in argument list
cmd_nvedit.c:1039:1: error: directive in argument list
cmd_pci.c:38:17: warning: symbol 'ShortPCIListing' was not declared. Should it be static?
cmd_pci.c:38:22: warning: 'ShortPCIListing' defined but not used [-Wunused-variable]
cmd_pci.c:411:5: warning: symbol 'do_pci' was not declared. Should it be static?
cmd_pci.c:494:1: error: directive in argument list
cmd_pci.c:497:1: error: directive in argument list
cmd_reginfo.c:40:5: warning: symbol 'do_reginfo' was not declared. Should it be static?
cmd_sata.c:31:5: warning: symbol 'sata_curr_device' was not declared. Should it be static?
 note -> ata_piix.c doesn't seem to use 'sata_curr_device'; deleted.
cmd_sata.c:32:18: warning: symbol 'sata_dev_desc' was not declared. Should it be static?
cmd_sata.c:70:5: warning: symbol 'do_sata' was not declared. Should it be static?
cmd_setexpr.c:53:5: warning: symbol 'do_setexpr' was not declared. Should it be static?
cmd_source.c:186:1: error: directive in argument list
cmd_source.c:190:1: error: directive in argument list
cmd_test.c:27:5: warning: symbol 'do_test' was not declared. Should it be static?
cmd_test.c:153:5: warning: symbol 'do_false' was not declared. Should it be static?
cmd_test.c:164:5: warning: symbol 'do_true' was not declared. Should it be static
cmd_usb.c:43:6: warning: symbol 'usb_get_class_desc' was not declared. Should it be static?
cmd_usb.c:69:6: warning: symbol 'usb_display_class_sub' was not declared. Should it be static?
cmd_usb.c:151:6: warning: symbol 'usb_display_string' was not declared. Should it be static?
cmd_usb.c:161:6: warning: symbol 'usb_display_desc' was not declared. Should it be static?
cmd_usb.c:195:6: warning: symbol 'usb_display_conf_desc' was not declared. Should it be static?
cmd_usb.c:210:6: warning: symbol 'usb_display_if_desc' was not declared. Should it be static?
cmd_usb.c:227:6: warning: symbol 'usb_display_ep_desc' was not declared. Should it be static?
cmd_usb.c:252:6: warning: symbol 'usb_display_config' was not declared. Should it be static?
cmd_usb.c:283:6: warning: symbol 'usb_show_tree_graph' was not declared. Should it be static?
cmd_usb.c:343:6: warning: symbol 'usb_show_tree' was not declared. Should it be static?
cmd_usb.c:356:5: warning: symbol 'do_usbboot' was not declared. Should it be static?
cmd_usb.c:366:5: warning: symbol 'do_usb' was not declared. Should it be static?
cmd_version.c:31:5: warning: symbol 'do_version' was not declared. Should it be s
cmd_ximg.c:46:1: warning: symbol 'do_imgextract' was not declared. Should it be static?
cmd_ximg.c:272:1: error: directive in argument list
cmd_ximg.c:276:1: error: directive in argument list

Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
master
Kim Phillips 12 years ago committed by Tom Rini
parent 2f220500a4
commit 088f1b1991
32 changed files with 387 additions and 334 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 5
      common/cmd_boot.c
  2. 31
      common/cmd_bootm.c
  3. 2
      common/cmd_console.c
  4. 2
      common/cmd_date.c
  5. 2
      common/cmd_echo.c
  6. 2
      common/cmd_exit.c
  7. 5
      common/cmd_fat.c
  8. 21
      common/cmd_fdt.c
  9. 6
      common/cmd_flash.c
  10. 2
      common/cmd_help.c
  11. 20
      common/cmd_i2c.c
  12. 3
      common/cmd_irq.c
  13. 4
      common/cmd_itest.c
  14. 303
      common/cmd_load.c
  15. 20
      common/cmd_mdio.c
  16. 25
      common/cmd_mem.c
  17. 6
      common/cmd_misc.c
  18. 6
      common/cmd_mmc.c
  19. 22
      common/cmd_mp.c
  20. 26
      common/cmd_mtdparts.c
  21. 19
      common/cmd_nand.c
  22. 76
      common/cmd_net.c
  23. 25
      common/cmd_nvedit.c
  24. 17
      common/cmd_pci.c
  25. 3
      common/cmd_reginfo.c
  26. 4
      common/cmd_sata.c
  27. 2
      common/cmd_setexpr.c
  28. 11
      common/cmd_source.c
  29. 6
      common/cmd_test.c
  30. 30
      common/cmd_usb.c
  31. 2
      common/cmd_version.c
  32. 13
      common/cmd_ximg.c

5
common/cmd_boot.c
Unescape View File

@ -32,12 +32,13 @@
/* Allow ports to override the default behavior */ /* Allow ports to override the default behavior */
__attribute__((weak)) __attribute__((weak))
unsigned long do_go_exec (ulong (*entry)(int, char * const []), int argc, char * const argv[]) unsigned long do_go_exec(ulong (*entry)(int, char * const []), int argc,
char * const argv[])
{ {
return entry (argc, argv); return entry (argc, argv);
} }
int do_go (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) static int do_go(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
{ {
ulong addr, rc; ulong addr, rc;
int rcode = 0; int rcode = 0;

31
common/cmd_bootm.c
Unescape View File

@ -161,7 +161,7 @@ static boot_os_fn *boot_os[] = {
bootm_headers_t images; /* pointers to os/initrd/fdt images */ bootm_headers_t images; /* pointers to os/initrd/fdt images */
/* Allow for arch specific config before we boot */ /* Allow for arch specific config before we boot */
void __arch_preboot_os(void) static void __arch_preboot_os(void)
{ {
/* please define platform specific arch_preboot_os() */ /* please define platform specific arch_preboot_os() */
} }
@ -474,7 +474,7 @@ static cmd_tbl_t cmd_bootm_sub[] = {
U_BOOT_CMD_MKENT(go, 0, 1, (void *)BOOTM_STATE_OS_GO, "", ""), U_BOOT_CMD_MKENT(go, 0, 1, (void *)BOOTM_STATE_OS_GO, "", ""),
}; };
int do_bootm_subcommand(cmd_tbl_t *cmdtp, int flag, int argc, static int do_bootm_subcommand(cmd_tbl_t *cmdtp, int flag, int argc,
char * const argv[]) char * const argv[])
{ {
int ret = 0; int ret = 0;
@ -1013,9 +1013,8 @@ static void *boot_get_kernel(cmd_tbl_t *cmdtp, int flag, int argc,
return (void *)img_addr; return (void *)img_addr;
} }
U_BOOT_CMD( #ifdef CONFIG_SYS_LONGHELP
bootm, CONFIG_SYS_MAXARGS, 1, do_bootm, static char bootm_help_text[] =
"boot application image from memory",
"[addr [arg ...]]\n - boot application image stored in memory\n" "[addr [arg ...]]\n - boot application image stored in memory\n"
"\tpassing arguments 'arg ...'; when booting a Linux kernel,\n" "\tpassing arguments 'arg ...'; when booting a Linux kernel,\n"
"\t'arg' can be the address of an initrd image\n" "\t'arg' can be the address of an initrd image\n"
@ -1048,7 +1047,12 @@ U_BOOT_CMD(
"\tcmdline - OS specific command line processing/setup\n" "\tcmdline - OS specific command line processing/setup\n"
"\tbdt - OS specific bd_t processing\n" "\tbdt - OS specific bd_t processing\n"
"\tprep - OS specific prep before relocation or go\n" "\tprep - OS specific prep before relocation or go\n"
"\tgo - start OS" "\tgo - start OS";
#endif
U_BOOT_CMD(
bootm, CONFIG_SYS_MAXARGS, 1, do_bootm,
"boot application image from memory", bootm_help_text
); );
/*******************************************************************/ /*******************************************************************/
@ -1084,7 +1088,7 @@ U_BOOT_CMD(
/* iminfo - print header info for a requested image */ /* iminfo - print header info for a requested image */
/*******************************************************************/ /*******************************************************************/
#if defined(CONFIG_CMD_IMI) #if defined(CONFIG_CMD_IMI)
int do_iminfo(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) static int do_iminfo(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
{ {
int arg; int arg;
ulong addr; ulong addr;
@ -1171,7 +1175,7 @@ U_BOOT_CMD(
/* imls - list all images found in flash */ /* imls - list all images found in flash */
/*******************************************************************/ /*******************************************************************/
#if defined(CONFIG_CMD_IMLS) #if defined(CONFIG_CMD_IMLS)
int do_imls(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) static int do_imls(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
{ {
flash_info_t *info; flash_info_t *info;
int i, j; int i, j;
@ -1643,9 +1647,8 @@ static int do_bootz(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
return 1; return 1;
} }
U_BOOT_CMD( #ifdef CONFIG_SYS_LONGHELP
bootz, CONFIG_SYS_MAXARGS, 1, do_bootz, static char bootz_help_text[] =
"boot Linux zImage image from memory",
"[addr [initrd[:size]] [fdt]]\n" "[addr [initrd[:size]] [fdt]]\n"
" - boot Linux zImage stored in memory\n" " - boot Linux zImage stored in memory\n"
"\tThe argument 'initrd' is optional and specifies the address\n" "\tThe argument 'initrd' is optional and specifies the address\n"
@ -1658,5 +1661,11 @@ U_BOOT_CMD(
"\tuse a '-' for the second argument. If you do not pass a third\n" "\tuse a '-' for the second argument. If you do not pass a third\n"
"\ta bd_info struct will be passed instead\n" "\ta bd_info struct will be passed instead\n"
#endif #endif
"";
#endif
U_BOOT_CMD(
bootz, CONFIG_SYS_MAXARGS, 1, do_bootz,
"boot Linux zImage image from memory", bootz_help_text
); );
#endif /* CONFIG_CMD_BOOTZ */ #endif /* CONFIG_CMD_BOOTZ */

2
common/cmd_console.c
Unescape View File

@ -29,7 +29,7 @@
#include <stdio_dev.h> #include <stdio_dev.h>
extern void _do_coninfo (void); extern void _do_coninfo (void);
int do_coninfo (cmd_tbl_t * cmd, int flag, int argc, char * const argv[]) static int do_coninfo(cmd_tbl_t *cmd, int flag, int argc, char * const argv[])
{ {
int l; int l;
struct list_head *list = stdio_get_list(); struct list_head *list = stdio_get_list();

2
common/cmd_date.c
Unescape View File

@ -43,7 +43,7 @@ static const char * const weekdays[] = {
int mk_date (const char *, struct rtc_time *); int mk_date (const char *, struct rtc_time *);
int do_date (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) static int do_date(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
{ {
struct rtc_time tm; struct rtc_time tm;
int rcode = 0; int rcode = 0;

2
common/cmd_echo.c
Unescape View File

@ -24,7 +24,7 @@
#include <common.h> #include <common.h>
#include <command.h> #include <command.h>
int do_echo(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) static int do_echo(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
{ {
int i; int i;
int putnl = 1; int putnl = 1;

2
common/cmd_exit.c
Unescape View File

@ -24,7 +24,7 @@
#include <common.h> #include <common.h>
#include <command.h> #include <command.h>
int do_exit(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) static int do_exit(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
{ {
int r; int r;

5
common/cmd_fat.c
Unescape View File

@ -52,7 +52,7 @@ U_BOOT_CMD(
" All numeric parameters are assumed to be hex." " All numeric parameters are assumed to be hex."
); );
int do_fat_ls (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) static int do_fat_ls(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
{ {
return do_ls(cmdtp, flag, argc, argv, FS_TYPE_FAT); return do_ls(cmdtp, flag, argc, argv, FS_TYPE_FAT);
} }
@ -64,7 +64,8 @@ U_BOOT_CMD(
" - list files from 'dev' on 'interface' in a 'directory'" " - list files from 'dev' on 'interface' in a 'directory'"
); );
int do_fat_fsinfo (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) static int do_fat_fsinfo(cmd_tbl_t *cmdtp, int flag, int argc,
char * const argv[])
{ {
int dev, part; int dev, part;
block_dev_desc_t *dev_desc; block_dev_desc_t *dev_desc;

21
common/cmd_fdt.c
Unescape View File

@ -95,7 +95,7 @@ static int fdt_value_setenv(const void *nodep, int len, const char *var)
/* /*
* Flattened Device Tree command, see the help for parameter definitions. * Flattened Device Tree command, see the help for parameter definitions.
*/ */
int do_fdt (cmd_tbl_t * cmdtp, int flag, int argc, char * const argv[]) static int do_fdt(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
{ {
if (argc < 2) if (argc < 2)
return CMD_RET_USAGE; return CMD_RET_USAGE;
@ -682,7 +682,7 @@ static int fdt_parse_prop(char * const *newval, int count, char *data, int *len)
cp = newp; cp = newp;
tmp = simple_strtoul(cp, &newp, 0); tmp = simple_strtoul(cp, &newp, 0);
*(uint32_t *)data = __cpu_to_be32(tmp); *(__be32 *)data = __cpu_to_be32(tmp);
data += 4; data += 4;
*len += 4; *len += 4;
@ -818,7 +818,7 @@ static void print_data(const void *data, int len)
if (len > CONFIG_CMD_FDT_MAX_DUMP) if (len > CONFIG_CMD_FDT_MAX_DUMP)
printf("* 0x%p [0x%08x]", data, len); printf("* 0x%p [0x%08x]", data, len);
else { else {
const u32 *p; const __be32 *p;
printf("<"); printf("<");
for (j = 0, p = data; j < len/4; j++) for (j = 0, p = data; j < len/4; j++)
@ -964,11 +964,9 @@ static int fdt_print(const char *pathp, char *prop, int depth)
} }
/********************************************************************/ /********************************************************************/
#ifdef CONFIG_SYS_LONGHELP
U_BOOT_CMD( static char fdt_help_text[] =
fdt, 255, 0, do_fdt, "addr <addr> [<length>] - Set the fdt location to <addr>\n"
"flattened device tree utility commands",
"addr <addr> [<length>] - Set the fdt location to <addr>\n"
#ifdef CONFIG_OF_BOARD_SETUP #ifdef CONFIG_OF_BOARD_SETUP
"fdt boardsetup - Do board-specific set up\n" "fdt boardsetup - Do board-specific set up\n"
#endif #endif
@ -992,5 +990,10 @@ U_BOOT_CMD(
"fdt chosen [<start> <end>] - Add/update the /chosen branch in the tree\n" "fdt chosen [<start> <end>] - Add/update the /chosen branch in the tree\n"
" <start>/<end> - initrd start/end addr\n" " <start>/<end> - initrd start/end addr\n"
"NOTE: Dereference aliases by omiting the leading '/', " "NOTE: Dereference aliases by omiting the leading '/', "
"e.g. fdt print ethernet0." "e.g. fdt print ethernet0.";
#endif
U_BOOT_CMD(
fdt, 255, 0, do_fdt,
"flattened device tree utility commands", fdt_help_text
); );

6
common/cmd_flash.c
Unescape View File

@ -289,7 +289,7 @@ flash_fill_sect_ranges (ulong addr_first, ulong addr_last,
} }
#endif /* CONFIG_SYS_NO_FLASH */ #endif /* CONFIG_SYS_NO_FLASH */
int do_flinfo ( cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) static int do_flinfo(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
{ {
#ifndef CONFIG_SYS_NO_FLASH #ifndef CONFIG_SYS_NO_FLASH
ulong bank; ulong bank;
@ -321,7 +321,7 @@ int do_flinfo ( cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
return 0; return 0;
} }
int do_flerase (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) static int do_flerase(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
{ {
#ifndef CONFIG_SYS_NO_FLASH #ifndef CONFIG_SYS_NO_FLASH
flash_info_t *info = NULL; flash_info_t *info = NULL;
@ -454,7 +454,7 @@ int flash_sect_erase (ulong addr_first, ulong addr_last)
} }
#endif /* CONFIG_SYS_NO_FLASH */ #endif /* CONFIG_SYS_NO_FLASH */
int do_protect (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) static int do_protect(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
{ {
int rcode = 0; int rcode = 0;
#ifndef CONFIG_SYS_NO_FLASH #ifndef CONFIG_SYS_NO_FLASH

2
common/cmd_help.c
Unescape View File

@ -24,7 +24,7 @@
#include <common.h> #include <common.h>
#include <command.h> #include <command.h>
int do_help(cmd_tbl_t * cmdtp, int flag, int argc, char * const argv[]) static int do_help(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
{ {
cmd_tbl_t *start = ll_entry_start(cmd_tbl_t, cmd); cmd_tbl_t *start = ll_entry_start(cmd_tbl_t, cmd);
const int len = ll_entry_count(cmd_tbl_t, cmd); const int len = ll_entry_count(cmd_tbl_t, cmd);

20
common/cmd_i2c.c
Unescape View File

@ -133,7 +133,7 @@ DECLARE_GLOBAL_DATA_PTR;
#define DISP_LINE_LEN 16 #define DISP_LINE_LEN 16
/* implement possible board specific board init */ /* implement possible board specific board init */
void __def_i2c_init_board(void) static void __def_i2c_init_board(void)
{ {
return; return;
} }
@ -141,14 +141,14 @@ void i2c_init_board(void)
__attribute__((weak, alias("__def_i2c_init_board"))); __attribute__((weak, alias("__def_i2c_init_board")));
/* TODO: Implement architecture-specific get/set functions */ /* TODO: Implement architecture-specific get/set functions */
unsigned int __def_i2c_get_bus_speed(void) static unsigned int __def_i2c_get_bus_speed(void)
{ {
return CONFIG_SYS_I2C_SPEED; return CONFIG_SYS_I2C_SPEED;
} }
unsigned int i2c_get_bus_speed(void) unsigned int i2c_get_bus_speed(void)
__attribute__((weak, alias("__def_i2c_get_bus_speed"))); __attribute__((weak, alias("__def_i2c_get_bus_speed")));
int __def_i2c_set_bus_speed(unsigned int speed) static int __def_i2c_set_bus_speed(unsigned int speed)
{ {
if (speed != CONFIG_SYS_I2C_SPEED) if (speed != CONFIG_SYS_I2C_SPEED)
return -1; return -1;
@ -1376,10 +1376,8 @@ static int do_i2c(cmd_tbl_t * cmdtp, int flag, int argc, char * const argv[])
} }
/***************************************************/ /***************************************************/
#ifdef CONFIG_SYS_LONGHELP
U_BOOT_CMD( static char i2c_help_text[] =
i2c, 6, 1, do_i2c,
"I2C sub-system",
#if defined(CONFIG_I2C_MUX) #if defined(CONFIG_I2C_MUX)
"bus [muxtype:muxaddr:muxchannel] - add a new bus reached over muxes\ni2c " "bus [muxtype:muxaddr:muxchannel] - add a new bus reached over muxes\ni2c "
#endif /* CONFIG_I2C_MUX */ #endif /* CONFIG_I2C_MUX */
@ -1399,7 +1397,13 @@ U_BOOT_CMD(
#if defined(CONFIG_CMD_SDRAM) #if defined(CONFIG_CMD_SDRAM)
"i2c sdram chip - print SDRAM configuration information\n" "i2c sdram chip - print SDRAM configuration information\n"
#endif #endif
"i2c speed [speed] - show or set I2C bus speed" "i2c speed [speed] - show or set I2C bus speed";
#endif
U_BOOT_CMD(
i2c, 6, 1, do_i2c,
"I2C sub-system",
i2c_help_text
); );
#if defined(CONFIG_I2C_MUX) #if defined(CONFIG_I2C_MUX)

3
common/cmd_irq.c
Unescape View File

@ -24,7 +24,8 @@
#include <config.h> #include <config.h>
#include <command.h> #include <command.h>
int do_interrupts(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) static int do_interrupts(cmd_tbl_t *cmdtp, int flag, int argc,
char * const argv[])
{ {
if (argc != 2) if (argc != 2)

4
common/cmd_itest.c
Unescape View File

@ -130,7 +130,7 @@ static int arithcomp (char *s, char *t, int op, int w)
return (0); return (0);
} }
int binary_test (char *op, char *arg1, char *arg2, int w) static int binary_test(char *op, char *arg1, char *arg2, int w)
{ {
int len, i; int len, i;
const op_tbl_t *optp; const op_tbl_t *optp;
@ -155,7 +155,7 @@ int binary_test (char *op, char *arg1, char *arg2, int w)
} }
/* command line interface to the shell test */ /* command line interface to the shell test */
int do_itest ( cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[] ) static int do_itest(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
{ {
int value, w; int value, w;

303
common/cmd_load.c
Unescape View File

@ -34,15 +34,15 @@
DECLARE_GLOBAL_DATA_PTR; DECLARE_GLOBAL_DATA_PTR;
#if defined(CONFIG_CMD_LOADB) #if defined(CONFIG_CMD_LOADB)
static ulong load_serial_ymodem (ulong offset); static ulong load_serial_ymodem(ulong offset);
#endif #endif
#if defined(CONFIG_CMD_LOADS) #if defined(CONFIG_CMD_LOADS)
static ulong load_serial (long offset); static ulong load_serial(long offset);
static int read_record (char *buf, ulong len); static int read_record(char *buf, ulong len);
# if defined(CONFIG_CMD_SAVES) # if defined(CONFIG_CMD_SAVES)
static int save_serial (ulong offset, ulong size); static int save_serial(ulong offset, ulong size);
static int write_record (char *buf); static int write_record(char *buf);
#endif #endif
static int do_echo = 1; static int do_echo = 1;
@ -51,7 +51,8 @@ static int do_echo = 1;
/* -------------------------------------------------------------------- */ /* -------------------------------------------------------------------- */
#if defined(CONFIG_CMD_LOADS) #if defined(CONFIG_CMD_LOADS)
int do_load_serial (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) static int do_load_serial(cmd_tbl_t *cmdtp, int flag, int argc,
char * const argv[])
{ {
long offset = 0; long offset = 0;
ulong addr; ulong addr;
@ -82,11 +83,11 @@ int do_load_serial (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
load_baudrate = current_baudrate; load_baudrate = current_baudrate;
} }
if (load_baudrate != current_baudrate) { if (load_baudrate != current_baudrate) {
printf ("## Switch baudrate to %d bps and press ENTER ...\n", printf("## Switch baudrate to %d bps and press ENTER ...\n",
load_baudrate); load_baudrate);
udelay(50000); udelay(50000);
gd->baudrate = load_baudrate; gd->baudrate = load_baudrate;
serial_setbrg (); serial_setbrg();
udelay(50000); udelay(50000);
for (;;) { for (;;) {
if (getc() == '\r') if (getc() == '\r')
@ -99,9 +100,9 @@ int do_load_serial (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
} }
#endif /* CONFIG_SYS_LOADS_BAUD_CHANGE */ #endif /* CONFIG_SYS_LOADS_BAUD_CHANGE */
printf ("## Ready for S-Record download ...\n"); printf("## Ready for S-Record download ...\n");
addr = load_serial (offset); addr = load_serial(offset);
/* /*
* Gather any trailing characters (for instance, the ^D which * Gather any trailing characters (for instance, the ^D which
@ -116,21 +117,21 @@ int do_load_serial (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
} }
if (addr == ~0) { if (addr == ~0) {
printf ("## S-Record download aborted\n"); printf("## S-Record download aborted\n");
rcode = 1; rcode = 1;
} else { } else {
printf ("## Start Addr = 0x%08lX\n", addr); printf("## Start Addr = 0x%08lX\n", addr);
load_addr = addr; load_addr = addr;
} }
#ifdef CONFIG_SYS_LOADS_BAUD_CHANGE #ifdef CONFIG_SYS_LOADS_BAUD_CHANGE
if (load_baudrate != current_baudrate) { if (load_baudrate != current_baudrate) {
printf ("## Switch baudrate to %d bps and press ESC ...\n", printf("## Switch baudrate to %d bps and press ESC ...\n",
current_baudrate); current_baudrate);
udelay (50000); udelay(50000);
gd->baudrate = current_baudrate; gd->baudrate = current_baudrate;
serial_setbrg (); serial_setbrg();
udelay (50000); udelay(50000);
for (;;) { for (;;) {
if (getc() == 0x1B) /* ESC */ if (getc() == 0x1B) /* ESC */
break; break;
@ -140,8 +141,7 @@ int do_load_serial (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
return rcode; return rcode;
} }
static ulong static ulong load_serial(long offset)
load_serial (long offset)
{ {
char record[SREC_MAXRECLEN + 1]; /* buffer for one S-Record */ char record[SREC_MAXRECLEN + 1]; /* buffer for one S-Record */
char binbuf[SREC_MAXBINLEN]; /* buffer for binary data */ char binbuf[SREC_MAXBINLEN]; /* buffer for binary data */
@ -156,7 +156,7 @@ load_serial (long offset)
int line_count = 0; int line_count = 0;
while (read_record(record, SREC_MAXRECLEN + 1) >= 0) { while (read_record(record, SREC_MAXRECLEN + 1) >= 0) {
type = srec_decode (record, &binlen, &addr, binbuf); type = srec_decode(record, &binlen, &addr, binbuf);
if (type < 0) { if (type < 0) {
return (~0); /* Invalid S-Record */ return (~0); /* Invalid S-Record */
@ -173,13 +173,13 @@ load_serial (long offset)
rc = flash_write((char *)binbuf,store_addr,binlen); rc = flash_write((char *)binbuf,store_addr,binlen);
if (rc != 0) { if (rc != 0) {
flash_perror (rc); flash_perror(rc);
return (~0); return (~0);
} }
} else } else
#endif #endif
{ {
memcpy ((char *)(store_addr), binbuf, binlen); memcpy((char *)(store_addr), binbuf, binlen);
} }
if ((store_addr) < start_addr) if ((store_addr) < start_addr)
start_addr = store_addr; start_addr = store_addr;
@ -189,15 +189,15 @@ load_serial (long offset)
case SREC_END2: case SREC_END2:
case SREC_END3: case SREC_END3:
case SREC_END4: case SREC_END4:
udelay (10000); udelay(10000);
size = end_addr - start_addr + 1; size = end_addr - start_addr + 1;
printf ("\n" printf("\n"
"## First Load Addr = 0x%08lX\n" "## First Load Addr = 0x%08lX\n"
"## Last Load Addr = 0x%08lX\n" "## Last Load Addr = 0x%08lX\n"
"## Total Size = 0x%08lX = %ld Bytes\n", "## Total Size = 0x%08lX = %ld Bytes\n",
start_addr, end_addr, size, size start_addr, end_addr, size, size
); );
flush_cache (start_addr, size); flush_cache(start_addr, size);
sprintf(buf, "%lX", size); sprintf(buf, "%lX", size);
setenv("filesize", buf); setenv("filesize", buf);
return (addr); return (addr);
@ -208,15 +208,14 @@ load_serial (long offset)
} }
if (!do_echo) { /* print a '.' every 100 lines */ if (!do_echo) { /* print a '.' every 100 lines */
if ((++line_count % 100) == 0) if ((++line_count % 100) == 0)
putc ('.'); putc('.');
} }
} }
return (~0); /* Download aborted */ return (~0); /* Download aborted */
} }
static int static int read_record(char *buf, ulong len)
read_record (char *buf, ulong len)
{ {
char *p; char *p;
char c; char c;
@ -226,7 +225,7 @@ read_record (char *buf, ulong len)
for (p=buf; p < buf+len; ++p) { for (p=buf; p < buf+len; ++p) {
c = getc(); /* read character */ c = getc(); /* read character */
if (do_echo) if (do_echo)
putc (c); /* ... and echo it */ putc(c); /* ... and echo it */
switch (c) { switch (c) {
case '\r': case '\r':
@ -280,11 +279,11 @@ int do_save_serial (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
save_baudrate = current_baudrate; save_baudrate = current_baudrate;
} }
if (save_baudrate != current_baudrate) { if (save_baudrate != current_baudrate) {
printf ("## Switch baudrate to %d bps and press ENTER ...\n", printf("## Switch baudrate to %d bps and press ENTER ...\n",
save_baudrate); save_baudrate);
udelay(50000); udelay(50000);
gd->baudrate = save_baudrate; gd->baudrate = save_baudrate;
serial_setbrg (); serial_setbrg();
udelay(50000); udelay(50000);
for (;;) { for (;;) {
if (getc() == '\r') if (getc() == '\r')
@ -297,24 +296,24 @@ int do_save_serial (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
} }
#endif /* CONFIG_SYS_LOADS_BAUD_CHANGE */ #endif /* CONFIG_SYS_LOADS_BAUD_CHANGE */
printf ("## Ready for S-Record upload, press ENTER to proceed ...\n"); printf("## Ready for S-Record upload, press ENTER to proceed ...\n");
for (;;) { for (;;) {
if (getc() == '\r') if (getc() == '\r')
break; break;
} }
if(save_serial (offset, size)) { if (save_serial(offset, size)) {
printf ("## S-Record upload aborted\n"); printf("## S-Record upload aborted\n");
} else { } else {
printf ("## S-Record upload complete\n"); printf("## S-Record upload complete\n");
} }
#ifdef CONFIG_SYS_LOADS_BAUD_CHANGE #ifdef CONFIG_SYS_LOADS_BAUD_CHANGE
if (save_baudrate != current_baudrate) { if (save_baudrate != current_baudrate) {
printf ("## Switch baudrate to %d bps and press ESC ...\n", printf("## Switch baudrate to %d bps and press ESC ...\n",
(int)current_baudrate); (int)current_baudrate);
udelay (50000); udelay(50000);
gd->baudrate = current_baudrate; gd->baudrate = current_baudrate;
serial_setbrg (); serial_setbrg();
udelay (50000); udelay(50000);
for (;;) { for (;;) {
if (getc() == 0x1B) /* ESC */ if (getc() == 0x1B) /* ESC */
break; break;
@ -329,7 +328,7 @@ int do_save_serial (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
#define SREC3_END "S70500000000FA\n" #define SREC3_END "S70500000000FA\n"
#define SREC_BYTES_PER_RECORD 16 #define SREC_BYTES_PER_RECORD 16
static int save_serial (ulong address, ulong count) static int save_serial(ulong address, ulong count)
{ {
int i, c, reclen, checksum, length; int i, c, reclen, checksum, length;
char *hex = "0123456789ABCDEF"; char *hex = "0123456789ABCDEF";
@ -384,8 +383,7 @@ static int save_serial (ulong address, ulong count)
return(0); return(0);
} }
static int static int write_record(char *buf)
write_record (char *buf)
{ {
char c; char c;
@ -425,15 +423,16 @@ write_record (char *buf)
static void set_kerm_bin_mode(unsigned long *); static void set_kerm_bin_mode(unsigned long *);
static int k_recv(void); static int k_recv(void);
static ulong load_serial_bin (ulong offset); static ulong load_serial_bin(ulong offset);
char his_eol; /* character he needs at end of packet */ static char his_eol; /* character he needs at end of packet */
int his_pad_count; /* number of pad chars he needs */ static int his_pad_count; /* number of pad chars he needs */
char his_pad_char; /* pad chars he needs */ static char his_pad_char; /* pad chars he needs */
char his_quote; /* quote chars he'll use */ static char his_quote; /* quote chars he'll use */
int do_load_serial_bin (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) static int do_load_serial_bin(cmd_tbl_t *cmdtp, int flag, int argc,
char * const argv[])
{ {
ulong offset = 0; ulong offset = 0;
ulong addr; ulong addr;
@ -463,11 +462,11 @@ int do_load_serial_bin (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[
} }
if (load_baudrate != current_baudrate) { if (load_baudrate != current_baudrate) {
printf ("## Switch baudrate to %d bps and press ENTER ...\n", printf("## Switch baudrate to %d bps and press ENTER ...\n",
load_baudrate); load_baudrate);
udelay(50000); udelay(50000);
gd->baudrate = load_baudrate; gd->baudrate = load_baudrate;
serial_setbrg (); serial_setbrg();
udelay(50000); udelay(50000);
for (;;) { for (;;) {
if (getc() == '\r') if (getc() == '\r')
@ -476,37 +475,37 @@ int do_load_serial_bin (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[
} }
if (strcmp(argv[0],"loady")==0) { if (strcmp(argv[0],"loady")==0) {
printf ("## Ready for binary (ymodem) download " printf("## Ready for binary (ymodem) download "
"to 0x%08lX at %d bps...\n", "to 0x%08lX at %d bps...\n",
offset, offset,
load_baudrate); load_baudrate);
addr = load_serial_ymodem (offset); addr = load_serial_ymodem(offset);
} else { } else {
printf ("## Ready for binary (kermit) download " printf("## Ready for binary (kermit) download "
"to 0x%08lX at %d bps...\n", "to 0x%08lX at %d bps...\n",
offset, offset,
load_baudrate); load_baudrate);
addr = load_serial_bin (offset); addr = load_serial_bin(offset);
if (addr == ~0) { if (addr == ~0) {
load_addr = 0; load_addr = 0;
printf ("## Binary (kermit) download aborted\n"); printf("## Binary (kermit) download aborted\n");
rcode = 1; rcode = 1;
} else { } else {
printf ("## Start Addr = 0x%08lX\n", addr); printf("## Start Addr = 0x%08lX\n", addr);
load_addr = addr; load_addr = addr;
} }
} }
if (load_baudrate != current_baudrate) { if (load_baudrate != current_baudrate) {
printf ("## Switch baudrate to %d bps and press ESC ...\n", printf("## Switch baudrate to %d bps and press ESC ...\n",
current_baudrate); current_baudrate);
udelay (50000); udelay(50000);
gd->baudrate = current_baudrate; gd->baudrate = current_baudrate;
serial_setbrg (); serial_setbrg();
udelay (50000); udelay(50000);
for (;;) { for (;;) {
if (getc() == 0x1B) /* ESC */ if (getc() == 0x1B) /* ESC */
break; break;
@ -517,13 +516,13 @@ int do_load_serial_bin (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[
} }
static ulong load_serial_bin (ulong offset) static ulong load_serial_bin(ulong offset)
{ {
int size, i; int size, i;
char buf[32]; char buf[32];
set_kerm_bin_mode ((ulong *) offset); set_kerm_bin_mode((ulong *) offset);
size = k_recv (); size = k_recv();
/* /*
* Gather any trailing characters (for instance, the ^D which * Gather any trailing characters (for instance, the ^D which
@ -537,7 +536,7 @@ static ulong load_serial_bin (ulong offset)
udelay(1000); udelay(1000);
} }
flush_cache (offset, size); flush_cache(offset, size);
printf("## Total Size = 0x%08x = %d Bytes\n", size, size); printf("## Total Size = 0x%08x = %d Bytes\n", size, size);
sprintf(buf, "%X", size); sprintf(buf, "%X", size);
@ -546,16 +545,16 @@ static ulong load_serial_bin (ulong offset)
return offset; return offset;
} }
void send_pad (void) static void send_pad(void)
{ {
int count = his_pad_count; int count = his_pad_count;
while (count-- > 0) while (count-- > 0)
putc (his_pad_char); putc(his_pad_char);
} }
/* converts escaped kermit char to binary char */ /* converts escaped kermit char to binary char */
char ktrans (char in) static char ktrans(char in)
{ {
if ((in & 0x60) == 0x40) { if ((in & 0x60) == 0x40) {
return (char) (in & ~0x40); return (char) (in & ~0x40);
@ -565,7 +564,7 @@ char ktrans (char in)
return in; return in;
} }
int chk1 (char *buffer) static int chk1(char *buffer)
{ {
int total = 0; int total = 0;
@ -575,67 +574,67 @@ int chk1 (char *buffer)
return (int) ((total + ((total >> 6) & 0x03)) & 0x3f); return (int) ((total + ((total >> 6) & 0x03)) & 0x3f);
} }
void s1_sendpacket (char *packet) static void s1_sendpacket(char *packet)
{ {
send_pad (); send_pad();
while (*packet) { while (*packet) {
putc (*packet++); putc(*packet++);
} }
} }
static char a_b[24]; static char a_b[24];
void send_ack (int n) static void send_ack(int n)
{ {
a_b[0] = START_CHAR; a_b[0] = START_CHAR;
a_b[1] = tochar (3); a_b[1] = tochar(3);
a_b[2] = tochar (n); a_b[2] = tochar(n);
a_b[3] = ACK_TYPE; a_b[3] = ACK_TYPE;
a_b[4] = '\0'; a_b[4] = '\0';
a_b[4] = tochar (chk1 (&a_b[1])); a_b[4] = tochar(chk1(&a_b[1]));
a_b[5] = his_eol; a_b[5] = his_eol;
a_b[6] = '\0'; a_b[6] = '\0';
s1_sendpacket (a_b); s1_sendpacket(a_b);
} }
void send_nack (int n) static void send_nack(int n)
{ {
a_b[0] = START_CHAR; a_b[0] = START_CHAR;
a_b[1] = tochar (3); a_b[1] = tochar(3);
a_b[2] = tochar (n); a_b[2] = tochar(n);
a_b[3] = NACK_TYPE; a_b[3] = NACK_TYPE;
a_b[4] = '\0'; a_b[4] = '\0';
a_b[4] = tochar (chk1 (&a_b[1])); a_b[4] = tochar(chk1(&a_b[1]));
a_b[5] = his_eol; a_b[5] = his_eol;
a_b[6] = '\0'; a_b[6] = '\0';
s1_sendpacket (a_b); s1_sendpacket(a_b);
} }
void (*os_data_init) (void); static void (*os_data_init)(void);
void (*os_data_char) (char new_char); static void (*os_data_char)(char new_char);
static int os_data_state, os_data_state_saved; static int os_data_state, os_data_state_saved;
static char *os_data_addr, *os_data_addr_saved; static char *os_data_addr, *os_data_addr_saved;
static char *bin_start_address; static char *bin_start_address;
static void bin_data_init (void) static void bin_data_init(void)
{ {
os_data_state = 0; os_data_state = 0;
os_data_addr = bin_start_address; os_data_addr = bin_start_address;
} }
static void os_data_save (void) static void os_data_save(void)
{ {
os_data_state_saved = os_data_state; os_data_state_saved = os_data_state;
os_data_addr_saved = os_data_addr; os_data_addr_saved = os_data_addr;
} }
static void os_data_restore (void) static void os_data_restore(void)
{ {
os_data_state = os_data_state_saved; os_data_state = os_data_state_saved;
os_data_addr = os_data_addr_saved; os_data_addr = os_data_addr_saved;
} }
static void bin_data_char (char new_char) static void bin_data_char(char new_char)
{ {
switch (os_data_state) { switch (os_data_state) {
case 0: /* data */ case 0: /* data */
@ -644,7 +643,7 @@ static void bin_data_char (char new_char)
} }
} }
static void set_kerm_bin_mode (unsigned long *addr) static void set_kerm_bin_mode(unsigned long *addr)
{ {
bin_start_address = (char *) addr; bin_start_address = (char *) addr;
os_data_init = bin_data_init; os_data_init = bin_data_init;
@ -654,29 +653,29 @@ static void set_kerm_bin_mode (unsigned long *addr)
/* k_data_* simply handles the kermit escape translations */ /* k_data_* simply handles the kermit escape translations */
static int k_data_escape, k_data_escape_saved; static int k_data_escape, k_data_escape_saved;
void k_data_init (void) static void k_data_init(void)
{ {
k_data_escape = 0; k_data_escape = 0;
os_data_init (); os_data_init();
} }
void k_data_save (void) static void k_data_save(void)
{ {
k_data_escape_saved = k_data_escape; k_data_escape_saved = k_data_escape;
os_data_save (); os_data_save();
} }
void k_data_restore (void) static void k_data_restore(void)
{ {
k_data_escape = k_data_escape_saved; k_data_escape = k_data_escape_saved;
os_data_restore (); os_data_restore();
} }
void k_data_char (char new_char) static void k_data_char(char new_char)
{ {
if (k_data_escape) { if (k_data_escape) {
/* last char was escape - translate this character */ /* last char was escape - translate this character */
os_data_char (ktrans (new_char)); os_data_char(ktrans(new_char));
k_data_escape = 0; k_data_escape = 0;
} else { } else {
if (new_char == his_quote) { if (new_char == his_quote) {
@ -684,18 +683,18 @@ void k_data_char (char new_char)
k_data_escape = 1; k_data_escape = 1;
} else { } else {
/* otherwise send this char as-is */ /* otherwise send this char as-is */
os_data_char (new_char); os_data_char(new_char);
} }
} }
} }
#define SEND_DATA_SIZE 20 #define SEND_DATA_SIZE 20
char send_parms[SEND_DATA_SIZE]; static char send_parms[SEND_DATA_SIZE];
char *send_ptr; static char *send_ptr;
/* handle_send_packet interprits the protocol info and builds and /* handle_send_packet interprits the protocol info and builds and
sends an appropriate ack for what we can do */ sends an appropriate ack for what we can do */
void handle_send_packet (int n) static void handle_send_packet(int n)
{ {
int length = 3; int length = 3;
int bytes; int bytes;
@ -715,30 +714,30 @@ void handle_send_packet (int n)
break; break;
/* handle MAXL - max length */ /* handle MAXL - max length */
/* ignore what he says - most I'll take (here) is 94 */ /* ignore what he says - most I'll take (here) is 94 */
a_b[++length] = tochar (94); a_b[++length] = tochar(94);
if (bytes-- <= 0) if (bytes-- <= 0)
break; break;
/* handle TIME - time you should wait for my packets */ /* handle TIME - time you should wait for my packets */
/* ignore what he says - don't wait for my ack longer than 1 second */ /* ignore what he says - don't wait for my ack longer than 1 second */
a_b[++length] = tochar (1); a_b[++length] = tochar(1);
if (bytes-- <= 0) if (bytes-- <= 0)
break; break;
/* handle NPAD - number of pad chars I need */ /* handle NPAD - number of pad chars I need */
/* remember what he says - I need none */ /* remember what he says - I need none */
his_pad_count = untochar (send_parms[2]); his_pad_count = untochar(send_parms[2]);
a_b[++length] = tochar (0); a_b[++length] = tochar(0);
if (bytes-- <= 0) if (bytes-- <= 0)
break; break;
/* handle PADC - pad chars I need */ /* handle PADC - pad chars I need */
/* remember what he says - I need none */ /* remember what he says - I need none */
his_pad_char = ktrans (send_parms[3]); his_pad_char = ktrans(send_parms[3]);
a_b[++length] = 0x40; /* He should ignore this */ a_b[++length] = 0x40; /* He should ignore this */
if (bytes-- <= 0) if (bytes-- <= 0)
break; break;
/* handle EOL - end of line he needs */ /* handle EOL - end of line he needs */
/* remember what he says - I need CR */ /* remember what he says - I need CR */
his_eol = untochar (send_parms[4]); his_eol = untochar(send_parms[4]);
a_b[++length] = tochar (END_CHAR); a_b[++length] = tochar(END_CHAR);
if (bytes-- <= 0) if (bytes-- <= 0)
break; break;
/* handle QCTL - quote control char he'll use */ /* handle QCTL - quote control char he'll use */
@ -764,25 +763,25 @@ void handle_send_packet (int n)
break; break;
/* handle CAPAS - the capabilities mask */ /* handle CAPAS - the capabilities mask */
/* ignore what he says - I only do long packets - I don't do windows */ /* ignore what he says - I only do long packets - I don't do windows */
a_b[++length] = tochar (2); /* only long packets */ a_b[++length] = tochar(2); /* only long packets */
a_b[++length] = tochar (0); /* no windows */ a_b[++length] = tochar(0); /* no windows */
a_b[++length] = tochar (94); /* large packet msb */ a_b[++length] = tochar(94); /* large packet msb */
a_b[++length] = tochar (94); /* large packet lsb */ a_b[++length] = tochar(94); /* large packet lsb */
} while (0); } while (0);
a_b[0] = START_CHAR; a_b[0] = START_CHAR;
a_b[1] = tochar (length); a_b[1] = tochar(length);
a_b[2] = tochar (n); a_b[2] = tochar(n);
a_b[3] = ACK_TYPE; a_b[3] = ACK_TYPE;
a_b[++length] = '\0'; a_b[++length] = '\0';
a_b[length] = tochar (chk1 (&a_b[1])); a_b[length] = tochar(chk1(&a_b[1]));
a_b[++length] = his_eol; a_b[++length] = his_eol;
a_b[++length] = '\0'; a_b[++length] = '\0';
s1_sendpacket (a_b); s1_sendpacket(a_b);
} }
/* k_recv receives a OS Open image file over kermit line */ /* k_recv receives a OS Open image file over kermit line */
static int k_recv (void) static int k_recv(void)
{ {
char new_char; char new_char;
char k_state, k_state_saved; char k_state, k_state_saved;
@ -801,9 +800,9 @@ static int k_recv (void)
/* initialize the k_recv and k_data state machine */ /* initialize the k_recv and k_data state machine */
done = 0; done = 0;
k_state = 0; k_state = 0;
k_data_init (); k_data_init();
k_state_saved = k_state; k_state_saved = k_state;
k_data_save (); k_data_save();
n = 0; /* just to get rid of a warning */ n = 0; /* just to get rid of a warning */
last_n = -1; last_n = -1;
@ -848,17 +847,17 @@ static int k_recv (void)
START: START:
/* get length of packet */ /* get length of packet */
sum = 0; sum = 0;
new_char = getc (); new_char = getc();
if ((new_char & 0xE0) == 0) if ((new_char & 0xE0) == 0)
goto packet_error; goto packet_error;
sum += new_char & 0xff; sum += new_char & 0xff;
length = untochar (new_char); length = untochar(new_char);
/* get sequence number */ /* get sequence number */
new_char = getc (); new_char = getc();
if ((new_char & 0xE0) == 0) if ((new_char & 0xE0) == 0)
goto packet_error; goto packet_error;
sum += new_char & 0xff; sum += new_char & 0xff;
n = untochar (new_char); n = untochar(new_char);
--length; --length;
/* NEW CODE - check sequence numbers for retried packets */ /* NEW CODE - check sequence numbers for retried packets */
@ -871,17 +870,17 @@ START:
if (n == last_n) { if (n == last_n) {
/* same sequence number, restore the previous state */ /* same sequence number, restore the previous state */
k_state = k_state_saved; k_state = k_state_saved;
k_data_restore (); k_data_restore();
} else { } else {
/* new sequence number, checkpoint the download */ /* new sequence number, checkpoint the download */
last_n = n; last_n = n;
k_state_saved = k_state; k_state_saved = k_state;
k_data_save (); k_data_save();
} }
/* END NEW CODE */ /* END NEW CODE */
/* get packet type */ /* get packet type */
new_char = getc (); new_char = getc();
if ((new_char & 0xE0) == 0) if ((new_char & 0xE0) == 0)
goto packet_error; goto packet_error;
sum += new_char & 0xff; sum += new_char & 0xff;
@ -891,29 +890,29 @@ START:
if (length == -2) { if (length == -2) {
/* (length byte was 0, decremented twice) */ /* (length byte was 0, decremented twice) */
/* get the two length bytes */ /* get the two length bytes */
new_char = getc (); new_char = getc();
if ((new_char & 0xE0) == 0) if ((new_char & 0xE0) == 0)
goto packet_error; goto packet_error;
sum += new_char & 0xff; sum += new_char & 0xff;
len_hi = untochar (new_char); len_hi = untochar(new_char);
new_char = getc (); new_char = getc();
if ((new_char & 0xE0) == 0) if ((new_char & 0xE0) == 0)
goto packet_error; goto packet_error;
sum += new_char & 0xff; sum += new_char & 0xff;
len_lo = untochar (new_char); len_lo = untochar(new_char);
length = len_hi * 95 + len_lo; length = len_hi * 95 + len_lo;
/* check header checksum */ /* check header checksum */
new_char = getc (); new_char = getc();
if ((new_char & 0xE0) == 0) if ((new_char & 0xE0) == 0)
goto packet_error; goto packet_error;
if (new_char != tochar ((sum + ((sum >> 6) & 0x03)) & 0x3f)) if (new_char != tochar((sum + ((sum >> 6) & 0x03)) & 0x3f))
goto packet_error; goto packet_error;
sum += new_char & 0xff; sum += new_char & 0xff;
/* --length; */ /* new length includes only data and block check to come */ /* --length; */ /* new length includes only data and block check to come */
} }
/* bring in rest of packet */ /* bring in rest of packet */
while (length > 1) { while (length > 1) {
new_char = getc (); new_char = getc();
if ((new_char & 0xE0) == 0) if ((new_char & 0xE0) == 0)
goto packet_error; goto packet_error;
sum += new_char & 0xff; sum += new_char & 0xff;
@ -930,26 +929,26 @@ START:
} }
} }
/* get and validate checksum character */ /* get and validate checksum character */
new_char = getc (); new_char = getc();
if ((new_char & 0xE0) == 0) if ((new_char & 0xE0) == 0)
goto packet_error; goto packet_error;
if (new_char != tochar ((sum + ((sum >> 6) & 0x03)) & 0x3f)) if (new_char != tochar((sum + ((sum >> 6) & 0x03)) & 0x3f))
goto packet_error; goto packet_error;
/* get END_CHAR */ /* get END_CHAR */
new_char = getc (); new_char = getc();
if (new_char != END_CHAR) { if (new_char != END_CHAR) {
packet_error: packet_error:
/* restore state machines */ /* restore state machines */
k_state = k_state_saved; k_state = k_state_saved;
k_data_restore (); k_data_restore();
/* send a negative acknowledge packet in */ /* send a negative acknowledge packet in */
send_nack (n); send_nack(n);
} else if (k_state == SEND_TYPE) { } else if (k_state == SEND_TYPE) {
/* crack the protocol parms, build an appropriate ack packet */ /* crack the protocol parms, build an appropriate ack packet */
handle_send_packet (n); handle_send_packet(n);
} else { } else {
/* send simple acknowledge packet in */ /* send simple acknowledge packet in */
send_ack (n); send_ack(n);
/* quit if end of transmission */ /* quit if end of transmission */
if (k_state == BREAK_TYPE) if (k_state == BREAK_TYPE)
done = 1; done = 1;
@ -963,7 +962,7 @@ static int getcxmodem(void) {
return (getc()); return (getc());
return -1; return -1;
} }
static ulong load_serial_ymodem (ulong offset) static ulong load_serial_ymodem(ulong offset)
{ {
int size; int size;
char buf[32]; char buf[32];
@ -976,19 +975,19 @@ static ulong load_serial_ymodem (ulong offset)
size = 0; size = 0;
info.mode = xyzModem_ymodem; info.mode = xyzModem_ymodem;
res = xyzModem_stream_open (&info, &err); res = xyzModem_stream_open(&info, &err);
if (!res) { if (!res) {
while ((res = while ((res =
xyzModem_stream_read (ymodemBuf, 1024, &err)) > 0) { xyzModem_stream_read(ymodemBuf, 1024, &err)) > 0) {
store_addr = addr + offset; store_addr = addr + offset;
size += res; size += res;
addr += res; addr += res;
#ifndef CONFIG_SYS_NO_FLASH #ifndef CONFIG_SYS_NO_FLASH
if (addr2info (store_addr)) { if (addr2info(store_addr)) {
int rc; int rc;
rc = flash_write ((char *) ymodemBuf, rc = flash_write((char *) ymodemBuf,
store_addr, res); store_addr, res);
if (rc != 0) { if (rc != 0) {
flash_perror (rc); flash_perror (rc);
@ -997,24 +996,24 @@ static ulong load_serial_ymodem (ulong offset)
} else } else
#endif #endif
{ {
memcpy ((char *) (store_addr), ymodemBuf, memcpy((char *)(store_addr), ymodemBuf,
res); res);
} }
} }
} else { } else {
printf ("%s\n", xyzModem_error (err)); printf("%s\n", xyzModem_error(err));
} }
xyzModem_stream_close (&err); xyzModem_stream_close(&err);
xyzModem_stream_terminate (false, &getcxmodem); xyzModem_stream_terminate(false, &getcxmodem);
flush_cache (offset, size); flush_cache(offset, size);
printf ("## Total Size = 0x%08x = %d Bytes\n", size, size); printf("## Total Size = 0x%08x = %d Bytes\n", size, size);
sprintf (buf, "%X", size); sprintf(buf, "%X", size);
setenv ("filesize", buf); setenv("filesize", buf);
return offset; return offset;
} }
@ -1091,7 +1090,7 @@ U_BOOT_CMD(
/* -------------------------------------------------------------------- */ /* -------------------------------------------------------------------- */
#if defined(CONFIG_CMD_HWFLOW) #if defined(CONFIG_CMD_HWFLOW)
int do_hwflow (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) int do_hwflow(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
{ {
extern int hwflow_onoff(int); extern int hwflow_onoff(int);

20
common/cmd_mdio.c
Unescape View File

@ -57,9 +57,9 @@ static int extract_range(char *input, int *plo, int *phi)
return 0; return 0;
} }
int mdio_write_ranges(struct mii_dev *bus, int addrlo, static int mdio_write_ranges(struct mii_dev *bus, int addrlo,
int addrhi, int devadlo, int devadhi, int addrhi, int devadlo, int devadhi,
int reglo, int reghi, unsigned short data) int reglo, int reghi, unsigned short data)
{ {
int addr, devad, reg; int addr, devad, reg;
int err = 0; int err = 0;
@ -79,9 +79,9 @@ err_out:
return err; return err;
} }
int mdio_read_ranges(struct mii_dev *bus, int addrlo, static int mdio_read_ranges(struct mii_dev *bus, int addrlo,
int addrhi, int devadlo, int devadhi, int addrhi, int devadlo, int devadhi,
int reglo, int reghi) int reglo, int reghi)
{ {
int addr, devad, reg; int addr, devad, reg;
@ -112,8 +112,8 @@ int mdio_read_ranges(struct mii_dev *bus, int addrlo,
} }
/* The register will be in the form [a[-b].]x[-y] */ /* The register will be in the form [a[-b].]x[-y] */
int extract_reg_range(char *input, int *devadlo, int *devadhi, static int extract_reg_range(char *input, int *devadlo, int *devadhi,
int *reglo, int *reghi) int *reglo, int *reghi)
{ {
char *regstr; char *regstr;
@ -141,8 +141,8 @@ int extract_reg_range(char *input, int *devadlo, int *devadhi,
return extract_range(regstr, reglo, reghi); return extract_range(regstr, reglo, reghi);
} }
int extract_phy_range(char *const argv[], int argc, struct mii_dev **bus, static int extract_phy_range(char *const argv[], int argc, struct mii_dev **bus,
int *addrlo, int *addrhi) int *addrlo, int *addrhi)
{ {
struct phy_device *phydev; struct phy_device *phydev;

25
common/cmd_mem.c
Unescape View File

@ -51,7 +51,7 @@ static ulong base_address = 0;
* md{.b, .w, .l} {addr} {len} * md{.b, .w, .l} {addr} {len}
*/ */
#define DISP_LINE_LEN 16 #define DISP_LINE_LEN 16
int do_mem_md ( cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) static int do_mem_md(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
{ {
ulong addr, length; ulong addr, length;
#if defined(CONFIG_HAS_DATAFLASH) #if defined(CONFIG_HAS_DATAFLASH)
@ -147,16 +147,16 @@ int do_mem_md ( cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
return (rc); return (rc);
} }
int do_mem_mm ( cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) static int do_mem_mm(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
{ {
return mod_mem (cmdtp, 1, flag, argc, argv); return mod_mem (cmdtp, 1, flag, argc, argv);
} }
int do_mem_nm ( cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) static int do_mem_nm(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
{ {
return mod_mem (cmdtp, 0, flag, argc, argv); return mod_mem (cmdtp, 0, flag, argc, argv);
} }
int do_mem_mw ( cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) static int do_mem_mw(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
{ {
ulong addr, writeval, count; ulong addr, writeval, count;
int size; int size;
@ -253,7 +253,7 @@ int do_mem_mwc ( cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
} }
#endif /* CONFIG_MX_CYCLIC */ #endif /* CONFIG_MX_CYCLIC */
int do_mem_cmp (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) static int do_mem_cmp(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
{ {
ulong addr1, addr2, count, ngood; ulong addr1, addr2, count, ngood;
int size; int size;
@ -323,7 +323,7 @@ int do_mem_cmp (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
return rcode; return rcode;
} }
int do_mem_cp ( cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) static int do_mem_cp(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
{ {
ulong addr, dest, count; ulong addr, dest, count;
int size; int size;
@ -433,7 +433,8 @@ int do_mem_cp ( cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
return 0; return 0;
} }
int do_mem_base (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) static int do_mem_base(cmd_tbl_t *cmdtp, int flag, int argc,
char * const argv[])
{ {
if (argc > 1) { if (argc > 1) {
/* Set new base address. /* Set new base address.
@ -446,7 +447,8 @@ int do_mem_base (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
return 0; return 0;
} }
int do_mem_loop (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) static int do_mem_loop(cmd_tbl_t *cmdtp, int flag, int argc,
char * const argv[])
{ {
ulong addr, length, i; ulong addr, length, i;
int size; int size;
@ -592,7 +594,8 @@ int do_mem_loopw (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
* configured using CONFIG_SYS_ALT_MEMTEST. The complete test loops until * configured using CONFIG_SYS_ALT_MEMTEST. The complete test loops until
* interrupted by ctrl-c or by a failure of one of the sub-tests. * interrupted by ctrl-c or by a failure of one of the sub-tests.
*/ */
int do_mem_mtest (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) static int do_mem_mtest(cmd_tbl_t *cmdtp, int flag, int argc,
char * const argv[])
{ {
vu_long *addr, *start, *end; vu_long *addr, *start, *end;
ulong val; ulong val;
@ -612,7 +615,7 @@ int do_mem_mtest (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
#if defined(CONFIG_SYS_MEMTEST_SCRATCH) #if defined(CONFIG_SYS_MEMTEST_SCRATCH)
vu_long *dummy = (vu_long*)CONFIG_SYS_MEMTEST_SCRATCH; vu_long *dummy = (vu_long*)CONFIG_SYS_MEMTEST_SCRATCH;
#else #else
vu_long *dummy = 0; /* yes, this is address 0x0, not NULL */ vu_long *dummy = NULL; /* yes, this is address 0x0, not NULL */
#endif #endif
int j; int j;
@ -1054,7 +1057,7 @@ mod_mem(cmd_tbl_t *cmdtp, int incrflag, int flag, int argc, char * const argv[])
#ifndef CONFIG_CRC32_VERIFY #ifndef CONFIG_CRC32_VERIFY
int do_mem_crc (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) static int do_mem_crc(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
{ {
ulong addr, length; ulong addr, length;
ulong crc; ulong crc;

6
common/cmd_misc.c
Unescape View File

@ -27,7 +27,7 @@
#include <common.h> #include <common.h>
#include <command.h> #include <command.h>
int do_sleep (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) static int do_sleep(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
{ {
ulong start = get_timer(0); ulong start = get_timer(0);
ulong delay; ulong delay;
@ -38,10 +38,10 @@ int do_sleep (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
delay = simple_strtoul(argv[1], NULL, 10) * CONFIG_SYS_HZ; delay = simple_strtoul(argv[1], NULL, 10) * CONFIG_SYS_HZ;
while (get_timer(start) < delay) { while (get_timer(start) < delay) {
if (ctrlc ()) if (ctrlc())
return (-1); return (-1);
udelay (100); udelay(100);
} }
return 0; return 0;

6
common/cmd_mmc.c
Unescape View File

@ -115,7 +115,7 @@ static void print_mmcinfo(struct mmc *mmc)
printf("Bus Width: %d-bit\n", mmc->bus_width); printf("Bus Width: %d-bit\n", mmc->bus_width);
} }
int do_mmcinfo (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) static int do_mmcinfo(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
{ {
struct mmc *mmc; struct mmc *mmc;
@ -147,7 +147,7 @@ U_BOOT_CMD(
"- dislay info of the current MMC device" "- dislay info of the current MMC device"
); );
int do_mmcops(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) static int do_mmcops(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
{ {
enum mmc_state state; enum mmc_state state;
@ -269,7 +269,7 @@ int do_mmcops(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
addr = (void *)simple_strtoul(argv[idx], NULL, 16); addr = (void *)simple_strtoul(argv[idx], NULL, 16);
++idx; ++idx;
} else } else
addr = 0; addr = NULL;
blk = simple_strtoul(argv[idx], NULL, 16); blk = simple_strtoul(argv[idx], NULL, 16);
cnt = simple_strtoul(argv[idx + 1], NULL, 16); cnt = simple_strtoul(argv[idx + 1], NULL, 16);

22
common/cmd_mp.c
Unescape View File

@ -23,7 +23,7 @@
#include <common.h> #include <common.h>
#include <command.h> #include <command.h>
int static int
cpu_cmd(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) cpu_cmd(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
{ {
unsigned long cpuid; unsigned long cpuid;
@ -61,8 +61,14 @@ cpu_cmd(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
return 0; return 0;
} }
#ifdef CONFIG_SYS_LONGHELP
static char cpu_help_text[] =
"<num> reset - Reset cpu <num>\n"
"cpu <num> status - Status of cpu <num>\n"
"cpu <num> disable - Disable cpu <num>\n"
"cpu <num> release <addr> [args] - Release cpu <num> at <addr> with [args]"
#ifdef CONFIG_PPC #ifdef CONFIG_PPC
#define CPU_ARCH_HELP \ "\n"
" [args] : <pir> <r3> <r6>\n" \ " [args] : <pir> <r3> <r6>\n" \
" pir - processor id (if writeable)\n" \ " pir - processor id (if writeable)\n" \
" r3 - value for gpr 3\n" \ " r3 - value for gpr 3\n" \
@ -74,16 +80,10 @@ cpu_cmd(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
" When cpu <num> is released r4 and r5 = 0.\n" \ " When cpu <num> is released r4 and r5 = 0.\n" \
" r7 will contain the size of the initial mapped area" " r7 will contain the size of the initial mapped area"
#endif #endif
"";
#endif
U_BOOT_CMD( U_BOOT_CMD(
cpu, CONFIG_SYS_MAXARGS, 1, cpu_cmd, cpu, CONFIG_SYS_MAXARGS, 1, cpu_cmd,
"Multiprocessor CPU boot manipulation and release", "Multiprocessor CPU boot manipulation and release", cpu_help_text
"<num> reset - Reset cpu <num>\n"
"cpu <num> status - Status of cpu <num>\n"
"cpu <num> disable - Disable cpu <num>\n"
"cpu <num> release <addr> [args] - Release cpu <num> at <addr> with [args]"
#ifdef CPU_ARCH_HELP
"\n"
CPU_ARCH_HELP
#endif
); );

26
common/cmd_mtdparts.c
Unescape View File

@ -147,10 +147,10 @@ static char last_partition[PARTITION_MAXLEN];
extern void jffs2_free_cache(struct part_info *part); extern void jffs2_free_cache(struct part_info *part);
/* mtdids mapping list, filled by parse_ids() */ /* mtdids mapping list, filled by parse_ids() */
struct list_head mtdids; static struct list_head mtdids;
/* device/partition list, parse_cmdline() parses into here */ /* device/partition list, parse_cmdline() parses into here */
struct list_head devices; static struct list_head devices;
/* current active device and partition number */ /* current active device and partition number */
struct mtd_device *current_mtd_dev = NULL; struct mtd_device *current_mtd_dev = NULL;
@ -710,7 +710,7 @@ static int part_parse(const char *const partdef, const char **ret, struct part_i
* @param size a pointer to the size of the mtd device (output) * @param size a pointer to the size of the mtd device (output)
* @return 0 if device is valid, 1 otherwise * @return 0 if device is valid, 1 otherwise
*/ */
int mtd_device_validate(u8 type, u8 num, u32 *size) static int mtd_device_validate(u8 type, u8 num, u32 *size)
{ {
struct mtd_info *mtd = NULL; struct mtd_info *mtd = NULL;
@ -1042,7 +1042,8 @@ static struct mtdids* id_find_by_mtd_id(const char *mtd_id, unsigned int mtd_id_
* @param dev_num parsed device number (output) * @param dev_num parsed device number (output)
* @return 0 on success, 1 otherwise * @return 0 on success, 1 otherwise
*/ */
int mtd_id_parse(const char *id, const char **ret_id, u8 *dev_type, u8 *dev_num) int mtd_id_parse(const char *id, const char **ret_id, u8 *dev_type,
u8 *dev_num)
{ {
const char *p = id; const char *p = id;
@ -1884,7 +1885,7 @@ static struct part_info* mtd_part_info(struct mtd_device *dev, unsigned int part
* @param argv arguments list * @param argv arguments list
* @return 0 on success, 1 otherwise * @return 0 on success, 1 otherwise
*/ */
int do_chpart(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) static int do_chpart(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
{ {
/* command line only */ /* command line only */
struct mtd_device *dev; struct mtd_device *dev;
@ -1922,7 +1923,8 @@ int do_chpart(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
* @param argv arguments list * @param argv arguments list
* @return 0 on success, 1 otherwise * @return 0 on success, 1 otherwise
*/ */
int do_mtdparts(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) static int do_mtdparts(cmd_tbl_t *cmdtp, int flag, int argc,
char * const argv[])
{ {
if (argc == 2) { if (argc == 2) {
if (strcmp(argv[1], "default") == 0) { if (strcmp(argv[1], "default") == 0) {
@ -2046,9 +2048,8 @@ U_BOOT_CMD(
" - change active partition (e.g. part-id = nand0,1)" " - change active partition (e.g. part-id = nand0,1)"
); );
U_BOOT_CMD( #ifdef CONFIG_SYS_LONGHELP
mtdparts, 6, 0, do_mtdparts, static char mtdparts_help_text[] =
"define flash/nand partitions",
"\n" "\n"
" - list partition table\n" " - list partition table\n"
"mtdparts delall\n" "mtdparts delall\n"
@ -2090,6 +2091,11 @@ U_BOOT_CMD(
"<size> := standard linux memsize OR '-' to denote all remaining space\n" "<size> := standard linux memsize OR '-' to denote all remaining space\n"
"<offset> := partition start offset within the device\n" "<offset> := partition start offset within the device\n"
"<name> := '(' NAME ')'\n" "<name> := '(' NAME ')'\n"
"<ro-flag> := when set to 'ro' makes partition read-only (not used, passed to kernel)" "<ro-flag> := when set to 'ro' makes partition read-only (not used, passed to kernel)";
#endif
U_BOOT_CMD(
mtdparts, 6, 0, do_mtdparts,
"define flash/nand partitions", mtdparts_help_text
); );
/***************************************************/ /***************************************************/

19
common/cmd_nand.c
Unescape View File

@ -373,8 +373,7 @@ static void nand_print_and_set_info(int idx)
{ {
nand_info_t *nand = &nand_info[idx]; nand_info_t *nand = &nand_info[idx];
struct nand_chip *chip = nand->priv; struct nand_chip *chip = nand->priv;
const int bufsz = 32; char buf[32];
char buf[bufsz];
printf("Device %d: ", idx); printf("Device %d: ", idx);
if (chip->numchips > 1) if (chip->numchips > 1)
@ -429,7 +428,7 @@ static int raw_access(nand_info_t *nand, ulong addr, loff_t off, ulong count,
return ret; return ret;
} }
int do_nand(cmd_tbl_t * cmdtp, int flag, int argc, char * const argv[]) static int do_nand(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
{ {
int i, ret = 0; int i, ret = 0;
ulong addr; ulong addr;
@ -781,9 +780,8 @@ usage:
return CMD_RET_USAGE; return CMD_RET_USAGE;
} }
U_BOOT_CMD( #ifdef CONFIG_SYS_LONGHELP
nand, CONFIG_SYS_MAXARGS, 1, do_nand, static char nand_help_text[] =
"NAND sub-system",
"info - show available NAND devices\n" "info - show available NAND devices\n"
"nand device [dev] - show or set current device\n" "nand device [dev] - show or set current device\n"
"nand read - addr off|partition size\n" "nand read - addr off|partition size\n"
@ -829,6 +827,12 @@ U_BOOT_CMD(
"nand env.oob set off|partition - set enviromnent offset\n" "nand env.oob set off|partition - set enviromnent offset\n"
"nand env.oob get - get environment offset" "nand env.oob get - get environment offset"
#endif #endif
"";
#endif
U_BOOT_CMD(
nand, CONFIG_SYS_MAXARGS, 1, do_nand,
"NAND sub-system", nand_help_text
); );
static int nand_load_image(cmd_tbl_t *cmdtp, nand_info_t *nand, static int nand_load_image(cmd_tbl_t *cmdtp, nand_info_t *nand,
@ -913,7 +917,8 @@ static int nand_load_image(cmd_tbl_t *cmdtp, nand_info_t *nand,
return bootm_maybe_autostart(cmdtp, cmd); return bootm_maybe_autostart(cmdtp, cmd);
} }
int do_nandboot(cmd_tbl_t * cmdtp, int flag, int argc, char * const argv[]) static int do_nandboot(cmd_tbl_t *cmdtp, int flag, int argc,
char * const argv[])
{ {
char *boot_device = NULL; char *boot_device = NULL;
int idx; int idx;

76
common/cmd_net.c
Unescape View File

@ -30,9 +30,9 @@
static int netboot_common(enum proto_t, cmd_tbl_t *, int, char * const []); static int netboot_common(enum proto_t, cmd_tbl_t *, int, char * const []);
int do_bootp (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) static int do_bootp(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
{ {
return netboot_common (BOOTP, cmdtp, argc, argv); return netboot_common(BOOTP, cmdtp, argc, argv);
} }
U_BOOT_CMD( U_BOOT_CMD(
@ -41,7 +41,7 @@ U_BOOT_CMD(
"[loadAddress] [[hostIPaddr:]bootfilename]" "[loadAddress] [[hostIPaddr:]bootfilename]"
); );
int do_tftpb (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) int do_tftpb(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
{ {
int ret; int ret;
@ -91,9 +91,9 @@ U_BOOT_CMD(
#ifdef CONFIG_CMD_RARP #ifdef CONFIG_CMD_RARP
int do_rarpb (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) int do_rarpb(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
{ {
return netboot_common (RARP, cmdtp, argc, argv); return netboot_common(RARP, cmdtp, argc, argv);
} }
U_BOOT_CMD( U_BOOT_CMD(
@ -104,7 +104,7 @@ U_BOOT_CMD(
#endif #endif
#if defined(CONFIG_CMD_DHCP) #if defined(CONFIG_CMD_DHCP)
int do_dhcp (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) static int do_dhcp(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
{ {
return netboot_common(DHCP, cmdtp, argc, argv); return netboot_common(DHCP, cmdtp, argc, argv);
} }
@ -117,7 +117,7 @@ U_BOOT_CMD(
#endif #endif
#if defined(CONFIG_CMD_NFS) #if defined(CONFIG_CMD_NFS)
int do_nfs (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) static int do_nfs(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
{ {
return netboot_common(NFS, cmdtp, argc, argv); return netboot_common(NFS, cmdtp, argc, argv);
} }
@ -129,29 +129,29 @@ U_BOOT_CMD(
); );
#endif #endif
static void netboot_update_env (void) static void netboot_update_env(void)
{ {
char tmp[22]; char tmp[22];
if (NetOurGatewayIP) { if (NetOurGatewayIP) {
ip_to_string (NetOurGatewayIP, tmp); ip_to_string(NetOurGatewayIP, tmp);
setenv ("gatewayip", tmp); setenv("gatewayip", tmp);
} }
if (NetOurSubnetMask) { if (NetOurSubnetMask) {
ip_to_string (NetOurSubnetMask, tmp); ip_to_string(NetOurSubnetMask, tmp);
setenv ("netmask", tmp); setenv("netmask", tmp);
} }
if (NetOurHostName[0]) if (NetOurHostName[0])
setenv ("hostname", NetOurHostName); setenv("hostname", NetOurHostName);
if (NetOurRootPath[0]) if (NetOurRootPath[0])
setenv ("rootpath", NetOurRootPath); setenv("rootpath", NetOurRootPath);
if (NetOurIP) { if (NetOurIP) {
ip_to_string (NetOurIP, tmp); ip_to_string(NetOurIP, tmp);
setenv ("ipaddr", tmp); setenv("ipaddr", tmp);
} }
#if !defined(CONFIG_BOOTP_SERVERIP) #if !defined(CONFIG_BOOTP_SERVERIP)
/* /*
@ -159,35 +159,35 @@ static void netboot_update_env (void)
* could have set it * could have set it
*/ */
if (NetServerIP) { if (NetServerIP) {
ip_to_string (NetServerIP, tmp); ip_to_string(NetServerIP, tmp);
setenv ("serverip", tmp); setenv("serverip", tmp);
} }
#endif #endif
if (NetOurDNSIP) { if (NetOurDNSIP) {
ip_to_string (NetOurDNSIP, tmp); ip_to_string(NetOurDNSIP, tmp);
setenv ("dnsip", tmp); setenv("dnsip", tmp);
} }
#if defined(CONFIG_BOOTP_DNS2) #if defined(CONFIG_BOOTP_DNS2)
if (NetOurDNS2IP) { if (NetOurDNS2IP) {
ip_to_string (NetOurDNS2IP, tmp); ip_to_string(NetOurDNS2IP, tmp);
setenv ("dnsip2", tmp); setenv("dnsip2", tmp);
} }
#endif #endif
if (NetOurNISDomain[0]) if (NetOurNISDomain[0])
setenv ("domain", NetOurNISDomain); setenv("domain", NetOurNISDomain);
#if defined(CONFIG_CMD_SNTP) \ #if defined(CONFIG_CMD_SNTP) \
&& defined(CONFIG_BOOTP_TIMEOFFSET) && defined(CONFIG_BOOTP_TIMEOFFSET)
if (NetTimeOffset) { if (NetTimeOffset) {
sprintf (tmp, "%d", NetTimeOffset); sprintf(tmp, "%d", NetTimeOffset);
setenv ("timeoffset", tmp); setenv("timeoffset", tmp);
} }
#endif #endif
#if defined(CONFIG_CMD_SNTP) \ #if defined(CONFIG_CMD_SNTP) \
&& defined(CONFIG_BOOTP_NTPSERVER) && defined(CONFIG_BOOTP_NTPSERVER)
if (NetNtpServerIP) { if (NetNtpServerIP) {
ip_to_string (NetNtpServerIP, tmp); ip_to_string(NetNtpServerIP, tmp);
setenv ("ntpserverip", tmp); setenv("ntpserverip", tmp);
} }
#endif #endif
} }
@ -224,7 +224,7 @@ static int netboot_common(enum proto_t proto, cmd_tbl_t *cmdtp, int argc,
break; break;
case 3: load_addr = simple_strtoul(argv[1], NULL, 16); case 3: load_addr = simple_strtoul(argv[1], NULL, 16);
copy_filename (BootFile, argv[2], sizeof(BootFile)); copy_filename(BootFile, argv[2], sizeof(BootFile));
break; break;
@ -274,7 +274,7 @@ static int netboot_common(enum proto_t proto, cmd_tbl_t *cmdtp, int argc,
} }
#if defined(CONFIG_CMD_PING) #if defined(CONFIG_CMD_PING)
int do_ping (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) static int do_ping(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
{ {
if (argc < 2) if (argc < 2)
return -1; return -1;
@ -322,7 +322,7 @@ static void cdp_update_env(void)
} }
int do_cdp (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) int do_cdp(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
{ {
int r; int r;
@ -345,27 +345,29 @@ U_BOOT_CMD(
#endif #endif
#if defined(CONFIG_CMD_SNTP) #if defined(CONFIG_CMD_SNTP)
int do_sntp (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) int do_sntp(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
{ {
char *toff; char *toff;
if (argc < 2) { if (argc < 2) {
NetNtpServerIP = getenv_IPaddr ("ntpserverip"); NetNtpServerIP = getenv_IPaddr("ntpserverip");
if (NetNtpServerIP == 0) { if (NetNtpServerIP == 0) {
printf ("ntpserverip not set\n"); printf("ntpserverip not set\n");
return (1); return (1);
} }
} else { } else {
NetNtpServerIP = string_to_ip(argv[1]); NetNtpServerIP = string_to_ip(argv[1]);
if (NetNtpServerIP == 0) { if (NetNtpServerIP == 0) {
printf ("Bad NTP server IP address\n"); printf("Bad NTP server IP address\n");
return (1); return (1);
} }
} }
toff = getenv ("timeoffset"); toff = getenv("timeoffset");
if (toff == NULL) NetTimeOffset = 0; if (toff == NULL)
else NetTimeOffset = simple_strtol (toff, NULL, 10); NetTimeOffset = 0;
else
NetTimeOffset = simple_strtol(toff, NULL, 10);
if (NetLoop(SNTP) < 0) { if (NetLoop(SNTP) < 0) {
printf("SNTP failed: host %pI4 not responding\n", printf("SNTP failed: host %pI4 not responding\n",

25
common/cmd_nvedit.c
Unescape View File

@ -136,7 +136,8 @@ static int env_print(char *name)
return 0; return 0;
} }
int do_env_print (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) static int do_env_print(cmd_tbl_t *cmdtp, int flag, int argc,
char * const argv[])
{ {
int i; int i;
int rcode = 0; int rcode = 0;
@ -322,7 +323,7 @@ int env_check_apply(const char *name, const char *oldval,
* Set a new environment variable, * Set a new environment variable,
* or replace or delete an existing one. * or replace or delete an existing one.
*/ */
int _do_env_set(int flag, int argc, char * const argv[]) static int _do_env_set(int flag, int argc, char * const argv[])
{ {
int i, len; int i, len;
char *name, *value, *s; char *name, *value, *s;
@ -435,7 +436,7 @@ int setenv_addr(const char *varname, const void *addr)
} }
#ifndef CONFIG_SPL_BUILD #ifndef CONFIG_SPL_BUILD
int do_env_set(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) static int do_env_set(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
{ {
if (argc < 2) if (argc < 2)
return CMD_RET_USAGE; return CMD_RET_USAGE;
@ -514,7 +515,8 @@ int do_env_ask(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
* Interactively edit an environment variable * Interactively edit an environment variable
*/ */
#if defined(CONFIG_CMD_EDITENV) #if defined(CONFIG_CMD_EDITENV)
int do_env_edit(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) static int do_env_edit(cmd_tbl_t *cmdtp, int flag, int argc,
char * const argv[])
{ {
char buffer[CONFIG_SYS_CBSIZE]; char buffer[CONFIG_SYS_CBSIZE];
char *init_val; char *init_val;
@ -622,7 +624,8 @@ ulong getenv_ulong(const char *name, int base, ulong default_val)
#ifndef CONFIG_SPL_BUILD #ifndef CONFIG_SPL_BUILD
#if defined(CONFIG_CMD_SAVEENV) && !defined(CONFIG_ENV_IS_NOWHERE) #if defined(CONFIG_CMD_SAVEENV) && !defined(CONFIG_ENV_IS_NOWHERE)
int do_env_save(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) static int do_env_save(cmd_tbl_t *cmdtp, int flag, int argc,
char * const argv[])
{ {
printf("Saving Environment to %s...\n", env_name_spec); printf("Saving Environment to %s...\n", env_name_spec);
@ -1020,9 +1023,8 @@ static int do_env(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
return CMD_RET_USAGE; return CMD_RET_USAGE;
} }
U_BOOT_CMD( #ifdef CONFIG_SYS_LONGHELP
env, CONFIG_SYS_MAXARGS, 1, do_env, static char env_help_text[] =
"environment handling commands",
#if defined(CONFIG_CMD_ASKENV) #if defined(CONFIG_CMD_ASKENV)
"ask name [message] [size] - ask for environment variable\nenv " "ask name [message] [size] - ask for environment variable\nenv "
#endif #endif
@ -1047,7 +1049,12 @@ U_BOOT_CMD(
#if defined(CONFIG_CMD_SAVEENV) && !defined(CONFIG_ENV_IS_NOWHERE) #if defined(CONFIG_CMD_SAVEENV) && !defined(CONFIG_ENV_IS_NOWHERE)
"env save - save environment\n" "env save - save environment\n"
#endif #endif
"env set [-f] name [arg ...]\n" "env set [-f] name [arg ...]\n";
#endif
U_BOOT_CMD(
env, CONFIG_SYS_MAXARGS, 1, do_env,
"environment handling commands", env_help_text
); );
/* /*

17
common/cmd_pci.c
Unescape View File

@ -35,8 +35,6 @@
#include <asm/io.h> #include <asm/io.h>
#include <pci.h> #include <pci.h>
unsigned char ShortPCIListing = 1;
/* /*
* Follows routines for the output of infos about devices on PCI bus. * Follows routines for the output of infos about devices on PCI bus.
*/ */
@ -408,7 +406,7 @@ pci_cfg_modify (pci_dev_t bdf, ulong addr, ulong size, ulong value, int incrflag
* pci modify[.b, .w, .l] bus.device.function [addr] * pci modify[.b, .w, .l] bus.device.function [addr]
* pci write[.b, .w, .l] bus.device.function addr value * pci write[.b, .w, .l] bus.device.function addr value
*/ */
int do_pci (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) static int do_pci(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
{ {
ulong addr = 0, value = 0, size = 0; ulong addr = 0, value = 0, size = 0;
pci_dev_t bdf = 0; pci_dev_t bdf = 0;
@ -485,10 +483,8 @@ int do_pci (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
/***************************************************/ /***************************************************/
#ifdef CONFIG_SYS_LONGHELP
U_BOOT_CMD( static char pci_help_text[] =
pci, 5, 1, do_pci,
"list and access PCI Configuration Space",
"[bus] [long]\n" "[bus] [long]\n"
" - short or long list of PCI devices on bus 'bus'\n" " - short or long list of PCI devices on bus 'bus'\n"
#ifdef CONFIG_CMD_PCI_ENUM #ifdef CONFIG_CMD_PCI_ENUM
@ -504,5 +500,10 @@ U_BOOT_CMD(
"pci modify[.b, .w, .l] b.d.f address\n" "pci modify[.b, .w, .l] b.d.f address\n"
" - modify, auto increment CFG address\n" " - modify, auto increment CFG address\n"
"pci write[.b, .w, .l] b.d.f address value\n" "pci write[.b, .w, .l] b.d.f address value\n"
" - write to CFG address" " - write to CFG address";
#endif
U_BOOT_CMD(
pci, 5, 1, do_pci,
"list and access PCI Configuration Space", pci_help_text
); );

3
common/cmd_reginfo.c
Unescape View File

@ -37,7 +37,8 @@ extern void mpc86xx_reginfo(void);
extern void mpc85xx_reginfo(void); extern void mpc85xx_reginfo(void);
#endif #endif
int do_reginfo (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) static int do_reginfo(cmd_tbl_t *cmdtp, int flag, int argc,
char * const argv[])
{ {
#if defined(CONFIG_8xx) #if defined(CONFIG_8xx)
volatile immap_t *immap = (immap_t *)CONFIG_SYS_IMMR; volatile immap_t *immap = (immap_t *)CONFIG_SYS_IMMR;

4
common/cmd_sata.c
Unescape View File

@ -28,7 +28,7 @@
#include <part.h> #include <part.h>
#include <sata.h> #include <sata.h>
int sata_curr_device = -1; static int sata_curr_device = -1;
block_dev_desc_t sata_dev_desc[CONFIG_SYS_SATA_MAX_DEVICE]; block_dev_desc_t sata_dev_desc[CONFIG_SYS_SATA_MAX_DEVICE];
int __sata_initialize(void) int __sata_initialize(void)
@ -67,7 +67,7 @@ block_dev_desc_t *sata_get_dev(int dev)
} }
#endif #endif
int do_sata(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) static int do_sata(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
{ {
int rc = 0; int rc = 0;

2
common/cmd_setexpr.c
Unescape View File

@ -50,7 +50,7 @@ static ulong get_arg(char *s, int w)
} }
} }
int do_setexpr(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) static int do_setexpr(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
{ {
ulong a, b; ulong a, b;
char buf[16]; char buf[16];

11
common/cmd_source.c
Unescape View File

@ -177,9 +177,8 @@ do_source (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
return rcode; return rcode;
} }
U_BOOT_CMD( #ifdef CONFIG_SYS_LONGHELP
source, 2, 0, do_source, static char source_help_text[] =
"run script from memory",
"[addr]\n" "[addr]\n"
"\t- run script starting at addr\n" "\t- run script starting at addr\n"
"\t- A valid image header must be present" "\t- A valid image header must be present"
@ -188,5 +187,11 @@ U_BOOT_CMD(
"For FIT format uImage addr must include subimage\n" "For FIT format uImage addr must include subimage\n"
"unit name in the form of addr:<subimg_uname>" "unit name in the form of addr:<subimg_uname>"
#endif #endif
"";
#endif
U_BOOT_CMD(
source, 2, 0, do_source,
"run script from memory", source_help_text
); );
#endif #endif

6
common/cmd_test.c
Unescape View File

@ -24,7 +24,7 @@
#include <common.h> #include <common.h>
#include <command.h> #include <command.h>
int do_test(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) static int do_test(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
{ {
char * const *ap; char * const *ap;
int left, adv, expr, last_expr, neg, last_cmp; int left, adv, expr, last_expr, neg, last_cmp;
@ -150,7 +150,7 @@ U_BOOT_CMD(
"[args..]" "[args..]"
); );
int do_false(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) static int do_false(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
{ {
return 1; return 1;
} }
@ -161,7 +161,7 @@ U_BOOT_CMD(
NULL NULL
); );
int do_true(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) static int do_true(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
{ {
return 0; return 0;
} }

30
common/cmd_usb.c
Unescape View File

@ -40,7 +40,7 @@ static int usb_ether_curr_dev = -1; /* current ethernet device */
#endif #endif
/* some display routines (info command) */ /* some display routines (info command) */
char *usb_get_class_desc(unsigned char dclass) static char *usb_get_class_desc(unsigned char dclass)
{ {
switch (dclass) { switch (dclass) {
case USB_CLASS_PER_INTERFACE: case USB_CLASS_PER_INTERFACE:
@ -66,8 +66,8 @@ char *usb_get_class_desc(unsigned char dclass)
} }
} }
void usb_display_class_sub(unsigned char dclass, unsigned char subclass, static void usb_display_class_sub(unsigned char dclass, unsigned char subclass,
unsigned char proto) unsigned char proto)
{ {
switch (dclass) { switch (dclass) {
case USB_CLASS_PER_INTERFACE: case USB_CLASS_PER_INTERFACE:
@ -148,7 +148,7 @@ void usb_display_class_sub(unsigned char dclass, unsigned char subclass,
} }
} }
void usb_display_string(struct usb_device *dev, int index) static void usb_display_string(struct usb_device *dev, int index)
{ {
ALLOC_CACHE_ALIGN_BUFFER(char, buffer, 256); ALLOC_CACHE_ALIGN_BUFFER(char, buffer, 256);
@ -158,7 +158,7 @@ void usb_display_string(struct usb_device *dev, int index)
} }
} }
void usb_display_desc(struct usb_device *dev) static void usb_display_desc(struct usb_device *dev)
{ {
if (dev->descriptor.bDescriptorType == USB_DT_DEVICE) { if (dev->descriptor.bDescriptorType == USB_DT_DEVICE) {
printf("%d: %s, USB Revision %x.%x\n", dev->devnum, printf("%d: %s, USB Revision %x.%x\n", dev->devnum,
@ -192,8 +192,8 @@ void usb_display_desc(struct usb_device *dev)
} }
void usb_display_conf_desc(struct usb_configuration_descriptor *config, static void usb_display_conf_desc(struct usb_configuration_descriptor *config,
struct usb_device *dev) struct usb_device *dev)
{ {
printf(" Configuration: %d\n", config->bConfigurationValue); printf(" Configuration: %d\n", config->bConfigurationValue);
printf(" - Interfaces: %d %s%s%dmA\n", config->bNumInterfaces, printf(" - Interfaces: %d %s%s%dmA\n", config->bNumInterfaces,
@ -207,8 +207,8 @@ void usb_display_conf_desc(struct usb_configuration_descriptor *config,
} }
} }
void usb_display_if_desc(struct usb_interface_descriptor *ifdesc, static void usb_display_if_desc(struct usb_interface_descriptor *ifdesc,
struct usb_device *dev) struct usb_device *dev)
{ {
printf(" Interface: %d\n", ifdesc->bInterfaceNumber); printf(" Interface: %d\n", ifdesc->bInterfaceNumber);
printf(" - Alternate Setting %d, Endpoints: %d\n", printf(" - Alternate Setting %d, Endpoints: %d\n",
@ -224,7 +224,7 @@ void usb_display_if_desc(struct usb_interface_descriptor *ifdesc,
} }
} }
void usb_display_ep_desc(struct usb_endpoint_descriptor *epdesc) static void usb_display_ep_desc(struct usb_endpoint_descriptor *epdesc)
{ {
printf(" - Endpoint %d %s ", epdesc->bEndpointAddress & 0xf, printf(" - Endpoint %d %s ", epdesc->bEndpointAddress & 0xf,
(epdesc->bEndpointAddress & 0x80) ? "In" : "Out"); (epdesc->bEndpointAddress & 0x80) ? "In" : "Out");
@ -249,7 +249,7 @@ void usb_display_ep_desc(struct usb_endpoint_descriptor *epdesc)
} }
/* main routine to diasplay the configs, interfaces and endpoints */ /* main routine to diasplay the configs, interfaces and endpoints */
void usb_display_config(struct usb_device *dev) static void usb_display_config(struct usb_device *dev)
{ {
struct usb_config *config; struct usb_config *config;
struct usb_interface *ifdesc; struct usb_interface *ifdesc;
@ -280,7 +280,7 @@ static inline char *portspeed(int speed)
} }
/* shows the device tree recursively */ /* shows the device tree recursively */
void usb_show_tree_graph(struct usb_device *dev, char *pre) static void usb_show_tree_graph(struct usb_device *dev, char *pre)
{ {
int i, index; int i, index;
int has_child, last_child; int has_child, last_child;
@ -340,7 +340,7 @@ void usb_show_tree_graph(struct usb_device *dev, char *pre)
} }
/* main routine for the tree command */ /* main routine for the tree command */
void usb_show_tree(struct usb_device *dev) static void usb_show_tree(struct usb_device *dev)
{ {
char preamble[32]; char preamble[32];
@ -353,7 +353,7 @@ void usb_show_tree(struct usb_device *dev)
* usb boot command intepreter. Derived from diskboot * usb boot command intepreter. Derived from diskboot
*/ */
#ifdef CONFIG_USB_STORAGE #ifdef CONFIG_USB_STORAGE
int do_usbboot(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) static int do_usbboot(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
{ {
return common_diskboot(cmdtp, "usb", argc, argv); return common_diskboot(cmdtp, "usb", argc, argv);
} }
@ -363,7 +363,7 @@ int do_usbboot(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
/****************************************************************************** /******************************************************************************
* usb command intepreter * usb command intepreter
*/ */
int do_usb(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) static int do_usb(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
{ {
int i; int i;

2
common/cmd_version.c
Unescape View File

@ -28,7 +28,7 @@
const char __weak version_string[] = U_BOOT_VERSION_STRING; const char __weak version_string[] = U_BOOT_VERSION_STRING;
int do_version(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) static int do_version(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
{ {
printf("\n%s\n", version_string); printf("\n%s\n", version_string);
#ifdef CC_VERSION_STRING #ifdef CC_VERSION_STRING

13
common/cmd_ximg.c
Unescape View File

@ -42,7 +42,7 @@
#define CONFIG_SYS_XIMG_LEN 0x800000 #define CONFIG_SYS_XIMG_LEN 0x800000
#endif #endif
int static int
do_imgextract(cmd_tbl_t * cmdtp, int flag, int argc, char * const argv[]) do_imgextract(cmd_tbl_t * cmdtp, int flag, int argc, char * const argv[])
{ {
ulong addr = load_addr; ulong addr = load_addr;
@ -264,9 +264,8 @@ do_imgextract(cmd_tbl_t * cmdtp, int flag, int argc, char * const argv[])
return 0; return 0;
} }
U_BOOT_CMD( #ifdef CONFIG_SYS_LONGHELP
imxtract, 4, 1, do_imgextract, static char imgextract_help_text[] =
"extract a part of a multi-image",
"addr part [dest]\n" "addr part [dest]\n"
" - extract <part> from legacy image at <addr> and copy to <dest>" " - extract <part> from legacy image at <addr> and copy to <dest>"
#if defined(CONFIG_FIT) #if defined(CONFIG_FIT)
@ -274,4 +273,10 @@ U_BOOT_CMD(
"addr uname [dest]\n" "addr uname [dest]\n"
" - extract <uname> subimage from FIT image at <addr> and copy to <dest>" " - extract <uname> subimage from FIT image at <addr> and copy to <dest>"
#endif #endif
"";
#endif
U_BOOT_CMD(
imxtract, 4, 1, do_imgextract,
"extract a part of a multi-image", imgextract_help_text
); );

Write Preview
Loading…
Cancel
Save