# HG changeset patch # User nickg # Date 1234450207 0 # Node ID 557484b482f80be9ffb5af691e9029fc0fb473af # Parent cc8f8b9997d18c8ab3b31887c451c44e6ca0fe62 Various minor changes to let EB55 redboot link. Also tighten up AT91 SPI driver requirements. diff --git a/packages/devs/flash/arm/eb55/current/ChangeLog b/packages/devs/flash/arm/eb55/current/ChangeLog --- a/packages/devs/flash/arm/eb55/current/ChangeLog +++ b/packages/devs/flash/arm/eb55/current/ChangeLog @@ -1,3 +1,8 @@ +2009-02-12 Nick Garnett + + * src/eb55_flash.c: Fix linkage problems in reference to SPI + device for dataflash. + 2005-08-08 Nick Garnett * src/eb55_flash.c: Removed unnecessary external reference. diff --git a/packages/devs/flash/arm/eb55/current/src/eb55_flash.c b/packages/devs/flash/arm/eb55/current/src/eb55_flash.c --- a/packages/devs/flash/arm/eb55/current/src/eb55_flash.c +++ b/packages/devs/flash/arm/eb55/current/src/eb55_flash.c @@ -74,7 +74,7 @@ __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 ); diff --git a/packages/devs/spi/arm/at91/current/ChangeLog b/packages/devs/spi/arm/at91/current/ChangeLog --- a/packages/devs/spi/arm/at91/current/ChangeLog +++ b/packages/devs/spi/arm/at91/current/ChangeLog @@ -1,3 +1,7 @@ +2009-02-12 Nick Garnett + + * cdl/spi_at91.cdl: Add a requires for CYGPKG_ERROR. + 2009-02-11 Bart Veer * src/spi_at91.c (cyg_spi_at91_bus_init): turn into a prioritized diff --git a/packages/devs/spi/arm/at91/current/cdl/spi_at91.cdl b/packages/devs/spi/arm/at91/current/cdl/spi_at91.cdl --- a/packages/devs/spi/arm/at91/current/cdl/spi_at91.cdl +++ b/packages/devs/spi/arm/at91/current/cdl/spi_at91.cdl @@ -50,7 +50,8 @@ 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 diff --git a/packages/devs/spi/arm/eb55/current/ChangeLog b/packages/devs/spi/arm/eb55/current/ChangeLog --- a/packages/devs/spi/arm/eb55/current/ChangeLog +++ b/packages/devs/spi/arm/eb55/current/ChangeLog @@ -1,3 +1,9 @@ +2009-02-12 Nick Garnett + + * 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 * cdl/spi_eb55.cdl: Updates needed for recent changes to AT91 SPI diff --git a/packages/devs/spi/arm/eb55/current/src/spi_eb55.c b/packages/devs/spi/arm/eb55/current/src/spi_eb55.c --- a/packages/devs/spi/arm/eb55/current/src/spi_eb55.c +++ b/packages/devs/spi/arm/eb55/current/src/spi_eb55.c @@ -57,7 +57,7 @@ // 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, @@ -70,7 +70,5 @@ static cyg_spi_at91_device_t spi_datafla .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