changeset 3039:7e84f1337aab

* cdl/flash_m25pxx.cdl: fix active_if goal expression.
author sergeig
date Wed, 01 Jun 2011 17:20:37 +0000
parents c02cbbc2a972
children 9e11b1602177
files packages/devs/flash/spi/m25pxx/current/ChangeLog packages/devs/flash/spi/m25pxx/current/cdl/flash_m25pxx.cdl
diffstat 2 files changed, 5 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/packages/devs/flash/spi/m25pxx/current/ChangeLog
+++ b/packages/devs/flash/spi/m25pxx/current/ChangeLog
@@ -1,3 +1,7 @@
+2011-05-25  Sergei Gavrikov  <sergei.gavrikov@gmail.com>
+
+	* cdl/flash_m25pxx.cdl: fix active_if goal expression.
+
 2009-02-20  Jonathan Larmour  <jifl@eCosCentric.com>
 
 	* test/m25pxx_test.c (cyg_user_start): Call cyg_flash_init() with
--- a/packages/devs/flash/spi/m25pxx/current/cdl/flash_m25pxx.cdl
+++ b/packages/devs/flash/spi/m25pxx/current/cdl/flash_m25pxx.cdl
@@ -50,7 +50,7 @@
 cdl_package CYGPKG_DEVS_FLASH_SPI_M25PXX {
     display	"M25PXX flash memory support"
     parent	CYGPKG_IO_FLASH
-    active_if	CYGPKG_IO_FLASH CYGPKG_IO_SPI
+    active_if	{ CYGPKG_IO_FLASH && CYGPKG_IO_SPI }
     implements	CYGHWR_IO_FLASH_DEVICE
     implements  CYGHWR_IO_FLASH_INDIRECT_READS 
     include_dir	cyg/io