Mercurial > ecos

changeset 1820:fdf22faea84c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* src/ixp425_redboot.c: Put #ifdef CYGPKG_IO_FLASH around flash functions so a RedBoot without flash support can be built.
author asl
date Tue, 09 Nov 2004 18:29:08 +0000
parents 082e09d84412
children 02bcdae3fa9c
files packages/hal/arm/xscale/ixp425/current/ChangeLog packages/hal/arm/xscale/ixp425/current/src/ixp425_redboot.c
diffstat 2 files changed, 11 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/packages/hal/arm/xscale/ixp425/current/ChangeLog
+++ b/packages/hal/arm/xscale/ixp425/current/ChangeLog
@@ -1,3 +1,8 @@
+2004-11-05  David Vrabel  <dvrabel@arcom.com>
+
+	* src/ixp425_redboot.c: Put #ifdef CYGPKG_IO_FLASH around flash
+	functions so a RedBoot without flash support can be built.
+
 2004-09-27  Mark Salter  <msalter@redhat.com>
 
 	* src/ixp425_pci.c (pci_config): Fix offset handling.
--- a/packages/hal/arm/xscale/ixp425/current/src/ixp425_redboot.c
+++ b/packages/hal/arm/xscale/ixp425/current/src/ixp425_redboot.c
@@ -51,7 +51,9 @@
 //========================================================================*/
 
 #include <redboot.h>
+#ifdef CYGPKG_IO_FLASH
 #include <cyg/io/flash.h>
+#endif
 
 #ifdef CYGOPT_REDBOOT_FIS
 extern void *fis_addr;
@@ -61,6 +63,8 @@ extern void *fis_addr;
 extern void *cfg_base;
 #endif
 
+#ifdef CYGPKG_IO_FLASH
+
 //
 // Little endian mode requires some trickery due to the way the IXP4xx
 // AHB and expansion busses work.
@@ -139,6 +143,8 @@ hal_flash_program(void *addr, void *data
     return retval;
 }
 
+#endif // CYGPKG_IO_FLASH
+
 
 /*------------------------------------------------------------------------*/
 // EOF ixp425_redboot.c