This is the mail archive of the ecos-patches@sourceware.org mailing list for the eCos project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

EB55 flash omissions


Apparently some bits were missed in the flashv2 merge with the EB55 dataflash support. I'm pulling in the eCosCentric version.

Jifl
--
eCosCentric Limited      http://www.eCosCentric.com/     The eCos experts
Barnwell House, Barnwell Drive, Cambridge, UK.       Tel: +44 1223 245571
Registered in England and Wales: Reg No 4422071.
------["The best things in life aren't things."]------      Opinions==mine
Index: ChangeLog
===================================================================
RCS file: /cvs/ecos/ecos/packages/devs/flash/arm/eb55/current/ChangeLog,v
retrieving revision 1.3
diff -u -5 -p -r1.3 ChangeLog
--- ChangeLog	12 Nov 2004 09:17:01 -0000	1.3
+++ ChangeLog	15 Jan 2009 04:02:28 -0000
@@ -1,5 +1,14 @@
+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
 	generic flash driver
 
@@ -18,10 +27,11 @@
 //####ECOSGPLCOPYRIGHTBEGIN####
 // -------------------------------------------
 // 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
 // Software Foundation; either version 2 or (at your option) any later version.
 //
Index: cdl/flash_eb55.cdl
===================================================================
RCS file: /cvs/ecos/ecos/packages/devs/flash/arm/eb55/current/cdl/flash_eb55.cdl,v
retrieving revision 1.3
diff -u -5 -p -r1.3 flash_eb55.cdl
--- cdl/flash_eb55.cdl	12 Nov 2004 09:17:01 -0000	1.3
+++ cdl/flash_eb55.cdl	15 Jan 2009 04:02:28 -0000
@@ -1,17 +1,18 @@
 # ====================================================================
 #
 #      flash_eb55.cdl
 #
-#      FLASH memory - Hardware support on Atmel ARM Eb55 board
+#      FLASH memory - Hardware support on Atmel ARM EB55 board
 #
 # ====================================================================
 #####ECOSGPLCOPYRIGHTBEGIN####
 ## -------------------------------------------
 ## 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
 ## Software Foundation; either version 2 or (at your option) any later version.
 ##
@@ -66,8 +67,11 @@ cdl_package CYGPKG_DEVS_FLASH_EB55 {
     cdl_interface CYGINT_DEVS_FLASH_ATMEL_AT49XXXX_REQUIRED {
         display   "Generic Atmel AM49XXXX driver required"
     }
 
     implements    CYGINT_DEVS_FLASH_ATMEL_AT49XXXX_REQUIRED
+
+    implements    CYGPKG_DEVS_FLASH_ATMEL_DATAFLASH_FLASH_DEV
+
 }
 
 # EOF flash_eb55.cdl
Index: src/eb55_flash.c
===================================================================
RCS file: /cvs/ecos/ecos/packages/devs/flash/arm/eb55/current/src/eb55_flash.c,v
retrieving revision 1.2
diff -u -5 -p -r1.2 eb55_flash.c
--- src/eb55_flash.c	15 Jul 2003 01:53:38 -0000	1.2
+++ src/eb55_flash.c	15 Jan 2009 04:02:28 -0000
@@ -8,10 +8,11 @@
 //####ECOSGPLCOPYRIGHTBEGIN####
 // -------------------------------------------
 // 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
 // Software Foundation; either version 2 or (at your option) any later version.
 //
@@ -60,8 +61,28 @@
 #define CYGNUM_FLASH_SERIES	(1)
 #define CYGNUM_FLASH_BASE 	(0x01000000u)
 
 #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

Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]