diff options
Diffstat (limited to 'cmd')
| -rw-r--r-- | cmd/bmp.c | 3 | ||||
| -rw-r--r-- | cmd/bootldr.c | 2 | ||||
| -rw-r--r-- | cmd/cramfs.c | 2 | ||||
| -rw-r--r-- | cmd/itest.c | 2 | ||||
| -rw-r--r-- | cmd/jffs2.c | 2 | ||||
| -rw-r--r-- | cmd/ldrinfo.c | 2 | ||||
| -rw-r--r-- | cmd/load.c | 30 | ||||
| -rw-r--r-- | cmd/mtdparts.c | 2 | ||||
| -rw-r--r-- | cmd/pxe.c | 4 | ||||
| -rw-r--r-- | cmd/spibootldr.c | 2 |
10 files changed, 10 insertions, 41 deletions
@@ -259,7 +259,6 @@ int bmp_display(ulong addr, int x, int y) ret = video_bmp_display(dev, addr, x, y, align); } } - return ret ? CMD_RET_FAILURE : 0; #elif defined(CONFIG_LCD) ret = lcd_display_bitmap(addr, x, y); #elif defined(CONFIG_VIDEO) @@ -271,5 +270,5 @@ int bmp_display(ulong addr, int x, int y) if (bmp_alloc_addr) free(bmp_alloc_addr); - return ret; + return ret ? CMD_RET_FAILURE : 0; } diff --git a/cmd/bootldr.c b/cmd/bootldr.c index bc5c1f95ea..38b3b2f8d7 100644 --- a/cmd/bootldr.c +++ b/cmd/bootldr.c @@ -1,5 +1,5 @@ /* - * U-boot - bootldr.c + * U-Boot - bootldr.c * * Copyright (c) 2005-2008 Analog Devices Inc. * diff --git a/cmd/cramfs.c b/cmd/cramfs.c index 1d31326bd6..270701b99d 100644 --- a/cmd/cramfs.c +++ b/cmd/cramfs.c @@ -77,7 +77,7 @@ extern int cramfs_ls (struct part_info *info, char *filename); extern int cramfs_info (struct part_info *info); /***************************************************/ -/* U-boot commands */ +/* U-Boot commands */ /***************************************************/ /** diff --git a/cmd/itest.c b/cmd/itest.c index 91ae5c2704..fb4d797e43 100644 --- a/cmd/itest.c +++ b/cmd/itest.c @@ -59,7 +59,7 @@ static long evalexp(char *s, int w) if (s[0] == '*') { addr = simple_strtoul(&s[1], NULL, 16); buf = map_physmem(addr, w, MAP_WRBACK); - if (!buf) { + if (!buf && addr) { puts("Failed to map physical memory\n"); return 0; } diff --git a/cmd/jffs2.c b/cmd/jffs2.c index bce098315e..0b2eefa195 100644 --- a/cmd/jffs2.c +++ b/cmd/jffs2.c @@ -456,7 +456,7 @@ static struct part_info* jffs2_part_info(struct mtd_device *dev, unsigned int pa } /***************************************************/ -/* U-boot commands */ +/* U-Boot commands */ /***************************************************/ /** diff --git a/cmd/ldrinfo.c b/cmd/ldrinfo.c index 2aa56bdb62..2b49297327 100644 --- a/cmd/ldrinfo.c +++ b/cmd/ldrinfo.c @@ -1,5 +1,5 @@ /* - * U-boot - ldrinfo + * U-Boot - ldrinfo * * Copyright (c) 2010 Analog Devices Inc. * diff --git a/cmd/load.c b/cmd/load.c index 0aa7937fd4..65557e4f9e 100644 --- a/cmd/load.c +++ b/cmd/load.c @@ -1081,33 +1081,3 @@ U_BOOT_CMD( ); #endif /* CONFIG_CMD_LOADB */ - -/* -------------------------------------------------------------------- */ - -#if defined(CONFIG_CMD_HWFLOW) -int do_hwflow(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) -{ - extern int hwflow_onoff(int); - - if (argc == 2) { - if (strcmp(argv[1], "off") == 0) - hwflow_onoff(-1); - else - if (strcmp(argv[1], "on") == 0) - hwflow_onoff(1); - else - return CMD_RET_USAGE; - } - printf("RTS/CTS hardware flow control: %s\n", hwflow_onoff(0) ? "on" : "off"); - return 0; -} - -/* -------------------------------------------------------------------- */ - -U_BOOT_CMD( - hwflow, 2, 0, do_hwflow, - "turn RTS/CTS hardware flow control in serial line on/off", - "[on|off]" -); - -#endif /* CONFIG_CMD_HWFLOW */ diff --git a/cmd/mtdparts.c b/cmd/mtdparts.c index dab195841a..86a4689616 100644 --- a/cmd/mtdparts.c +++ b/cmd/mtdparts.c @@ -1877,7 +1877,7 @@ static struct part_info* mtd_part_info(struct mtd_device *dev, unsigned int part } /***************************************************/ -/* U-boot commands */ +/* U-Boot commands */ /***************************************************/ /* command line only */ /** @@ -571,7 +571,7 @@ static void label_print(void *data) /* * Boot a label that specified 'localboot'. This requires that the 'localcmd' - * environment variable is defined. Its contents will be executed as U-boot + * environment variable is defined. Its contents will be executed as U-Boot * command. If the label specified an 'append' line, its contents will be * used to overwrite the contents of the 'bootargs' environment variable prior * to running 'localcmd'. @@ -1438,7 +1438,7 @@ static struct pxe_menu *parse_pxefile(cmd_tbl_t *cmdtp, unsigned long menucfg) } /* - * Converts a pxe_menu struct into a menu struct for use with U-boot's generic + * Converts a pxe_menu struct into a menu struct for use with U-Boot's generic * menu code. */ static struct menu *pxe_menu_to_menu(struct pxe_menu *cfg) diff --git a/cmd/spibootldr.c b/cmd/spibootldr.c index ca76dde1dd..acbb0f6969 100644 --- a/cmd/spibootldr.c +++ b/cmd/spibootldr.c @@ -1,5 +1,5 @@ /* - * U-boot - spibootldr.c + * U-Boot - spibootldr.c * * Copyright (c) 2005-2008 Analog Devices Inc. * |