--
Øyvind Harboe
http://www.zylin.com
Index: current/ChangeLog
===================================================================
RCS file: /cvs/ecos/ecos/packages/devs/flash/amd/am29xxxxx/current/ChangeLog,v
retrieving revision 1.36
diff -w -u -r1.36 ChangeLog
--- current/ChangeLog 21 Sep 2005 19:30:58 -0000 1.36
+++ current/ChangeLog 11 Aug 2006 08:40:24 -0000
@@ -1,3 +1,5 @@
+2005-08-11 Oyvind Harboe <[EMAIL PROTECTED]>
+ * Added ST_M29W320D
2005-09-08 Peter Korsgaard <[EMAIL PROTECTED]>
* include/flash_am29xxxxx.inl (flash_program_buf): Handle writes
Index: current/cdl/flash_amd_am29xxxxx.cdl
===================================================================
RCS file:
/cvs/ecos/ecos/packages/devs/flash/amd/am29xxxxx/current/cdl/flash_amd_am29xxxxx.cdl,v
retrieving revision 1.20
diff -w -u -r1.20 flash_amd_am29xxxxx.cdl
--- current/cdl/flash_amd_am29xxxxx.cdl 12 Jun 2005 13:41:11 -0000 1.20
+++ current/cdl/flash_amd_am29xxxxx.cdl 11 Aug 2006 08:40:24 -0000
@@ -137,6 +137,16 @@
part in the family."
}
+ cdl_option CYGHWR_DEVS_FLASH_ST_M29W320D {
+ display "ST M29W320D flash memory support"
+ default_value 0
+ implements CYGINT_DEVS_FLASH_AMD_VARIANTS
+ description "
+ When this option is enabled, the AMD flash driver will be
+ able to recognize and handle the ST M29W320D
+ part in the family."
+ }
+
cdl_option CYGHWR_DEVS_FLASH_AMD_AM29LV200 {
display "AMD AM29LV200 flash memory support"
default_value 0
Index: current/include/flash_am29xxxxx.inl
===================================================================
RCS file:
/cvs/ecos/ecos/packages/devs/flash/amd/am29xxxxx/current/include/flash_am29xxxxx.inl,v
retrieving revision 1.23
diff -w -u -r1.23 flash_am29xxxxx.inl
--- current/include/flash_am29xxxxx.inl 21 Sep 2005 19:30:59 -0000 1.23
+++ current/include/flash_am29xxxxx.inl 11 Aug 2006 08:40:25 -0000
@@ -97,7 +97,8 @@
#define _16AS8 CYGNUM_FLASH_16AS8
#endif
-#if (_16AS8 == 0)
+
+# if (_16AS8 == 0)||CYGHWR_DEVS_FLASH_ST_M29W320D
# define FLASH_Setup_Addr1 (0x555)
# define FLASH_Setup_Addr2 (0x2AA)
# define FLASH_VendorID_Addr (0)
@@ -114,6 +115,7 @@
# define FLASH_DeviceID_Addr3 (0x1e)
# define FLASH_WP_Addr (4)
#endif
+
#define FLASH_Setup_Code1 FLASHWORD( 0xAA )
#define FLASH_Setup_Code2 FLASHWORD( 0x55 )
#define FLASH_Setup_Erase FLASHWORD( 0x80 )
Index: current/include/flash_am29xxxxx_parts.inl
===================================================================
RCS file:
/cvs/ecos/ecos/packages/devs/flash/amd/am29xxxxx/current/include/flash_am29xxxxx_parts.inl,v
retrieving revision 1.24
diff -w -u -r1.24 flash_am29xxxxx_parts.inl
--- current/include/flash_am29xxxxx_parts.inl 12 Jun 2005 13:41:11 -0000
1.24
+++ current/include/flash_am29xxxxx_parts.inl 11 Aug 2006 08:40:27 -0000
@@ -741,6 +741,50 @@
bufsiz : 1
},
#endif
+#ifdef CYGHWR_DEVS_FLASH_ST_M29W320D
+ { // M29W320DT
+ device_id : FLASHWORD(0x22ca),
+ block_size : 0x10000 * CYGNUM_FLASH_INTERLEAVE,
+ block_count: 64,
+ device_size: 0x400000 * CYGNUM_FLASH_INTERLEAVE,
+ base_mask : ~(0x400000 * CYGNUM_FLASH_INTERLEAVE - 1),
+ bootblock : true,
+ bootblocks : { 0x3f0000 * CYGNUM_FLASH_INTERLEAVE,
+ 0x002000 * CYGNUM_FLASH_INTERLEAVE,
+ 0x002000 * CYGNUM_FLASH_INTERLEAVE,
+ 0x002000 * CYGNUM_FLASH_INTERLEAVE,
+ 0x002000 * CYGNUM_FLASH_INTERLEAVE,
+ 0x002000 * CYGNUM_FLASH_INTERLEAVE,
+ 0x002000 * CYGNUM_FLASH_INTERLEAVE,
+ 0x002000 * CYGNUM_FLASH_INTERLEAVE,
+ 0x002000 * CYGNUM_FLASH_INTERLEAVE,
+ _LAST_BOOTBLOCK
+ },
+ banked : false,
+ bufsiz : 1
+ },
+ { // M29W320DT
+ device_id : FLASHWORD(0x22cb),
+ block_size : 0x10000 * CYGNUM_FLASH_INTERLEAVE,
+ block_count: 64,
+ device_size: 0x400000 * CYGNUM_FLASH_INTERLEAVE,
+ base_mask : ~(0x400000 * CYGNUM_FLASH_INTERLEAVE - 1),
+ bootblock : true,
+ bootblocks : { 0x000000 * CYGNUM_FLASH_INTERLEAVE,
+ 0x002000 * CYGNUM_FLASH_INTERLEAVE,
+ 0x002000 * CYGNUM_FLASH_INTERLEAVE,
+ 0x002000 * CYGNUM_FLASH_INTERLEAVE,
+ 0x002000 * CYGNUM_FLASH_INTERLEAVE,
+ 0x002000 * CYGNUM_FLASH_INTERLEAVE,
+ 0x002000 * CYGNUM_FLASH_INTERLEAVE,
+ 0x002000 * CYGNUM_FLASH_INTERLEAVE,
+ 0x002000 * CYGNUM_FLASH_INTERLEAVE,
+ _LAST_BOOTBLOCK
+ },
+ banked : false,
+ bufsiz : 1
+ },
+#endif
#ifdef CYGHWR_DEVS_FLASH_AMD_AM29LV320D
{ // AM29LV320DT
device_id : FLASHWORD(0x22F6),
