flash/stm32l4x: support STM32WBA5xx devices

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

diff --git a/src/flash/nor/non_cfi.c b/src/flash/nor/non_cfi.c
index 9735bdbe930318724b74a78858a9999af3ba9036..f096ba69c3b347169505b11ff348243e0cd950be 100644 (file)
--- a/src/flash/nor/non_cfi.c
+++ b/src/flash/nor/non_cfi.c
@@ -1,23 +1,10 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+
 /***************************************************************************
  *   Copyright (C) 2007 by Dominic Rath                                    *
  *   Dominic.Rath@gmx.de                                                   *
  *   Copyright (C) 2009 Michael Schwingen                                  *
  *   michael@schwingen.org                                                 *
- *                                                                         *
- *   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, write to the                         *
- *   Free Software Foundation, Inc.,                                       *
- *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.           *
  ***************************************************************************/
 
 #ifdef HAVE_CONFIG_H
@@ -33,7 +20,7 @@
 #define ERASE_REGION(num, size) (((size/256) << 16) | (num-1))
 
 /* non-CFI compatible flashes */
-static struct non_cfi non_cfi_flashes[] = {
+static const struct non_cfi non_cfi_flashes[] = {
        {
                .mfr = CFI_MFR_SST,
                .id = 0xd4,
@@ -472,7 +459,7 @@ void cfi_fixup_non_cfi(struct flash_bank *bank)
 {
        unsigned int mask;
        struct cfi_flash_bank *cfi_info = bank->driver_priv;
-       struct non_cfi *non_cfi = non_cfi_flashes;
+       const struct non_cfi *non_cfi = non_cfi_flashes;
 
        if (cfi_info->x16_as_x8)
                mask = 0xFF;
@@ -485,11 +472,11 @@ void cfi_fixup_non_cfi(struct flash_bank *bank)
                        break;
        }
 
-       /* only fixup jedec flashs found in table */
+       /* only fixup jedec flashes found in table */
        if (!non_cfi->mfr)
                return;
 
-       cfi_info->not_cfi = 1;
+       cfi_info->not_cfi = true;
 
        /* fill in defaults for non-critical data */
        cfi_info->vcc_min = 0x0;
@@ -538,18 +525,17 @@ void cfi_fixup_non_cfi(struct flash_bank *bank)
                pri_ext->major_version = '1';
                pri_ext->minor_version = '0';
 
-               pri_ext->SiliconRevision = 0x0;
-               pri_ext->EraseSuspend = 0x0;
-               pri_ext->EraseSuspend = 0x0;
-               pri_ext->BlkProt = 0x0;
-               pri_ext->TmpBlkUnprotect = 0x0;
-               pri_ext->BlkProtUnprot = 0x0;
-               pri_ext->SimultaneousOps = 0x0;
-               pri_ext->BurstMode = 0x0;
-               pri_ext->PageMode = 0x0;
-               pri_ext->VppMin = 0x0;
-               pri_ext->VppMax = 0x0;
-               pri_ext->TopBottom = 0x0;
+               pri_ext->silicon_revision = 0x0;
+               pri_ext->erase_suspend = 0x0;
+               pri_ext->blk_prot = 0x0;
+               pri_ext->tmp_blk_unprotected = 0x0;
+               pri_ext->blk_prot_unprot = 0x0;
+               pri_ext->simultaneous_ops = 0x0;
+               pri_ext->burst_mode = 0x0;
+               pri_ext->page_mode = 0x0;
+               pri_ext->vpp_min = 0x0;
+               pri_ext->vpp_max = 0x0;
+               pri_ext->top_bottom = 0x0;
 
                pri_ext->_unlock1 = 0x5555;
                pri_ext->_unlock2 = 0x2AAA;