diff options
Diffstat (limited to 'common')
| -rw-r--r-- | common/cmd_bdinfo.c | 2 | ||||
| -rw-r--r-- | common/cmd_nvedit.c | 4 | ||||
| -rw-r--r-- | common/cmd_usb.c | 2 | ||||
| -rw-r--r-- | common/exports.c | 2 | ||||
| -rw-r--r-- | common/usb_storage.c | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/common/cmd_bdinfo.c b/common/cmd_bdinfo.c index bba7374609..1d76ffaa27 100644 --- a/common/cmd_bdinfo.c +++ b/common/cmd_bdinfo.c @@ -304,7 +304,7 @@ int do_bdinfo ( cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) #elif defined(CONFIG_AVR32) -int do_bdinfo ( cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) +int do_bdinfo ( cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) { bd_t *bd = gd->bd; diff --git a/common/cmd_nvedit.c b/common/cmd_nvedit.c index fb69c242f1..6d8512aecb 100644 --- a/common/cmd_nvedit.c +++ b/common/cmd_nvedit.c @@ -659,7 +659,7 @@ static int do_env_export(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv errno); return 1; } - sprintf(buf, "%zX", len); + sprintf(buf, "%zX", (size_t)len); setenv("filesize", buf); return 0; @@ -685,7 +685,7 @@ static int do_env_export(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv envp->flags = ACTIVE_FLAG; #endif } - sprintf(buf, "%zX", len + offsetof(env_t,data)); + sprintf(buf, "%zX", (size_t)(len + offsetof(env_t,data))); setenv("filesize", buf); return 0; diff --git a/common/cmd_usb.c b/common/cmd_usb.c index b5731a7bb8..3ba6fff4fd 100644 --- a/common/cmd_usb.c +++ b/common/cmd_usb.c @@ -588,7 +588,7 @@ int do_usb(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) break; } if (dev == NULL) { - printf("*** NO Device avaiable ***\n"); + printf("*** No device available ***\n"); return 0; } else { usb_display_desc(dev); diff --git a/common/exports.c b/common/exports.c index 3dff7351bc..717e4afe6d 100644 --- a/common/exports.c +++ b/common/exports.c @@ -15,7 +15,7 @@ unsigned long get_version(void) /* Reuse _exports.h with a little trickery to avoid bitrot */ #define EXPORT_FUNC(sym) gd->jt[XF_##sym] = (void *)sym; -#if !defined(CONFIG_I386) && !defined(CONFIG_PPC) +#if !defined(CONFIG_X86) && !defined(CONFIG_PPC) # define install_hdlr dummy # define free_hdlr dummy #else /* kludge for non-standard function naming */ diff --git a/common/usb_storage.c b/common/usb_storage.c index 6963e6dcc8..9ecf165d1a 100644 --- a/common/usb_storage.c +++ b/common/usb_storage.c @@ -254,7 +254,7 @@ int usb_stor_scan(int mode) dev = usb_get_dev_index(i); /* get device */ USB_STOR_PRINTF("i=%d\n", i); if (dev == NULL) - break; /* no more devices avaiable */ + break; /* no more devices available */ if (usb_storage_probe(dev, 0, &usb_stor[usb_max_devs])) { /* OK, it's a storage device. Iterate over its LUNs |