This is an automated email from Gerrit.
"Antonio Borneo <borneo.anto...@gmail.com>" just uploaded a new patch set to
Gerrit, which you can find at https://review.openocd.org/c/openocd/+/7156
-- gerrit
commit 381480b222bdbd290a6d7d5ae395ee6923c23a16
Author: Antonio Borneo <borneo.anto...@gmail.com>
Date: Tue Aug 30 17:15:32 2022 +0200
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.anto...@gmail.com>
diff --git a/.travis.yml b/.travis.yml
index da6b94c3f0..28d5502c5c 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 <ma...@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 e437b66168..70476ad1f7 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 78eb1e8187..b46514a487 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.va...@gmail.com>
diff --git a/contrib/loaders/flash/sh_qspi/sh_qspi.ld
b/contrib/loaders/flash/sh_qspi/sh_qspi.ld
index 2683c520b5..71cc3e380d 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 e5a4808fcc..9d3d9925c1 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 6c993443a9..311c2044d2 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 640f6ca960..1754252445 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 dfe7d3f41e..5be141d6df 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
--
