openocd: src/flash: replace the GPL-2.0-or-later license tag

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

diff --git a/src/flash/nor/w600.c b/src/flash/nor/w600.c
index 4790821777fcc5e688ff6c90fa424cbf5ce737c8..52105bd6d9db2b08e3645d627bc1698bb7a5f24f 100644 (file)
--- a/src/flash/nor/w600.c
+++ b/src/flash/nor/w600.c
@@ -1,19 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
+
 /***************************************************************************
  *   Copyright (C) 2018 by Simon Qian                                      *
  *   SimonQian@SimonQian.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
@@ -240,13 +229,13 @@ static int w600_write(struct flash_bank *bank, const uint8_t *buffer,
        }
 
        if ((offset % W600_FLASH_PAGESIZE) != 0) {
-               LOG_WARNING("offset 0x%" PRIx32 " breaks required %" PRIu32 "-byte alignment",
+               LOG_WARNING("offset 0x%" PRIx32 " breaks required %d-byte alignment",
                        offset, W600_FLASH_PAGESIZE);
                return ERROR_FLASH_DST_BREAKS_ALIGNMENT;
        }
 
        if ((count % W600_FLASH_PAGESIZE) != 0) {
-               LOG_WARNING("count 0x%" PRIx32 " breaks required %" PRIu32 "-byte alignment",
+               LOG_WARNING("count 0x%" PRIx32 " breaks required %d-byte alignment",
                        offset, W600_FLASH_PAGESIZE);
                return ERROR_FLASH_DST_BREAKS_ALIGNMENT;
        }
@@ -323,7 +312,7 @@ static int w600_probe(struct flash_bank *bank)
                flash_size = 1 << flash_size;
        }
 
-       LOG_INFO("flash size = %dkbytes", flash_size / 1024);
+       LOG_INFO("flash size = %" PRIu32 "kbytes", flash_size / 1024);
 
        /* calculate numbers of pages */
        size_t num_pages = flash_size / W600_FLASH_SECSIZE;
@@ -331,10 +320,8 @@ static int w600_probe(struct flash_bank *bank)
        /* check that calculation result makes sense */
        assert(num_pages > 0);
 
-       if (bank->sectors) {
-               free(bank->sectors);
-               bank->sectors = NULL;
-       }
+       free(bank->sectors);
+       bank->sectors = NULL;
 
        bank->base = W600_FLASH_BASE;
        bank->size = num_pages * W600_FLASH_SECSIZE;
@@ -364,7 +351,7 @@ static int w600_auto_probe(struct flash_bank *bank)
        return w600_probe(bank);
 }
 
-static int get_w600_info(struct flash_bank *bank, char *buf, int buf_size)
+static int get_w600_info(struct flash_bank *bank, struct command_invocation *cmd)
 {
        uint32_t flash_id;
 
@@ -373,7 +360,7 @@ static int get_w600_info(struct flash_bank *bank, char *buf, int buf_size)
        if (retval != ERROR_OK)
                return retval;
 
-       snprintf(buf, buf_size, "w600 : 0x%08" PRIx32 "", flash_id);
+       command_print_sameline(cmd, "w600 : 0x%08" PRIx32 "", flash_id);
        return ERROR_OK;
 }