From 3bac351370ef7cbf9d2af27ba52bee1703ad677e Mon Sep 17 00:00:00 2001
From: wdenk <wdenk>
Date: Wed, 12 Mar 2003 10:41:04 +0000
Subject: * Patch by Josef Wagner, 12 Mar 2003:   - 16/32 MB and 50/80 MHz
 support with auto-detection for IP860   - ETH05 and BEDBUG support for CU824 
  - added support for MicroSys CPC45   - new BOOTROM/FLASH0 and DOC base for
 PM826

* Patch by Robert Schwebel, 12 Mar 2003:
  Fix the chpart command on innokom board

* Name cleanup:
  mv include/asm-i386/ppcboot-i386.h include/asm-i386/u-boot-i386.h
  s/PPCBoot/U-Boot/ in some files
  s/pImage/uImage/  in some files

* Patch by Detlev Zundel, 15 Jan 2003:
  Fix '' command line quoting

* Patch by The LEOX team, 19 Jan 2003:
  - add support for the ELPT860 board
  - add support for Dallas ds164x RTC
---
 board/trab/flash.c | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'board/trab/flash.c')

diff --git a/board/trab/flash.c b/board/trab/flash.c
index d86c4bf770..27c2a5b490 100644
--- a/board/trab/flash.c
+++ b/board/trab/flash.c
@@ -185,9 +185,12 @@ int flash_erase (flash_info_t * info, int s_first, int s_last)
 		return ERR_INVAL;
 	}
 
-	if ((info->flash_id & FLASH_VENDMASK) !=
-		(FLASH_MAN_AMD & FLASH_VENDMASK)) {
-		return ERR_UNKNOWN_FLASH_VENDOR;
+	switch (info->flash_id & FLASH_VENDMASK) {
+	case (FLASH_MAN_AMD & FLASH_VENDMASK):	break;	/* OK */
+	case (FLASH_MAN_FUJ & FLASH_VENDMASK):	break;	/* OK */
+	default:
+		debug ("## flash_erase: unknown manufacturer\n");
+		return (ERR_UNKNOWN_FLASH_VENDOR);
 	}
 
 	prot = 0;
-- 
cgit