# HG changeset patch
# User gthomas
# Date 1075161550 0
# Node ID b657b20a6ea20a29fa4a465c5d9e518f2ba99384
# Parent  7f22303e92aa6a9011040ca91ccee3e635e0f0f5
Support for STMicro chips

diff --git a/packages/devs/flash/intel/strata/current/ChangeLog b/packages/devs/flash/intel/strata/current/ChangeLog
--- a/packages/devs/flash/intel/strata/current/ChangeLog
+++ b/packages/devs/flash/intel/strata/current/ChangeLog
@@ -1,3 +1,9 @@
+2005-01-26  Scott Wilkinson <scott@alliantnetworks.com>
+	* src/strata.h:
+	* src/strata.c:
+	Flash from STMicro is compatible with the Intel strata chips, 
+	so detect them as well.  Check for manuf id 0x20.
+
 2003-10-29  Jonathan Larmour  <jifl@eCosCentric.com>
 
 	* src/flash_unlock_block.c (flash_unlock_block): test lock bit
diff --git a/packages/devs/flash/intel/strata/current/src/strata.c b/packages/devs/flash/intel/strata/current/src/strata.c
--- a/packages/devs/flash/intel/strata/current/src/strata.c
+++ b/packages/devs/flash/intel/strata/current/src/strata.c
@@ -74,7 +74,8 @@ flash_hwr_init(void)
 
     flash_dev_query(&data);
     qp = &data;
-    if ( (qp->manuf_code == FLASH_Intel_code)
+    if ( ((qp->manuf_code == FLASH_Intel_code) || 
+          (qp->manuf_code == FLASH_STMicro_code))
 #ifdef CYGOPT_FLASH_IS_BOOTBLOCK
          // device types go as follows: 0x90 for 16-bits, 0xD0 for 8-bits,
          // plus 0 or 1 for -T (Top Boot) or -B (Bottom Boot)
diff --git a/packages/devs/flash/intel/strata/current/src/strata.h b/packages/devs/flash/intel/strata/current/src/strata.h
--- a/packages/devs/flash/intel/strata/current/src/strata.h
+++ b/packages/devs/flash/intel/strata/current/src/strata.h
@@ -156,6 +156,7 @@
 // ------------------------------------------------------------------------
 
 #define FLASH_Intel_code   0x89 // NOT mapped to 16+16
+#define FLASH_STMicro_code 0x20 // NOT mapped to 16+16
 
 // Extended query information
 struct FLASH_query {