Merge branch 'master' of git://www.denx.de/git/u-boot-ppc4xx

[u-boot] / board / prodrive / common / flash.c

diff --git a/board/prodrive/common/flash.c b/board/prodrive/common/flash.c
index 8630cc166429aa967ed8fd680789468173a05201..363631fd84f7a4571a3f927c6f8f5c74aedf019c 100644 (file)
--- a/board/prodrive/common/flash.c
+++ b/board/prodrive/common/flash.c
@@ -48,6 +48,7 @@ void flash_print_info(flash_info_t *info)
        case FLASH_MAN_AMD:     printf ("AMD ");                break;
        case FLASH_MAN_FUJ:     printf ("FUJITSU ");            break;
        case FLASH_MAN_SST:     printf ("SST ");                break;
+       case FLASH_MAN_STM:     printf ("ST ");                 break;
        case FLASH_MAN_EXCEL:   printf ("Excel Semiconductor "); break;
        default:                printf ("Unknown Vendor ");     break;
        }
@@ -156,6 +157,9 @@ static ulong flash_get_size(vu_long *addr, flash_info_t *info)
        case (CFG_FLASH_WORD_SIZE)SST_MANUFACT:
                info->flash_id = FLASH_MAN_SST;
                break;
+       case (CFG_FLASH_WORD_SIZE)STM_MANUFACT:
+               info->flash_id = FLASH_MAN_STM;
+               break;
        case (CFG_FLASH_WORD_SIZE)EXCEL_MANUFACT:
                info->flash_id = FLASH_MAN_EXCEL;
                break;