mirror of
https://github.com/Fishwaldo/u-boot.git
synced 2025-03-18 21:21:37 +00:00
Replace "FLASH" strings with "Flash" or "flash"
There's no compelling reason to have the output on bootup or the "flinfo" command print "flash" in uppercase, so use the proper case where appropriate. Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
This commit is contained in:
parent
16721715b9
commit
eddf52b593
11 changed files with 13 additions and 13 deletions
|
@ -481,7 +481,7 @@ void board_init_r (gd_t *id, ulong dest_addr)
|
|||
mem_malloc_init (malloc_start, TOTAL_MALLOC_LEN);
|
||||
|
||||
#if !defined(CONFIG_SYS_NO_FLASH)
|
||||
puts ("FLASH: ");
|
||||
puts ("Flash: ");
|
||||
|
||||
if ((flash_size = flash_init ()) > 0) {
|
||||
# ifdef CONFIG_SYS_FLASH_CHECKSUM
|
||||
|
|
|
@ -460,7 +460,7 @@ void board_init_r (gd_t *id, ulong dest_addr)
|
|||
malloc_bin_reloc ();
|
||||
|
||||
#if !defined(CONFIG_SYS_NO_FLASH)
|
||||
puts ("FLASH: ");
|
||||
puts ("Flash: ");
|
||||
|
||||
if ((flash_size = flash_init ()) > 0) {
|
||||
# ifdef CONFIG_SYS_FLASH_CHECKSUM
|
||||
|
|
|
@ -127,7 +127,7 @@ void board_init (void)
|
|||
printf ("\tU-Boot Start:0x%08x\n", CONFIG_SYS_TEXT_BASE);
|
||||
|
||||
#if defined(CONFIG_CMD_FLASH)
|
||||
puts ("FLASH: ");
|
||||
puts ("Flash: ");
|
||||
bd->bi_flashstart = CONFIG_SYS_FLASH_BASE;
|
||||
if (0 < (flash_size = flash_init ())) {
|
||||
bd->bi_flashsize = flash_size;
|
||||
|
|
|
@ -717,7 +717,7 @@ void board_init_r (gd_t *id, ulong dest_addr)
|
|||
mem_malloc_init (malloc_start, TOTAL_MALLOC_LEN);
|
||||
|
||||
#if !defined(CONFIG_SYS_NO_FLASH)
|
||||
puts ("FLASH: ");
|
||||
puts ("Flash: ");
|
||||
|
||||
if (board_flash_wp_on()) {
|
||||
printf("Uninitialized - Write Protect On\n");
|
||||
|
|
|
@ -48,9 +48,9 @@ static int sh_flash_init(void)
|
|||
gd->bd->bi_flashsize = flash_init();
|
||||
|
||||
if (gd->bd->bi_flashsize >= (1024 * 1024))
|
||||
printf("FLASH: %ldMB\n", gd->bd->bi_flashsize / (1024*1024));
|
||||
printf("Flash: %ldMB\n", gd->bd->bi_flashsize / (1024*1024));
|
||||
else
|
||||
printf("FLASH: %ldKB\n", gd->bd->bi_flashsize / 1024);
|
||||
printf("Flash: %ldKB\n", gd->bd->bi_flashsize / 1024);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
|
|
@ -284,7 +284,7 @@ void board_init_f(ulong bootflag)
|
|||
malloc_bin_reloc();
|
||||
|
||||
#if !defined(CONFIG_SYS_NO_FLASH)
|
||||
puts("FLASH: ");
|
||||
puts("Flash: ");
|
||||
|
||||
if ((flash_size = flash_init()) > 0) {
|
||||
# ifdef CONFIG_SYS_FLASH_CHECKSUM
|
||||
|
|
|
@ -48,7 +48,7 @@ static void flash_cs_fixup(void)
|
|||
*/
|
||||
flash_sel = !((pca953x_get_val(CONFIG_SYS_I2C_PCA953X_ADDR0) &
|
||||
CONFIG_SYS_PCA953X_C0_FLASH_PASS_CS));
|
||||
printf("FLASH: Executed from FLASH%d\n", flash_sel ? 2 : 1);
|
||||
printf("Flash: Executed from flash%d\n", flash_sel ? 2 : 1);
|
||||
|
||||
if (flash_sel) {
|
||||
set_lbc_br(0, CONFIG_SYS_BR1_PRELIM);
|
||||
|
|
|
@ -47,7 +47,7 @@ static void flash_cs_fixup(void)
|
|||
*/
|
||||
flash_sel = !((pca953x_get_val(CONFIG_SYS_I2C_PCA953X_ADDR0) &
|
||||
CONFIG_SYS_PCA953X_FLASH_PASS_CS));
|
||||
printf("FLASH: Executed from FLASH%d\n", flash_sel ? 2 : 1);
|
||||
printf("Flash: Executed from flash%d\n", flash_sel ? 2 : 1);
|
||||
|
||||
if (flash_sel) {
|
||||
set_lbc_br(0, CONFIG_SYS_BR1_PRELIM);
|
||||
|
|
|
@ -47,7 +47,7 @@ static void flash_cs_fixup(void)
|
|||
*/
|
||||
flash_sel = !((pca953x_get_val(CONFIG_SYS_I2C_PCA953X_ADDR0) &
|
||||
CONFIG_SYS_PCA953X_C0_FLASH_PASS_CS));
|
||||
printf("FLASH: Executed from FLASH%d\n", flash_sel ? 2 : 1);
|
||||
printf("Flash: Executed from flash%d\n", flash_sel ? 2 : 1);
|
||||
|
||||
if (flash_sel) {
|
||||
set_lbc_br(0, CONFIG_SYS_BR1_PRELIM);
|
||||
|
|
|
@ -47,7 +47,7 @@ static void flash_cs_fixup(void)
|
|||
*/
|
||||
flash_sel = !((pca953x_get_val(CONFIG_SYS_I2C_PCA953X_ADDR0) &
|
||||
CONFIG_SYS_PCA953X_C0_FLASH_PASS_CS));
|
||||
printf("FLASH: Executed from FLASH%d\n", flash_sel ? 2 : 1);
|
||||
printf("Flash: Executed from flash%d\n", flash_sel ? 2 : 1);
|
||||
|
||||
if (flash_sel) {
|
||||
set_lbc_br(0, CONFIG_SYS_BR1_PRELIM);
|
||||
|
|
|
@ -1158,7 +1158,7 @@ void flash_print_info (flash_info_t * info)
|
|||
return;
|
||||
}
|
||||
|
||||
printf ("%s FLASH (%d x %d)",
|
||||
printf ("%s flash (%d x %d)",
|
||||
info->name,
|
||||
(info->portwidth << 3), (info->chipwidth << 3));
|
||||
if (info->size < 1024*1024)
|
||||
|
@ -2110,7 +2110,7 @@ unsigned long flash_init (void)
|
|||
size += flash_info[i].size;
|
||||
if (flash_info[i].flash_id == FLASH_UNKNOWN) {
|
||||
#ifndef CONFIG_SYS_FLASH_QUIET_TEST
|
||||
printf ("## Unknown FLASH on Bank %d "
|
||||
printf ("## Unknown flash on Bank %d "
|
||||
"- Size = 0x%08lx = %ld MB\n",
|
||||
i+1, flash_info[i].size,
|
||||
flash_info[i].size >> 20);
|
||||
|
|
Loading…
Add table
Reference in a new issue