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>

diff --git a/arch/arm/lib/board.c b/arch/arm/lib/board.c
index 96c0e301616e4ff8c3e64dbfa3bbe1e7c371187f..c620d2c200616f0e6a04a49fab2a90876e0be2d7 100644 (file)
--- a/arch/arm/lib/board.c
+++ b/arch/arm/lib/board.c
@@ -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

diff --git a/arch/m68k/lib/board.c b/arch/m68k/lib/board.c
index 9a519088582145e338774762f7c24c5c0c001386..7867ba54b7132cc60d86e63f34e8d95e937c3ccf 100644 (file)
--- a/arch/m68k/lib/board.c
+++ b/arch/m68k/lib/board.c
@@ -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

diff --git a/arch/microblaze/lib/board.c b/arch/microblaze/lib/board.c
index b06212efd29f56f7c5721123d189e0795ae0631e..c5f7ac47331a330e3ec482e0b1010ade9a680533 100644 (file)
--- a/arch/microblaze/lib/board.c
+++ b/arch/microblaze/lib/board.c
@@ -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;

diff --git a/arch/powerpc/lib/board.c b/arch/powerpc/lib/board.c
index 9759e23a53de45782291a2b649484fc6c81151be..b88cf6b67db57945b81e5f68fca45314e685c1cb 100644 (file)
--- a/arch/powerpc/lib/board.c
+++ b/arch/powerpc/lib/board.c
@@ -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");

diff --git a/arch/sh/lib/board.c b/arch/sh/lib/board.c
index cdac3826c76e20698e49c1dcd041fb0599236b0e..968566c6f5109b2f1665d7f1c0a0fc898d12af36 100644 (file)
--- a/arch/sh/lib/board.c
+++ b/arch/sh/lib/board.c
@@ -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;
 }

diff --git a/arch/sparc/lib/board.c b/arch/sparc/lib/board.c
index ab31cfb50addf543729c05c7c1a19d8e98f7a334..386cd041938ff15da72262aa6287a103d56ab881 100644 (file)
--- a/arch/sparc/lib/board.c
+++ b/arch/sparc/lib/board.c
@@ -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

diff --git a/board/xes/xpedite517x/xpedite517x.c b/board/xes/xpedite517x/xpedite517x.c
index 572a9080047eee15d0a273ab6fac341bbf093fb6..61443aab841987bfa33615b74f9df7f0392cfea7 100644 (file)
--- a/board/xes/xpedite517x/xpedite517x.c
+++ b/board/xes/xpedite517x/xpedite517x.c
@@ -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);

diff --git a/board/xes/xpedite520x/xpedite520x.c b/board/xes/xpedite520x/xpedite520x.c
index dc5c96511423ea08714f549f198e1c904968e98e..c79171dd2a012f9b3d6c60cefd86050534c99925 100644 (file)
--- a/board/xes/xpedite520x/xpedite520x.c
+++ b/board/xes/xpedite520x/xpedite520x.c
@@ -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);

diff --git a/board/xes/xpedite537x/xpedite537x.c b/board/xes/xpedite537x/xpedite537x.c
index 89fa6c78b3034babba4e44b399ca39025f4c3942..d074495f96674d0d93b639491e39a8a195fcb710 100644 (file)
--- a/board/xes/xpedite537x/xpedite537x.c
+++ b/board/xes/xpedite537x/xpedite537x.c
@@ -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);

diff --git a/board/xes/xpedite550x/xpedite550x.c b/board/xes/xpedite550x/xpedite550x.c
index 2ad30a30f90284ab26419d25ca29817ad4b5448c..6f91c83b6c202340995ddd7fea978f167774867e 100644 (file)
--- a/board/xes/xpedite550x/xpedite550x.c
+++ b/board/xes/xpedite550x/xpedite550x.c
@@ -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);

diff --git a/drivers/mtd/cfi_flash.c b/drivers/mtd/cfi_flash.c
index 1e8d3757f48f5c8ad67b56abe0b8b9700db2d031..dd394a81ffefd31ddaa127bf4d2895dae4ad3f02 100644 (file)
--- a/drivers/mtd/cfi_flash.c
+++ b/drivers/mtd/cfi_flash.c
@@ -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);