flash/nor/stm32f1x: fix error message

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

diff --git a/src/flash/nor/non_cfi.c b/src/flash/nor/non_cfi.c
index 9735bdbe930318724b74a78858a9999af3ba9036..a817966c61ff80464e3ecfb4bd38d3e7b9282b43 100644 (file)
--- a/src/flash/nor/non_cfi.c
+++ b/src/flash/nor/non_cfi.c
@@ -15,9 +15,7 @@
  *   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.           *
+ *   along with this program.  If not, see <http://www.gnu.org/licenses/>. *
  ***************************************************************************/
 
 #ifdef HAVE_CONFIG_H
@@ -33,7 +31,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 +470,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 +483,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;
@@ -540,7 +538,6 @@ void cfi_fixup_non_cfi(struct flash_bank *bank)
 
                pri_ext->SiliconRevision = 0x0;
                pri_ext->EraseSuspend = 0x0;
-               pri_ext->EraseSuspend = 0x0;
                pri_ext->BlkProt = 0x0;
                pri_ext->TmpBlkUnprotect = 0x0;
                pri_ext->BlkProtUnprot = 0x0;