From 25a374a187d760eddb87cbe639cb885b159b74b4 Mon Sep 17 00:00:00 2001
From: Antonio Borneo <borneo.antonio@gmail.com>
Date: Tue, 30 Aug 2022 17:15:32 +0200
Subject: [PATCH] openocd: fix syntax of SPDX tags

Put the SPDX tag alone in a comment in the first line of the file.
Replace the obsolete GPL-2.0+ tag

The SPDX tag on files *.c is incorrect, as it should use the C99
single line comment using '//'. But current checkpatch doesn't
allow C99 comments, so keep using standard C comments, by now.

Change-Id: Ia91b0f7da42c439b6340bbe81983b86b68f6d65c
Signed-off-by: Antonio Borneo <borneo.antonio@gmail.com>
Reviewed-on: https://review.openocd.org/c/openocd/+/7156
Tested-by: jenkins
---
 .travis.yml                                 | 2 +-
 contrib/loaders/checksum/riscv_crc.c        | 7 +++----
 contrib/loaders/flash/sh_qspi/sh_qspi.S     | 2 +-
 contrib/loaders/flash/sh_qspi/sh_qspi.ld    | 2 +-
 contrib/loaders/flash/xmc1xxx/erase.S       | 4 ++--
 contrib/loaders/flash/xmc1xxx/erase_check.S | 4 ++--
 contrib/loaders/flash/xmc1xxx/write.S       | 4 ++--
 contrib/loaders/flash/xmc1xxx/xmc1xxx.S     | 4 ++--
 8 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index da6b94c3f..28d5502c5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: GPL-2.0+
+# SPDX-License-Identifier: GPL-2.0-or-later
 # Copyright Marek Vasut <marex@denx.de>
 
 # OpenOCD on Travis CI - https://travis-ci.org/
diff --git a/contrib/loaders/checksum/riscv_crc.c b/contrib/loaders/checksum/riscv_crc.c
index e437b6616..70476ad1f 100644
--- a/contrib/loaders/checksum/riscv_crc.c
+++ b/contrib/loaders/checksum/riscv_crc.c
@@ -1,7 +1,6 @@
-/*
- * SPDX-License-Identifier: GPL-2.0-or-later
- * Copyright (C) 2009-2021 Free Software Foundation, Inc.
- */
+/* SPDX-License-Identifier: GPL-2.0-or-later */
+
+/* Copyright (C) 2009-2021 Free Software Foundation, Inc. */
 
 /* Copied from https://github.com/gcc-mirror/gcc/blob/master/libiberty/crc32.c
  * and then tweaked a little. */
diff --git a/contrib/loaders/flash/sh_qspi/sh_qspi.S b/contrib/loaders/flash/sh_qspi/sh_qspi.S
index 78eb1e818..b46514a48 100644
--- a/contrib/loaders/flash/sh_qspi/sh_qspi.S
+++ b/contrib/loaders/flash/sh_qspi/sh_qspi.S
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: GPL-2.0+ */
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 /*
  * SH QSPI (Quad SPI) driver
  * Copyright (C) 2019 Marek Vasut <marek.vasut@gmail.com>
diff --git a/contrib/loaders/flash/sh_qspi/sh_qspi.ld b/contrib/loaders/flash/sh_qspi/sh_qspi.ld
index 2683c520b..71cc3e380 100644
--- a/contrib/loaders/flash/sh_qspi/sh_qspi.ld
+++ b/contrib/loaders/flash/sh_qspi/sh_qspi.ld
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: GPL-2.0+ */
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 OUTPUT_FORMAT("elf32-littlearm", "elf32-littlearm", "elf32-littlearm")
 OUTPUT_ARCH(arm)
 ENTRY(_start)
diff --git a/contrib/loaders/flash/xmc1xxx/erase.S b/contrib/loaders/flash/xmc1xxx/erase.S
index e5a4808fc..9d3d9925c 100644
--- a/contrib/loaders/flash/xmc1xxx/erase.S
+++ b/contrib/loaders/flash/xmc1xxx/erase.S
@@ -1,11 +1,11 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
+
 /*
  * Infineon XMC1000 flash sectors erase
  *
  * Copyright (c) 2016 Andreas Färber
  *
  * Based on XMC1100 AA-Step Reference Manual
- *
- * License: GPL-2.0+
  */
 
 #include "xmc1xxx.S"
diff --git a/contrib/loaders/flash/xmc1xxx/erase_check.S b/contrib/loaders/flash/xmc1xxx/erase_check.S
index 6c993443a..311c2044d 100644
--- a/contrib/loaders/flash/xmc1xxx/erase_check.S
+++ b/contrib/loaders/flash/xmc1xxx/erase_check.S
@@ -1,11 +1,11 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
+
 /*
  * Infineon XMC1000 flash sector erase check
  *
  * Copyright (c) 2016 Andreas Färber
  *
  * Based on XMC1100 AA-Step Reference Manual
- *
- * License: GPL-2.0+
  */
 
 #include "xmc1xxx.S"
diff --git a/contrib/loaders/flash/xmc1xxx/write.S b/contrib/loaders/flash/xmc1xxx/write.S
index 640f6ca96..175425244 100644
--- a/contrib/loaders/flash/xmc1xxx/write.S
+++ b/contrib/loaders/flash/xmc1xxx/write.S
@@ -1,11 +1,11 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
+
 /*
  * Infineon XMC1000 flash write
  *
  * Copyright (c) 2016 Andreas Färber
  *
  * Based on XMC1100 AA-Step Reference Manual
- *
- * License: GPL-2.0+
  */
 
 #include "xmc1xxx.S"
diff --git a/contrib/loaders/flash/xmc1xxx/xmc1xxx.S b/contrib/loaders/flash/xmc1xxx/xmc1xxx.S
index dfe7d3f41..5be141d6d 100644
--- a/contrib/loaders/flash/xmc1xxx/xmc1xxx.S
+++ b/contrib/loaders/flash/xmc1xxx/xmc1xxx.S
@@ -1,11 +1,11 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
+
 /*
  * Infineon XMC1000 flash
  *
  * Copyright (c) 2016 Andreas Färber
  *
  * Based on XMC1100 AA-Step Reference Manual
- *
- * License: GPL-2.0+
  */
 
 	.text