--- a/packages/devs/flash/arm/eb40a/current/ChangeLog
+++ b/packages/devs/flash/arm/eb40a/current/ChangeLog
@@ -1,3 +1,8 @@
+2004-11-12  Andrew Lunn  <andrew.lunn@ascom.ch>
+
+	* cdl/flash_eb40a.cdl: Enable the hardware bug workaround in the
+	flash driver.
+
 2003-07-15  Jonathan Larmour  <jifl@eCosCentric.com>
 
 	* src/eb40a_flash.c: Generic Atmel driver now supports boot blocks.

--- a/packages/devs/flash/arm/eb40a/current/cdl/flash_eb40a.cdl
+++ b/packages/devs/flash/arm/eb40a/current/cdl/flash_eb40a.cdl
@@ -56,7 +56,8 @@ cdl_package CYGPKG_DEVS_FLASH_EB40A {
     parent        CYGPKG_IO_FLASH
     active_if     CYGPKG_IO_FLASH
     requires      CYGPKG_HAL_ARM_AT91
-
+    requires      CYGHWR_DEVS_FLASH_ATMEL_AT49XXXX_ERASE_BUG_WORKAROUND
+        
     compile       eb40a_flash.c
 
     # Arguably this should do in the generic package

--- a/packages/devs/flash/arm/eb42/current/ChangeLog
+++ b/packages/devs/flash/arm/eb42/current/ChangeLog
@@ -1,3 +1,8 @@
+2004-11-12  Andrew Lunn  <andrew.lunn@ascom.ch>
+
+	* cdl/flash_eb42.cdl: Enable the bug workaround for the flash
+	device.
+
 2003-07-15  Jonathan Larmour  <jifl@eCosCentric.com>
 
 	* src/eb42_flash.c: Generic Atmel driver now supports boot blocks.

--- a/packages/devs/flash/arm/eb42/current/cdl/flash_eb42.cdl
+++ b/packages/devs/flash/arm/eb42/current/cdl/flash_eb42.cdl
@@ -57,7 +57,8 @@ cdl_package CYGPKG_DEVS_FLASH_EB42 {
     parent        CYGPKG_IO_FLASH
     active_if     CYGPKG_IO_FLASH
     requires      CYGPKG_HAL_ARM_AT91
-
+    requires      CYGHWR_DEVS_FLASH_ATMEL_AT49XXXX_ERASE_BUG_WORKAROUND
+    
     compile       eb42_flash.c
 
     # Arguably this should do in the generic package

--- a/packages/devs/flash/arm/eb55/current/ChangeLog
+++ b/packages/devs/flash/arm/eb55/current/ChangeLog
@@ -1,3 +1,8 @@
+2004-11-12  Andrew Lunn  <andrew.lunn@ascom.ch>
+
+	* cdl/flash_eb55.cdl: Enable the hardware bug workaround in the
+	generic flash driver
+
 2003-07-15  Jonathan Larmour  <jifl@eCosCentric.com>
 
 	* src/eb55_flash.c: Generic Atmel driver now supports boot blocks.

--- a/packages/devs/flash/arm/eb55/current/cdl/flash_eb55.cdl
+++ b/packages/devs/flash/arm/eb55/current/cdl/flash_eb55.cdl
@@ -57,6 +57,7 @@ cdl_package CYGPKG_DEVS_FLASH_EB55 {
     parent        CYGPKG_IO_FLASH
     active_if     CYGPKG_IO_FLASH
     requires      CYGPKG_HAL_ARM_AT91
+    requires      CYGHWR_DEVS_FLASH_ATMEL_AT49XXXX_ERASE_BUG_WORKAROUND
 
     compile       eb55_flash.c
 

--- a/packages/devs/flash/arm/jtst/current/cdl/flash_jtst.cdl
+++ b/packages/devs/flash/arm/jtst/current/cdl/flash_jtst.cdl
@@ -57,7 +57,8 @@ cdl_package CYGPKG_DEVS_FLASH_JTST {
     parent        CYGPKG_IO_FLASH
     active_if     CYGPKG_IO_FLASH
     requires      CYGPKG_HAL_ARM_AT91
-
+    requires      CYGHWR_DEVS_FLASH_ATMEL_AT49XXXX_ERASE_BUG_WORKAROUND
+        
     compile       jtst_flash.c
 
     # Arguably this should do in the generic package

--- a/packages/devs/flash/atmel/at49xxxx/current/ChangeLog
+++ b/packages/devs/flash/atmel/at49xxxx/current/ChangeLog
@@ -1,3 +1,8 @@
+2004-11-12  Andrew Lunn  <andrew.lunn@ascom.ch>
+
+	* include/flash_at49xxxx_parts.inl: Give a compiler error if the
+	bug workaround for the AT49BV16[01]4A is not enabled.
+
 2004-05-11  Thomas Koeller  <thomas.koeller@baslerweb.com>
 
 	* cdl/flash_atmel_at49xxxx.cdl:

--- a/packages/devs/flash/atmel/at49xxxx/current/include/flash_at49xxxx_parts.inl
+++ b/packages/devs/flash/atmel/at49xxxx/current/include/flash_at49xxxx_parts.inl
@@ -189,6 +189,15 @@
     },
 #endif
 
+#if defined(CYGHWR_DEVS_FLASH_ATMEL_AT49BV1604A) || \
+    defined(CYGHWR_DEVS_FLASH_ATMEL_AT49BV1614A) || \
+    defined(CYGHWR_DEVS_FLASH_ATMEL_AT49LV1614A)
+#ifndef CYGHWR_DEVS_FLASH_ATMEL_AT49XXXX_ERASE_BUG_WORKAROUND
+#warning This flash device contains a hardware bug and you have not
+#warning enabled the workaround for it. See the CDL file.
+#endif
+#endif
+
 #endif // ifndef CYGONCE_DEVS_FLASH_ATMEL_AT49XXXX_PARTS_INL
 
 // EOF flash_at49xxxx_parts.inl