--- a/packages/devs/flash/arm/eb55/current/ChangeLog
+++ b/packages/devs/flash/arm/eb55/current/ChangeLog
@@ -1,3 +1,12 @@
+2005-08-08  Nick Garnett  <nickg@ecoscentric.com>
+
+	* src/eb55_flash.c: Removed unnecessary external reference.
+
+2005-08-04  Nick Garnett  <nickg@ecoscentric.com>
+
+	* cdl/flash_eb55.cdl:
+	* src/eb55_flash.c: Added configuration for dataflash driver.
+
 2004-11-12  Andrew Lunn  <andrew.lunn@ascom.ch>
 
 	* cdl/flash_eb55.cdl: Enable the hardware bug workaround in the
@@ -20,6 +29,7 @@ 2003-05-12  Nick Garnett  <nickg@balti.c
 // This file is part of eCos, the Embedded Configurable Operating System.
 // Copyright (C) 1998, 1999, 2000, 2001, 2002 Red Hat, Inc.
 // Copyright (C) 2003 Nick Garnett <nickg@calivar.com>
+// Copyright (C) 2005 eCosCentric Limited
 //
 // eCos is free software; you can redistribute it and/or modify it under
 // the terms of the GNU General Public License as published by the Free

--- a/packages/devs/flash/arm/eb55/current/cdl/flash_eb55.cdl
+++ b/packages/devs/flash/arm/eb55/current/cdl/flash_eb55.cdl
@@ -2,7 +2,7 @@
 #
 #      flash_eb55.cdl
 #
-#      FLASH memory - Hardware support on Atmel ARM Eb55 board
+#      FLASH memory - Hardware support on Atmel ARM EB55 board
 #
 # ====================================================================
 #####ECOSGPLCOPYRIGHTBEGIN####
@@ -10,6 +10,7 @@
 ## This file is part of eCos, the Embedded Configurable Operating System.
 ## Copyright (C) 1998, 1999, 2000, 2001, 2002 Red Hat, Inc.
 ## Copyright (C) 2003 Nick Garnett <nickg@calivar.com>
+## Copyright (C) 2005 eCosCentric Limited
 ##
 ## eCos is free software; you can redistribute it and/or modify it under
 ## the terms of the GNU General Public License as published by the Free
@@ -68,6 +69,9 @@ cdl_package CYGPKG_DEVS_FLASH_EB55 {
     }
 
     implements    CYGINT_DEVS_FLASH_ATMEL_AT49XXXX_REQUIRED
+
+    implements    CYGPKG_DEVS_FLASH_ATMEL_DATAFLASH_FLASH_DEV
+
 }
 
 # EOF flash_eb55.cdl

--- a/packages/devs/flash/arm/eb55/current/src/eb55_flash.c
+++ b/packages/devs/flash/arm/eb55/current/src/eb55_flash.c
@@ -10,6 +10,7 @@
 // This file is part of eCos, the Embedded Configurable Operating System.
 // Copyright (C) 1998, 1999, 2000, 2001, 2002 Red Hat, Inc.
 // Copyright (C) 2003 Nick Garnett <nickg@calivar.com>
+// Copyright (C) 2005 eCosCentric Limited
 //
 // eCos is free software; you can redistribute it and/or modify it under
 // the terms of the GNU General Public License as published by the Free
@@ -62,6 +63,26 @@
 
 #include "cyg/io/flash_at49xxxx.inl"
 
+// ------------------------------------------------------------------------
+// There is also an AT45DB321B DataFlash on the SPI bus
+
+#include <pkgconf/system.h>
+
+#if defined(CYGPKG_IO_SPI) && defined(CYGPKG_DEVS_FLASH_ATMEL_DATAFLASH)
+
+#include <cyg/io/spi.h>
+#include <cyg/io/spi_at91.h>
+#include <cyg/io/dataflash.h>
+
+__externC cyg_spi_at91_device_t spi_dataflash_dev0;
+
+CYG_DATAFLASH_FLASH_DRIVER( cyg_eb55_dataflash,
+                            cyg_spi_dataflash_dev0,
+                            0x08000000,
+                            0,
+                            16 );
+
+#endif
 
 // ------------------------------------------------------------------------
 // EOF eb55_flash.c