# HG changeset patch
# User jld
# Date 1263748416 0
# Node ID 0cdf7781a5abb0399dff23a47edccc9353c1409e
# Parent  0db3b55a4a3cb54e033584813ce1cb57c1c60e63
* src/flashiodevlegacy.c: Specify flash block device lengths correctly
  when using static configuration via absolute addresses. Issue reported
  by Daniel Helgason.
* cdl/io_flash.cdl: Fix display strings for
  CYGNUM_IO_FLASH_BLOCK_ABSOLUTE_START_[12].

diff --git a/packages/io/flash/current/ChangeLog b/packages/io/flash/current/ChangeLog
--- a/packages/io/flash/current/ChangeLog
+++ b/packages/io/flash/current/ChangeLog
@@ -1,3 +1,11 @@
+2010-01-17  John Dallaway  <john@dallaway.org.uk>
+
+	* src/flashiodevlegacy.c: Specify flash block device lengths correctly
+	when using static configuration via absolute addresses. Issue reported
+	by Daniel Helgason.
+	* cdl/io_flash.cdl: Fix display strings for
+	CYGNUM_IO_FLASH_BLOCK_ABSOLUTE_START_[12].
+
 2009-03-02  Sergei Gavrikov  <sergei.gavrikov@gmail.com>
 
 	* doc/flash.sgml: Fixed typos in a FLASH API listing.
@@ -691,7 +699,7 @@ 2000-07-29  Gary Thomas  <gthomas@redhat
 // ####GPLCOPYRIGHTBEGIN####                                                
 // -------------------------------------------                              
 // This file is part of eCos, the Embedded Configurable Operating System.   
-// Copyright (C) 1998, 1999, 2000, 2001, 2002, 2005, 2006, 2008, 2009 Free Software Foundation, Inc.
+// Copyright (C) 1998, 1999, 2000, 2001, 2002, 2005, 2006, 2008, 2009, 2010 Free Software Foundation, Inc.
 //
 // This program is free software; you can redistribute it and/or modify     
 // it under the terms of the GNU General Public License as published by     
diff --git a/packages/io/flash/current/cdl/io_flash.cdl b/packages/io/flash/current/cdl/io_flash.cdl
--- a/packages/io/flash/current/cdl/io_flash.cdl
+++ b/packages/io/flash/current/cdl/io_flash.cdl
@@ -8,7 +8,7 @@
 ## ####ECOSGPLCOPYRIGHTBEGIN####                                            
 ## -------------------------------------------                              
 ## This file is part of eCos, the Embedded Configurable Operating System.   
-## Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2006 Free Software Foundation, Inc.
+## Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2006, 2009, 2010 Free Software Foundation, Inc.
 ##
 ## 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     
@@ -299,7 +299,7 @@ cdl_package CYGPKG_IO_FLASH {
                         with absolute base address and a length"
 		    
 		    cdl_option CYGNUM_IO_FLASH_BLOCK_ABSOLUTE_START_$::dev {
-			display         "Start offset from flash base"
+			display         "Start absolute address"
 			flavor          data
 			default_value   0xFFFFFFFF
 			requires        0xFFFFFFFF != CYGNUM_IO_FLASH_BLOCK_ABSOLUTE_START_$::dev
diff --git a/packages/io/flash/current/src/flashiodevlegacy.c b/packages/io/flash/current/src/flashiodevlegacy.c
--- a/packages/io/flash/current/src/flashiodevlegacy.c
+++ b/packages/io/flash/current/src/flashiodevlegacy.c
@@ -8,7 +8,7 @@
 // ####ECOSGPLCOPYRIGHTBEGIN####                                            
 // -------------------------------------------                              
 // This file is part of eCos, the Embedded Configurable Operating System.   
-// Copyright (C) 1998, 1999, 2000, 2001, 2002, 2004, 2009 Free Software Foundation, Inc.
+// Copyright (C) 1998, 1999, 2000, 2001, 2002, 2004, 2009, 2010 Free Software Foundation, Inc.
 //
 // 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     
@@ -337,7 +337,7 @@ static struct flashiodev_priv_t priv1 = 
 #ifdef CYGNUM_IO_FLASH_BLOCK_CFG_STATIC_ABSOLUTE_1 
 static struct flashiodev_priv_t priv1 = CYG_FLASHIODEV_DEV(
   CYGNUM_IO_FLASH_BLOCK_ABSOLUTE_START_1,       // start
-  CYGNUM_IO_FLASH_BLOCK_ABSOLUTE_START_1 + CYGNUM_IO_FLASH_BLOCK_ABSOLUTE_LENGTH_1,
+  CYGNUM_IO_FLASH_BLOCK_ABSOLUTE_LENGTH_1,      // end
   0,       // use_fis
   1,       // use_static
   0,       // use_offset
@@ -385,7 +385,7 @@ static struct flashiodev_priv_t priv2 = 
 #ifdef CYGNUM_IO_FLASH_BLOCK_CFG_STATIC_ABSOLUTE_2 
 static struct flashiodev_priv_t priv2 = CYG_FLASHIODEV_DEV(
   CYGNUM_IO_FLASH_BLOCK_ABSOLUTE_START_2,       // start
-  CYGNUM_IO_FLASH_BLOCK_ABSOLUTE_START_2 + CYGNUM_IO_FLASH_BLOCK_ABSOLUTE_LENGTH_2,
+  CYGNUM_IO_FLASH_BLOCK_ABSOLUTE_LENGTH_2,      // end
   0,       // use_fis
   1,       // use_static
   0,       // use_offset