flash/stm32*: Remove the halted check in protect_check

[openocd.git] / src / flash / nor / stm32f2x.c

diff --git a/src/flash/nor/stm32f2x.c b/src/flash/nor/stm32f2x.c
index aa749a510a1228819dfbbd47266b6090b4aa273d..1922a8c9afaadef910e5083005335083330a46ed 100644 (file)
--- a/src/flash/nor/stm32f2x.c
+++ b/src/flash/nor/stm32f2x.c
@@ -21,7 +21,7 @@
  *   You should have received a copy of the GNU General Public License     *
  *   along with this program; if not, write to the                         *
  *   Free Software Foundation, Inc.,                                       *
- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.           *
  ***************************************************************************/
 
 #ifdef HAVE_CONFIG_H
@@ -379,14 +379,8 @@ static int stm32x_write_options(struct flash_bank *bank)
 
 static int stm32x_protect_check(struct flash_bank *bank)
 {
-       struct target *target = bank->target;
        struct stm32x_flash_bank *stm32x_info = bank->driver_priv;
 
-       if (target->state != TARGET_HALTED) {
-               LOG_ERROR("Target not halted");
-               return ERROR_TARGET_NOT_HALTED;
-       }
-
        /* read write protection settings */
        int retval = stm32x_read_options(bank);
        if (retval != ERROR_OK) {
@@ -711,6 +705,7 @@ static int stm32x_write(struct flash_bank *bank, uint8_t *buffer,
 static void setup_sector(struct flash_bank *bank, int start, int num, int size)
 {
        for (int i = start; i < (start + num) ; i++) {
+               assert(i < bank->num_sectors);
                bank->sectors[i].offset = bank->size;
                bank->sectors[i].size = size;
                bank->size += bank->sectors[i].size;
@@ -830,7 +825,7 @@ static int stm32x_probe(struct flash_bank *bank)
        setup_sector(bank, 4, 1, 64 * 1024);
 
        /* dynamic memory */
-       setup_sector(bank, 4 + 1, MAX(12, num_pages) - 5, 128 * 1024);
+       setup_sector(bank, 4 + 1, MIN(12, num_pages) - 5, 128 * 1024);
 
        if (stm32x_info->has_large_mem) {