[OpenOCD-commit] Main OpenOCD repository branch, master, updated. v0.11.0-765-g4db9add47

[OpenOCD-Gerrit <ope...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Main OpenOCD repository".

The branch, master has been updated
       via  4db9add47f282c264c512fb76e43c6707f72ab2b (commit)
       via  665b501203633909a7dfe6c2dc41a756e45829f7 (commit)
      from  5635fbc25a3df8c7fec7ce79b8b2d96ad8279802 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 4db9add47f282c264c512fb76e43c6707f72ab2b
Author: Antonio Borneo <bor...@gm...>
Date:   Sun Jun 26 11:44:00 2022 +0200

    openocd: src: fix incorrect GPL license tag
    
    Use the standard SPDX tag, where it was incorrectly applied.
    
    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: Iaec63abc6e0a38e5b0ae0ea7f5ecee7ca007bbbd
    Signed-off-by: Antonio Borneo <bor...@gm...>
    Reviewed-on: https://review.openocd.org/c/openocd/+/7065
    Tested-by: jenkins

diff --git a/src/flash/nor/xmc1xxx.c b/src/flash/nor/xmc1xxx.c
index 9e5f0a3dd..70e07fcfa 100644
--- a/src/flash/nor/xmc1xxx.c
+++ b/src/flash/nor/xmc1xxx.c
@@ -1,9 +1,9 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
+
 /*
  * XMC1000 flash driver
  *
  * Copyright (c) 2016 Andreas Färber
- *
- * License: GPL-2.0+
  */
 
 #ifdef HAVE_CONFIG_H

commit 665b501203633909a7dfe6c2dc41a756e45829f7
Author: Antonio Borneo <bor...@gm...>
Date:   Sun Jun 26 11:38:41 2022 +0200

    openocd: src: replace the GPL-2.0-only license tag
    
    Replace the FSF boilerplate with the SPDX tag.
    
    Change-Id: I29f51caa5ae9854d05ce7e150d168a7002607cd1
    Signed-off-by: Antonio Borneo <bor...@gm...>
    Reviewed-on: https://review.openocd.org/c/openocd/+/7064
    Tested-by: jenkins

diff --git a/src/flash/nand/s3c24xx_regs.h b/src/flash/nand/s3c24xx_regs.h
index 46bda6bfe..3960cb36a 100644
--- a/src/flash/nand/s3c24xx_regs.h
+++ b/src/flash/nand/s3c24xx_regs.h
@@ -1,19 +1,9 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
+
 /***************************************************************************
  *   Copyright (C) 2004, 2005 by Simtec Electronics                        *
  *   li...@si...                                                    *
  *   http://www.simtec.co.uk/products/SWLINUX/                             *
- *                                                                         *
- *   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; version 2 of the License.               *
- *                                                                         *
- *   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, see <http://www.gnu.org/licenses/>. *
  ***************************************************************************/
 
 /*

-----------------------------------------------------------------------

Summary of changes:
 src/flash/nand/s3c24xx_regs.h | 14 ++------------
 src/flash/nor/xmc1xxx.c       |  4 ++--
 2 files changed, 4 insertions(+), 14 deletions(-)


hooks/post-receive
-- 
Main OpenOCD repository