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

diff --git a/.travis.yml b/.travis.yml
index da6b94c3f033634f13024035548bff49c2af2829..28d5502c5c56b6b3d2a5e7e0111a2590f64cc9dd 100644 (file)
--- 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 e437b66168c7ea176a259933a22471a5e03303c6..70476ad1f7ad3761fc9d5a232a55d95e26922c1a 100644 (file)
--- 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 78eb1e81872d75afc79f6b711a791596a3a98e79..b46514a4879af123f08e2e47236bf72c7a8bba28 100644 (file)
--- 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 2683c520b5541b1cdb872a530d7608c795a6d2ee..71cc3e380d76babd7c267d378a6ba59f8e4295d2 100644 (file)
--- 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 e5a4808fccd7f602bc84beca638b249f224a7e0d..9d3d9925c1ce8da8a5c0bc4392039967a05f8793 100644 (file)
--- 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 6c993443a9d3f30e9d9009ff0f21c9bd42747f0c..311c2044d27e82e089d7df126fd82e2aaf076125 100644 (file)
--- 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 640f6ca960a822a634f0667013cc6cd8e457dc08..17542524459fa2d39ee12d6e5d4d7a24ad2ef162 100644 (file)
--- 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 dfe7d3f41ef602d14be8c24ab40ab4602285d5bc..5be141d6dfdf2b8f89688377b41611ab082e4813 100644 (file)
--- 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