flash/nor/core: adjust flash_iterate_address_range_inner() for 64-bit

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

diff --git a/src/flash/nor/kinetis_ke.c b/src/flash/nor/kinetis_ke.c
index 4ccbe76ce44a1e03a5beb5b7516008cc9d612d80..9441a9d648b7b4687af89663dc8e0afa5d2593ed 100644 (file)
--- a/src/flash/nor/kinetis_ke.c
+++ b/src/flash/nor/kinetis_ke.c
@@ -28,6 +28,9 @@
  *   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
@@ -475,14 +478,13 @@ int kinetis_ke_stop_watchdog(struct target *target)
                        watchdog_algorithm->address, 0, 100000, &armv7m_info);
        if (retval != ERROR_OK) {
                LOG_ERROR("Error executing Kinetis KE watchdog algorithm");
-               retval = ERROR_FAIL;
        } else {
                LOG_INFO("Watchdog stopped");
        }
 
        target_free_working_area(target, watchdog_algorithm);
 
-       return ERROR_OK;
+       return retval;
 }
 
 COMMAND_HANDLER(kinetis_ke_disable_wdog_handler)
@@ -1173,7 +1175,7 @@ static int kinetis_ke_auto_probe(struct flash_bank *bank)
 static int kinetis_ke_info(struct flash_bank *bank, char *buf, int buf_size)
 {
        (void) snprintf(buf, buf_size,
-                       "%s driver for flash bank %s at 0x%8.8" PRIx32 "",
+                       "%s driver for flash bank %s at " TARGET_ADDR_FMT,
                        bank->driver->name,     bank->name, bank->base);
 
        return ERROR_OK;
@@ -1241,7 +1243,7 @@ static int kinetis_ke_blank_check(struct flash_bank *bank)
        return ERROR_OK;
 }
 
-static const struct command_registration kinetis_ke_securtiy_command_handlers[] = {
+static const struct command_registration kinetis_ke_security_command_handlers[] = {
        {
                .name = "check_security",
                .mode = COMMAND_EXEC,
@@ -1272,7 +1274,7 @@ static const struct command_registration kinetis_ke_exec_command_handlers[] = {
                .mode = COMMAND_ANY,
                .help = "",
                .usage = "",
-               .chain = kinetis_ke_securtiy_command_handlers,
+               .chain = kinetis_ke_security_command_handlers,
        },
        {
                .name = "disable_wdog",
@@ -1308,4 +1310,5 @@ struct flash_driver kinetis_ke_flash = {
        .erase_check = kinetis_ke_blank_check,
        .protect_check = kinetis_ke_protect_check,
        .info = kinetis_ke_info,
+       .free_driver_priv = default_flash_free_driver_priv,
 };