flash/nor/at91samd: Use 32-bit register writes for ST-Link compat

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

diff --git a/src/flash/nor/tms470.c b/src/flash/nor/tms470.c
index 50783148b35118a83c973ea7f3645372cf3a2d18..e01d2df0a50122fc4b42fe26b6b884e087e29135 100644 (file)
--- a/src/flash/nor/tms470.c
+++ b/src/flash/nor/tms470.c
@@ -1,19 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+
 /***************************************************************************
  *   Copyright (C) 2007,2008 by Christopher Kilgour                        *
  *   techie |_at_| whiterocker |_dot_| com                                 *
- *                                                                         *
- *   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  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- *   This program 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 this program.  If not, see <http://www.gnu.org/licenses/>. *
  ***************************************************************************/
 
 #ifdef HAVE_CONFIG_H
@@ -259,9 +248,6 @@ static int tms470_read_part_info(struct flash_bank *bank)
        target_write_u32(target, 0xFFFFFFE4, 0x00000000);
        target_write_u32(target, 0xFFFFFFE0, 0x00000000);
 
-       bank->chip_width = 32;
-       bank->bus_width = 32;
-
        LOG_INFO("Identified %s, ver=%d, core=%s, nvmem=%s.",
                part_name,
                (int)(silicon_version),
@@ -437,7 +423,7 @@ static int tms470_try_flash_keys(struct target *target, const uint32_t *key_set)
                        target_write_u32(target, 0xFFE89C0C, key_set[i]);
                }
 
-               if (ERROR_OK == tms470_check_flash_unlocked(target)) {
+               if (tms470_check_flash_unlocked(target) == ERROR_OK) {
                        /*
                         * There seems to be a side-effect of reading the FMPKEY
                         * register in that it re-enables the protection.  So we