This is the mail archive of the
ecos-patches@sourceware.org
mailing list for the eCos project.
EB55/AT91 SPI/DATAFLASH fixes
- From: Nick Garnett <nickg at ecoscentric dot com>
- To: ecos-patches at ecos dot sourceware dot org
- Date: 12 Feb 2009 14:54:08 +0000
- Subject: EB55/AT91 SPI/DATAFLASH fixes
Some minor fixes to let EB55 redboot configure and link properly.
Index: devs/flash/arm/eb55/current/ChangeLog
===================================================================
RCS file: /cvs/ecos/ecos/packages/devs/flash/arm/eb55/current/ChangeLog,v
retrieving revision 1.5
diff -u -5 -r1.5 ChangeLog
--- devs/flash/arm/eb55/current/ChangeLog 29 Jan 2009 17:48:21 -0000 1.5
+++ devs/flash/arm/eb55/current/ChangeLog 12 Feb 2009 14:47:07 -0000
@@ -1,5 +1,10 @@
+2009-02-12 Nick Garnett <nickg@ecoscentric.com>
+
+ * src/eb55_flash.c: Fix linkage problems in reference to SPI
+ device for dataflash.
+
2005-08-08 Nick Garnett <nickg@ecoscentric.com>
* src/eb55_flash.c: Removed unnecessary external reference.
2005-08-04 Nick Garnett <nickg@ecoscentric.com>
Index: devs/flash/arm/eb55/current/src/eb55_flash.c
===================================================================
RCS file: /cvs/ecos/ecos/packages/devs/flash/arm/eb55/current/src/eb55_flash.c,v
retrieving revision 1.4
diff -u -5 -r1.4 eb55_flash.c
--- devs/flash/arm/eb55/current/src/eb55_flash.c 29 Jan 2009 17:48:21 -0000 1.4
+++ devs/flash/arm/eb55/current/src/eb55_flash.c 12 Feb 2009 14:47:07 -0000
@@ -72,11 +72,11 @@
#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,
+ &spi_dataflash_dev0,
0x08000000,
0,
16 );
#endif
Index: devs/spi/arm/at91/current/ChangeLog
===================================================================
RCS file: /cvs/ecos/ecos/packages/devs/spi/arm/at91/current/ChangeLog,v
retrieving revision 1.9
diff -u -5 -r1.9 ChangeLog
--- devs/spi/arm/at91/current/ChangeLog 11 Feb 2009 15:49:38 -0000 1.9
+++ devs/spi/arm/at91/current/ChangeLog 12 Feb 2009 14:47:07 -0000
@@ -1,5 +1,9 @@
+2009-02-12 Nick Garnett <nickg@ecoscentric.com>
+
+ * cdl/spi_at91.cdl: Add a requires for CYGPKG_ERROR.
+
2009-02-11 Bart Veer <bartv@ecoscentric.com>
* src/spi_at91.c (cyg_spi_at91_bus_init): turn into a prioritized
constructor, make it a static and rename.
Index: devs/spi/arm/at91/current/cdl/spi_at91.cdl
===================================================================
RCS file: /cvs/ecos/ecos/packages/devs/spi/arm/at91/current/cdl/spi_at91.cdl,v
retrieving revision 1.4
diff -u -5 -r1.4 spi_at91.cdl
--- devs/spi/arm/at91/current/cdl/spi_at91.cdl 11 Feb 2009 15:49:38 -0000 1.4
+++ devs/spi/arm/at91/current/cdl/spi_at91.cdl 12 Feb 2009 14:47:07 -0000
@@ -48,11 +48,12 @@
cdl_package CYGPKG_DEVS_SPI_ARM_AT91 {
parent CYGPKG_IO_SPI
active_if CYGPKG_IO_SPI
display "Atmel AT91 SPI driver"
- requires CYGPKG_HAL_ARM_AT91
+ requires CYGPKG_HAL_ARM_AT91
+ requires CYGPKG_ERROR
hardware
include_dir cyg/io
compile spi_at91.c
cdl_option CYGHWR_DEVS_SPI_ARM_AT91_BUS0 {
Index: devs/spi/arm/eb55/current/ChangeLog
===================================================================
RCS file: /cvs/ecos/ecos/packages/devs/spi/arm/eb55/current/ChangeLog,v
retrieving revision 1.3
diff -u -5 -r1.3 ChangeLog
--- devs/spi/arm/eb55/current/ChangeLog 29 Jan 2009 17:48:45 -0000 1.3
+++ devs/spi/arm/eb55/current/ChangeLog 12 Feb 2009 14:47:07 -0000
@@ -1,5 +1,11 @@
+2009-02-12 Nick Garnett <nickg@ecoscentric.com>
+
+ * src/spi_eb55.c: Export static structure for dataflash SPI device
+ rather than pointer. The latter cannot be used in the initializer
+ for a dataflash flash driver.
+
2006-06-01 Andrew Lunn <andrew.lunn@ascom.ch>
* cdl/spi_eb55.cdl: Updates needed for recent changes to AT91 SPI
driver.
Index: devs/spi/arm/eb55/current/src/spi_eb55.c
===================================================================
RCS file: /cvs/ecos/ecos/packages/devs/spi/arm/eb55/current/src/spi_eb55.c,v
retrieving revision 1.2
diff -u -5 -r1.2 spi_eb55.c
--- devs/spi/arm/eb55/current/src/spi_eb55.c 29 Jan 2009 17:48:45 -0000 1.2
+++ devs/spi/arm/eb55/current/src/spi_eb55.c 12 Feb 2009 14:47:07 -0000
@@ -55,11 +55,11 @@
// -------------------------------------------------------------------------
// AT91EB55 SPI exported devices
// AT45DB321B DataFlash
-static cyg_spi_at91_device_t spi_dataflash_dev0 CYG_SPI_DEVICE_ON_BUS(0) =
+cyg_spi_at91_device_t spi_dataflash_dev0 CYG_SPI_DEVICE_ON_BUS(0) =
{
.spi_device.spi_bus = &cyg_spi_at91_bus.spi_bus,
.dev_num = 0, // Device number
.cl_pol = 1, // Clock polarity (0 or 1)
@@ -68,9 +68,7 @@
.cs_up_udly = 1, // Delay in usec between CS up and transfer start
.cs_dw_udly = 1, // Delay in usec between transfer end and CS down
.tr_bt_udly = 1 // Delay in usec between two transfers
};
-cyg_spi_device *cyg_spi_dataflash_dev0 = &spi_dataflash_dev0.spi_device;
-
// -------------------------------------------------------------------------
// EOF spi_eb55.c
Index: hal/arm/at91/eb55/current/ChangeLog
===================================================================
RCS file: /cvs/ecos/ecos/packages/hal/arm/at91/eb55/current/ChangeLog,v
retrieving revision 1.11
diff -u -5 -r1.11 ChangeLog
--- hal/arm/at91/eb55/current/ChangeLog 2 Feb 2009 19:16:12 -0000 1.11
+++ hal/arm/at91/eb55/current/ChangeLog 12 Feb 2009 14:47:08 -0000
@@ -1,5 +1,10 @@
+2009-02-12 Nick Garnett <nickg@ecoscentric.com>
+
+ * misc/redboot_RAM.ecm: * misc/redboot_ROM.ecm: Add CYGPKG_ERROR
+ to resolve configure-time errors.
+
2009-01-31 Bart Veer <bartv@ecoscentric.com>
* cdl/hal_arm_at91_eb55.cdl: update compiler flags for gcc 4.x
2009-01-24 Bart Veer <bartv@ecoscentric.com>
Index: hal/arm/at91/eb55/current/misc/redboot_RAM.ecm
===================================================================
RCS file: /cvs/ecos/ecos/packages/hal/arm/at91/eb55/current/misc/redboot_RAM.ecm,v
retrieving revision 1.1
diff -u -5 -r1.1 redboot_RAM.ecm
--- hal/arm/at91/eb55/current/misc/redboot_RAM.ecm 13 May 2003 18:27:59 -0000 1.1
+++ hal/arm/at91/eb55/current/misc/redboot_RAM.ecm 12 Feb 2009 14:47:08 -0000
@@ -7,10 +7,11 @@
cdl_savefile_command cdl_option { value_source user_value wizard_value inferred_value };
cdl_savefile_command cdl_interface { value_source user_value wizard_value inferred_value };
cdl_configuration eCos {
package CYGPKG_IO_FLASH current ;
+ package CYGPKG_ERROR current ;
};
cdl_option CYGNUM_HAL_COMMON_INTERRUPTS_STACK_SIZE {
user_value 6144
};
Index: hal/arm/at91/eb55/current/misc/redboot_ROM.ecm
===================================================================
RCS file: /cvs/ecos/ecos/packages/hal/arm/at91/eb55/current/misc/redboot_ROM.ecm,v
retrieving revision 1.1
diff -u -5 -r1.1 redboot_ROM.ecm
--- hal/arm/at91/eb55/current/misc/redboot_ROM.ecm 13 May 2003 18:27:59 -0000 1.1
+++ hal/arm/at91/eb55/current/misc/redboot_ROM.ecm 12 Feb 2009 14:47:08 -0000
@@ -7,10 +7,11 @@
cdl_savefile_command cdl_option { value_source user_value wizard_value inferred_value };
cdl_savefile_command cdl_interface { value_source user_value wizard_value inferred_value };
cdl_configuration eCos {
package CYGPKG_IO_FLASH current ;
+ package CYGPKG_ERROR current ;
};
cdl_option CYGNUM_HAL_COMMON_INTERRUPTS_STACK_SIZE {
user_value 6144
};
--
Nick Garnett eCos Kernel Architect
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
Besuchen Sie uns vom 3.-5.03.09 auf der Embedded World 2009, Stand 11-300
Visit us at Embedded World 2009, NÃrnberg, Germany, 3-5 Mar, Stand 11-300