diff options
Diffstat (limited to 'common')
| -rw-r--r-- | common/cmd_bdinfo.c | 1 | ||||
| -rw-r--r-- | common/cmd_mmc.c | 2 | ||||
| -rw-r--r-- | common/cmd_mtdparts.c | 10 | ||||
| -rw-r--r-- | common/cmd_ximg.c | 2 | ||||
| -rw-r--r-- | common/console.c | 10 | ||||
| -rw-r--r-- | common/env_eeprom.c | 1 | ||||
| -rw-r--r-- | common/main.c | 8 | ||||
| -rw-r--r-- | common/miiphyutil.c | 4 |
8 files changed, 24 insertions, 14 deletions
diff --git a/common/cmd_bdinfo.c b/common/cmd_bdinfo.c index 11c154731e3..f8400bcc04b 100644 --- a/common/cmd_bdinfo.c +++ b/common/cmd_bdinfo.c @@ -115,6 +115,7 @@ int do_bdinfo ( cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) #endif printf ("IP addr = %pI4\n", &bd->bi_ip_addr); printf ("baudrate = %6ld bps\n", bd->bi_baudrate ); + print_num ("relocaddr", gd->relocaddr); return 0; } diff --git a/common/cmd_mmc.c b/common/cmd_mmc.c index 0e3393b5f44..c67c9cf728f 100644 --- a/common/cmd_mmc.c +++ b/common/cmd_mmc.c @@ -136,7 +136,7 @@ int do_mmcinfo (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) } U_BOOT_CMD(mmcinfo, 2, 0, do_mmcinfo, - "mmcinfo <dev num>-- display MMC info\n", + "mmcinfo <dev num>-- display MMC info", "" ); diff --git a/common/cmd_mtdparts.c b/common/cmd_mtdparts.c index b375feaad19..20fed2aadce 100644 --- a/common/cmd_mtdparts.c +++ b/common/cmd_mtdparts.c @@ -1254,8 +1254,14 @@ static void list_partitions(void) printf("\ndefaults:\n"); printf("mtdids : %s\n", mtdids_default ? mtdids_default : "none"); - printf("mtdparts: %s\n", - mtdparts_default ? mtdparts_default : "none"); + /* + * Using printf() here results in printbuffer overflow + * if default mtdparts string is greater than console + * printbuffer. Use puts() to prevent system crashes. + */ + puts("mtdparts: "); + puts(mtdparts_default ? mtdparts_default : "none"); + puts("\n"); } /** diff --git a/common/cmd_ximg.c b/common/cmd_ximg.c index b34c4d02da0..75499b4b84b 100644 --- a/common/cmd_ximg.c +++ b/common/cmd_ximg.c @@ -230,7 +230,7 @@ do_imgextract(cmd_tbl_t * cmdtp, int flag, int argc, char *argv[]) printf (" Uncompressing part %d ... ", part); /* - * If we've got less than 4 MB of malloc() + * If we've got less than 4 MB of malloc() * space, use slower decompression algorithm * which requires at most 2300 KB of memory. */ diff --git a/common/console.c b/common/console.c index dc0d13b5a52..51c6fb6264a 100644 --- a/common/console.c +++ b/common/console.c @@ -659,10 +659,14 @@ int console_init_r(void) #ifdef CONFIG_SPLASH_SCREEN /* * suppress all output if splash screen is enabled and we have - * a bmp to display + * a bmp to display. We redirect the output from frame buffer + * console to serial console in this case or suppress it if + * "silent" mode was requested. */ - if (getenv("splashimage") != NULL) - gd->flags |= GD_FLG_SILENT; + if (getenv("splashimage") != NULL) { + if (!(gd->flags & GD_FLG_SILENT)) + outputdev = search_device (DEV_FLAGS_OUTPUT, "serial"); + } #endif /* Scan devices looking for input and output devices */ diff --git a/common/env_eeprom.c b/common/env_eeprom.c index 95a7d0d3bc9..4f7f0dbdea1 100644 --- a/common/env_eeprom.c +++ b/common/env_eeprom.c @@ -281,4 +281,3 @@ int env_init(void) return (0); } #endif - diff --git a/common/main.c b/common/main.c index 10d8904170b..c860b0b0e52 100644 --- a/common/main.c +++ b/common/main.c @@ -305,10 +305,6 @@ void main_loop (void) trab_vfd (bmp); #endif /* CONFIG_VFD && VFD_TEST_LOGO */ -#if defined(CONFIG_UPDATE_TFTP) - update_tftp (); -#endif /* CONFIG_UPDATE_TFTP */ - #ifdef CONFIG_BOOTCOUNT_LIMIT bootcount = bootcount_load(); bootcount++; @@ -369,6 +365,10 @@ void main_loop (void) } #endif /* CONFIG_PREBOOT */ +#if defined(CONFIG_UPDATE_TFTP) + update_tftp (); +#endif /* CONFIG_UPDATE_TFTP */ + #if defined(CONFIG_BOOTDELAY) && (CONFIG_BOOTDELAY >= 0) s = getenv ("bootdelay"); bootdelay = s ? (int)simple_strtol(s, NULL, 10) : CONFIG_BOOTDELAY; diff --git a/common/miiphyutil.c b/common/miiphyutil.c index 856fbc70b84..4b186dd28c0 100644 --- a/common/miiphyutil.c +++ b/common/miiphyutil.c @@ -377,7 +377,7 @@ int miiphy_speed (char *devname, unsigned char addr) /* Get speed from basic control settings. */ return (bmcr & PHY_BMCR_100MB) ? _100BASET : _10BASET; - miiphy_read_failed: +miiphy_read_failed: printf (" read failed, assuming 10BASE-T\n"); return _10BASET; } @@ -436,7 +436,7 @@ int miiphy_duplex (char *devname, unsigned char addr) /* Get speed from basic control settings. */ return (bmcr & PHY_BMCR_DPLX) ? FULL : HALF; - miiphy_read_failed: +miiphy_read_failed: printf (" read failed, assuming half duplex\n"); return HALF; } |