--- a/packages/io/flash/current/src/flash.c
+++ b/packages/io/flash/current/src/flash.c
@@ -5,29 +5,38 @@
 //      Flash programming
 //
 //==========================================================================
-//####COPYRIGHTBEGIN####
-//                                                                          
-// -------------------------------------------                              
-// The contents of this file are subject to the Red Hat eCos Public License 
-// Version 1.1 (the "License"); you may not use this file except in         
-// compliance with the License.  You may obtain a copy of the License at    
-// http://www.redhat.com/                                                   
-//                                                                          
-// Software distributed under the License is distributed on an "AS IS"      
-// basis, WITHOUT WARRANTY OF ANY KIND, either express or implied.  See the 
-// License for the specific language governing rights and limitations under 
-// the License.                                                             
-//                                                                          
-// The Original Code is eCos - Embedded Configurable Operating System,      
-// released September 30, 1998.                                             
-//                                                                          
-// The Initial Developer of the Original Code is Red Hat.                   
-// Portions created by Red Hat are                                          
-// Copyright (C) 1998, 1999, 2000, 2001 Red Hat, Inc.                             
-// All Rights Reserved.                                                     
-// -------------------------------------------                              
-//                                                                          
-//####COPYRIGHTEND####
+//####ECOSGPLCOPYRIGHTBEGIN####
+// -------------------------------------------
+// This file is part of eCos, the Embedded Configurable Operating System.
+// Copyright (C) 1998, 1999, 2000, 2001, 2002 Red Hat, 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
+// Software Foundation; either version 2 or (at your option) any later version.
+//
+// eCos is distributed in the hope that it will be useful, but WITHOUT ANY
+// WARRANTY; without even the implied warranty of MERCHANTABILITY or
+// FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+// for more details.
+//
+// You should have received a copy of the GNU General Public License along
+// with eCos; if not, write to the Free Software Foundation, Inc.,
+// 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+//
+// As a special exception, if other files instantiate templates or use macros
+// or inline functions from this file, or you compile this file and link it
+// with other works to produce a work based on this file, this file does not
+// by itself cause the resulting work to be covered by the GNU General Public
+// License. However the source code for this file must still be made available
+// in accordance with section (3) of the GNU General Public License.
+//
+// This exception does not invalidate any other reasons why a work based on
+// this file might be covered by the GNU General Public License.
+//
+// Alternative licenses for eCos may be arranged by contacting Red Hat, Inc.
+// at http://sources.redhat.com/ecos/ecos-license
+// -------------------------------------------
+//####ECOSGPLCOPYRIGHTEND####
 //==========================================================================
 //#####DESCRIPTIONBEGIN####
 //
@@ -129,7 +138,7 @@ flash_verify_addr(void *target)
         return FLASH_ERR_NOT_INIT;
     }
     if (((CYG_ADDRESS)target >= (CYG_ADDRESS)flash_info.start) &&
-        ((CYG_ADDRESS)target < (CYG_ADDRESS)flash_info.end)) {
+        ((CYG_ADDRESS)target <= ( ((CYG_ADDRESS)flash_info.end) - 1) )) {
         return FLASH_ERR_OK;
     } else {
         return FLASH_ERR_INVALID;
@@ -196,6 +205,11 @@ flash_erase(void *addr, int len, void **
     block = (unsigned short *)((CYG_ADDRESS)addr & flash_info.block_mask);
     end_addr = (unsigned short *)((CYG_ADDRESS)addr+len);
 
+    /* Check to see if end_addr overflowed */
+    if( (end_addr < block) && (len > 0) ){
+        end_addr = (unsigned short *) ((CYG_ADDRESS) flash_info.end - 1);
+    }
+
     (*flash_info.pf)("... Erase from %p-%p: ", (void*)block, (void*)end_addr);
 
     HAL_FLASH_CACHES_OFF(d_cache, i_cache);
@@ -205,6 +219,7 @@ flash_erase(void *addr, int len, void **
         int i;
         unsigned char *dp;
         bool erased = true;
+        unsigned short *tmp_block;
 
         dp = (unsigned char *)block;
         for (i = 0;  i < flash_info.block_size;  i++) {
@@ -221,7 +236,16 @@ flash_erase(void *addr, int len, void **
             *err_addr = (void *)block;
             break;
         }
-        block += flash_info.block_size / sizeof(*block);
+
+        // Check to see if block will overflow
+        tmp_block = block + flash_info.block_size / sizeof(*block);
+        if(tmp_block < block){
+            // If block address overflows, set block value to end on this loop
+            block = end_addr;
+        }
+        else{
+            block = tmp_block;
+        }
         (*flash_info.pf)(".");
     }
     FLASH_Disable(block, end_addr);
@@ -347,18 +371,33 @@ flash_lock(void *addr, int len, void **e
     block = (unsigned short *)((CYG_ADDRESS)addr & flash_info.block_mask);
     end_addr = (unsigned short *)((CYG_ADDRESS)addr+len);
 
+    /* Check to see if end_addr overflowed */
+    if( (end_addr < block) && (len > 0) ){
+        end_addr = (unsigned short *) ((CYG_ADDRESS) flash_info.end - 1);
+    }
+
     (*flash_info.pf)("... Lock from %p-%p: ", block, end_addr);
 
     HAL_FLASH_CACHES_OFF(d_cache, i_cache);
     FLASH_Enable(block, end_addr);
     while (block < end_addr) {
+        unsigned short *tmp_block;
         stat = (*_flash_lock_block)(block);
         stat = flash_hwr_map_error(stat);
         if (stat) {
             *err_addr = (void *)block;
             break;
         }
-        block += flash_info.block_size / sizeof(*block);
+
+        // Check to see if block will overflow
+        tmp_block = block + flash_info.block_size / sizeof(*block);
+        if(tmp_block < block){
+            // If block address overflows, set block value to end on this loop
+            block = end_addr;
+        }
+        else{
+            block = tmp_block;
+        }
         (*flash_info.pf)(".");
     }
     FLASH_Disable(block, end_addr);
@@ -404,18 +443,32 @@ flash_unlock(void *addr, int len, void *
     block = (unsigned short *)((CYG_ADDRESS)addr & flash_info.block_mask);
     end_addr = (unsigned short *)((CYG_ADDRESS)addr+len);
 
+    /* Check to see if end_addr overflowed */
+    if( (end_addr < block) && (len > 0) ){
+        end_addr = (unsigned short *) ((CYG_ADDRESS) flash_info.end - 1);
+    }
+
     (*flash_info.pf)("... Unlock from %p-%p: ", block, end_addr);
 
     HAL_FLASH_CACHES_OFF(d_cache, i_cache);
     FLASH_Enable(block, end_addr);
     while (block < end_addr) {
+        unsigned short *tmp_block;
         stat = (*_flash_unlock_block)(block, flash_info.block_size, flash_info.blocks);
         stat = flash_hwr_map_error(stat);
         if (stat) {
             *err_addr = (void *)block;
             break;
         }
-        block += flash_info.block_size / sizeof(*block);
+
+        tmp_block = block + flash_info.block_size / sizeof(*block);
+        if(tmp_block < block){
+            // If block address overflows, set block value to end on this loop
+            block = end_addr;
+        }
+        else{
+            block = tmp_block;
+        }
         (*flash_info.pf)(".");
     }
     FLASH_Disable(block, end_addr);