Re: [PATCH] arch/arm/include: Convert to SPDX-License and -Copyright specifiers

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Hello Uwe,

On 7/8/20 6:03 PM, Uwe Kleine-König wrote:
> Converts the files that licensecheck can determine the license for. Also
> convert to obvious right Copyright statements. Additionally some minor
> code reformatting is done.
> 
> Signed-off-by: Uwe Kleine-König <u.kleine-koenig@xxxxxxxxxxxxxx>
> ---
>  arch/arm/include/asm/assembler.h        |  9 +++------
>  arch/arm/include/asm/barebox-arm.h      | 12 +-----------
>  arch/arm/include/asm/cache-l2x0.h       | 19 ++++---------------
>  arch/arm/include/asm/dma.h              |  8 ++------
>  arch/arm/include/asm/errata.h           | 15 ++-------------
>  arch/arm/include/asm/esr.h              | 14 ++------------
>  arch/arm/include/asm/hardware/sp810.h   |  6 ++----
>  arch/arm/include/asm/opcodes-virt.h     | 23 +++++------------------
>  arch/arm/include/asm/opcodes.h          | 10 +++-------
>  arch/arm/include/asm/pgtable.h          | 14 +++++---------
>  arch/arm/include/asm/pgtable64.h        | 18 +++---------------
>  arch/arm/include/asm/proc-armv/system.h | 14 +++++---------
>  arch/arm/include/asm/psci.h             | 14 ++------------
>  arch/arm/include/asm/ptrace.h           | 14 +++++---------
>  arch/arm/include/asm/setup.h            |  9 +++------
>  arch/arm/include/asm/unified.h          | 19 ++++---------------
>  arch/arm/include/asm/unwind.h           | 19 ++++---------------
>  17 files changed, 55 insertions(+), 182 deletions(-)
> 
> diff --git a/arch/arm/include/asm/assembler.h b/arch/arm/include/asm/assembler.h
> index 6116e4893c0a..dfd4dc89666d 100644
> --- a/arch/arm/include/asm/assembler.h
> +++ b/arch/arm/include/asm/assembler.h
> @@ -1,12 +1,9 @@
> +// SPDX-License-Identifier: GPL-2.0-only
> +// SPDX-FileCopyrightText: 1996-2000 Russell King

Have you verified these aren't included into assembler source?
I seem to recall that gas doesn't play nicely with //, but I can't
reprpduce at moment. Better stay on the safe side and use /* */
comments, which is the kernel style for SPDX-License-Identifier
comments in header files.

> +
>  /*
>   *  arch/arm/include/asm/assembler.h
>   *
> - *  Copyright (C) 1996-2000 Russell King
> - *
> - * This program is free software; you can redistribute it and/or modify
> - * it under the terms of the GNU General Public License version 2 as
> - * published by the Free Software Foundation.
> - *
>   *  This file contains arm architecture specific defines
>   *  for the different processors.
>   *
> diff --git a/arch/arm/include/asm/barebox-arm.h b/arch/arm/include/asm/barebox-arm.h
> index 9277b84a19fa..7da9e132cc4b 100644
> --- a/arch/arm/include/asm/barebox-arm.h
> +++ b/arch/arm/include/asm/barebox-arm.h
> @@ -1,3 +1,4 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later
>  /*
>   * (C) Copyright 2002
>   * Sysgo Real-Time Solutions, GmbH <www.elinos.com>
> @@ -6,17 +7,6 @@
>   * (C) Copyright 2002
>   * Sysgo Real-Time Solutions, GmbH <www.elinos.com>
>   * Alex Zuepke <azu@xxxxxxxx>
> - *
> - * 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; either version 2 of
> - * the License, or (at your option) any later version.
> - *
> - * 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.
> - *
>   */
>  
>  #ifndef _BAREBOX_ARM_H_
> diff --git a/arch/arm/include/asm/cache-l2x0.h b/arch/arm/include/asm/cache-l2x0.h
> index 9bb245b0bed0..247986bd9613 100644
> --- a/arch/arm/include/asm/cache-l2x0.h
> +++ b/arch/arm/include/asm/cache-l2x0.h
> @@ -1,18 +1,7 @@
> -/*
> - * arch/arm/include/asm/hardware/cache-l2x0.h
> - *
> - * Copyright (C) 2007 ARM Limited
> - *
> - * This program is free software; you can redistribute it and/or modify
> - * it under the terms of the GNU General Public License version 2 as
> - * published by the Free Software Foundation.
> - *
> - * 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.
> - *
> - */
> +// SPDX-License-Identifier: GPL-2.0-only
> +// SPDX-FileCopyrightText: 2007 ARM Limited
> +
> +/* arch/arm/include/asm/hardware/cache-l2x0.h */
>  
>  #ifndef __ASM_ARM_HARDWARE_L2X0_H
>  #define __ASM_ARM_HARDWARE_L2X0_H
> diff --git a/arch/arm/include/asm/dma.h b/arch/arm/include/asm/dma.h
> index 15999a524d2f..7fa960f95af1 100644
> --- a/arch/arm/include/asm/dma.h
> +++ b/arch/arm/include/asm/dma.h
> @@ -1,9 +1,5 @@
> -/*
> - * Copyright (C) 2012 by Marc Kleine-Budde <mkl@xxxxxxxxxxxxxx>
> - *
> - * This file is released under the GPLv2
> - *
> - */
> +// SPDX-License-Identifier: GPL-2.0-only
> +// SPDX-FileCopyrightText: 2012 Marc Kleine-Budde <mkl@xxxxxxxxxxxxxx>
>  
>  #include <common.h>
>  
> diff --git a/arch/arm/include/asm/errata.h b/arch/arm/include/asm/errata.h
> index f020369916eb..adf07f7892db 100644
> --- a/arch/arm/include/asm/errata.h
> +++ b/arch/arm/include/asm/errata.h
> @@ -1,16 +1,5 @@
> -/*
> - * Copyright (C) 2014 Lucas Stach, Pengutronix
> - *
> - * 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; either version 2 of
> - * the License, or (at your option) any later version.
> - *
> - * 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.
> - */
> +// SPDX-License-Identifier: GPL-2.0-or-later
> +// SPDX-FileCopyrightText: 2014 Lucas Stach, Pengutronix
>  
>  static inline void enable_arm_errata_709718_war(void)
>  {
> diff --git a/arch/arm/include/asm/esr.h b/arch/arm/include/asm/esr.h
> index 77eeb2cc648f..8e098e325d6e 100644
> --- a/arch/arm/include/asm/esr.h
> +++ b/arch/arm/include/asm/esr.h
> @@ -1,18 +1,8 @@
> +// SPDX-License-Identifier: GPL-2.0-only
> +
>  /*
>   * Copyright (C) 2013 - ARM Ltd
>   * Author: Marc Zyngier <marc.zyngier@xxxxxxx>
> - *
> - * This program is free software; you can redistribute it and/or modify
> - * it under the terms of the GNU General Public License version 2 as
> - * published by the Free Software Foundation.
> - *
> - * 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/>.
>   */
>  
>  #ifndef __ASM_ESR_H
> diff --git a/arch/arm/include/asm/hardware/sp810.h b/arch/arm/include/asm/hardware/sp810.h
> index 3e3996a99ecf..e44041762561 100644
> --- a/arch/arm/include/asm/hardware/sp810.h
> +++ b/arch/arm/include/asm/hardware/sp810.h
> @@ -1,3 +1,5 @@
> +// SPDX-License-Identifier: GPL-2.0-only
> +
>  /*
>   * arch/arm/include/asm/hardware/sp810.h
>   *
> @@ -5,10 +7,6 @@
>   *
>   * Copyright (C) 2009 ST Microelectronics
>   * Viresh Kumar <viresh.linux@xxxxxxxxx>
> - *
> - * This file is licensed under the terms of the GNU General Public
> - * License version 2. This program is licensed "as is" without any
> - * warranty of any kind, whether express or implied.
>   */
>  
>  #ifndef __ASM_ARM_SP810_H
> diff --git a/arch/arm/include/asm/opcodes-virt.h b/arch/arm/include/asm/opcodes-virt.h
> index efcfdf92d9d5..01629ae12b59 100644
> --- a/arch/arm/include/asm/opcodes-virt.h
> +++ b/arch/arm/include/asm/opcodes-virt.h
> @@ -1,21 +1,8 @@
> -/*
> - * opcodes-virt.h: Opcode definitions for the ARM virtualization extensions
> - * Copyright (C) 2012  Linaro Limited
> - *
> - * 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; either version 2 of the License, or
> - * (at your option) any later version.
> - *
> - * 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, write to the Free Software Foundation, Inc.,
> - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
> - */
> +// SPDX-License-Identifier: GPL-2.0-or-later
> +// SPDX-FileCopyrightText: 2012 Linaro Limited
> +
> +/* opcodes-virt.h: Opcode definitions for the ARM virtualization extensions */
> +
>  #ifndef __ASM_ARM_OPCODES_VIRT_H
>  #define __ASM_ARM_OPCODES_VIRT_H
>  
> diff --git a/arch/arm/include/asm/opcodes.h b/arch/arm/include/asm/opcodes.h
> index a78bf5d2c518..f0bc52a037fd 100644
> --- a/arch/arm/include/asm/opcodes.h
> +++ b/arch/arm/include/asm/opcodes.h
> @@ -1,10 +1,6 @@
> -/*
> - *  arch/arm/include/asm/opcodes.h
> - *
> - * This program is free software; you can redistribute it and/or modify
> - * it under the terms of the GNU General Public License version 2 as
> - * published by the Free Software Foundation.
> - */
> +// SPDX-License-Identifier: GPL-2.0-only
> +
> +/* arch/arm/include/asm/opcodes.h */
>  
>  #ifndef __ASM_ARM_OPCODES_H
>  #define __ASM_ARM_OPCODES_H
> diff --git a/arch/arm/include/asm/pgtable.h b/arch/arm/include/asm/pgtable.h
> index fd1521d5cb9d..f3b5d4bce7ad 100644
> --- a/arch/arm/include/asm/pgtable.h
> +++ b/arch/arm/include/asm/pgtable.h
> @@ -1,12 +1,8 @@
> -/*
> - *  arch/arm/include/asm/pgtable-hwdef.h
> - *
> - *  Copyright (C) 1995-2002 Russell King
> - *
> - * This program is free software; you can redistribute it and/or modify
> - * it under the terms of the GNU General Public License version 2 as
> - * published by the Free Software Foundation.
> - */
> +// SPDX-License-Identifier: GPL-2.0-only
> +// SPDX-FileCopyrightText: 1995-2002 Russell King
> +
> +/* arch/arm/include/asm/pgtable-hwdef.h */
> +
>  #ifndef _ASMARM_PGTABLE_HWDEF_H
>  #define _ASMARM_PGTABLE_HWDEF_H
>  
> diff --git a/arch/arm/include/asm/pgtable64.h b/arch/arm/include/asm/pgtable64.h
> index d142612d0de9..c52e7ab9e878 100644
> --- a/arch/arm/include/asm/pgtable64.h
> +++ b/arch/arm/include/asm/pgtable64.h
> @@ -1,18 +1,6 @@
> -/*
> - * Copyright (C) 2012 ARM Ltd.
> - *
> - * This program is free software; you can redistribute it and/or modify
> - * it under the terms of the GNU General Public License version 2 as
> - * published by the Free Software Foundation.
> - *
> - * 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/>.
> - */
> +// SPDX-License-Identifier: GPL-2.0-only
> +// SPDX-FileCopyrightText: 2012 ARM Ltd.
> +
>  #ifndef __ASM_PGTABLE64_H
>  #define __ASM_PGTABLE64_H
>  
> diff --git a/arch/arm/include/asm/proc-armv/system.h b/arch/arm/include/asm/proc-armv/system.h
> index c61374e9f2e4..224b8e0d5436 100644
> --- a/arch/arm/include/asm/proc-armv/system.h
> +++ b/arch/arm/include/asm/proc-armv/system.h
> @@ -1,12 +1,8 @@
> -/*
> - *  linux/include/asm-arm/proc-armv/system.h
> - *
> - *  Copyright (C) 1996 Russell King
> - *
> - * This program is free software; you can redistribute it and/or modify
> - * it under the terms of the GNU General Public License version 2 as
> - * published by the Free Software Foundation.
> - */
> +// SPDX-License-Identifier: GPL-2.0-only
> +// SPDX-FileCopyrightText 1996 Russell King
> +
> +/* linux/include/asm-arm/proc-armv/system.h */
> +
>  #ifndef __ASM_PROC_SYSTEM_H
>  #define __ASM_PROC_SYSTEM_H
>  
> diff --git a/arch/arm/include/asm/psci.h b/arch/arm/include/asm/psci.h
> index b616e4b20e78..f62bc8c63ef4 100644
> --- a/arch/arm/include/asm/psci.h
> +++ b/arch/arm/include/asm/psci.h
> @@ -1,18 +1,8 @@
> +// SPDX-License-Identifier: GPL-2.0-only
> +
>  /*
>   * Copyright (C) 2013 - ARM Ltd
>   * Author: Marc Zyngier <marc.zyngier@xxxxxxx>
> - *
> - * This program is free software; you can redistribute it and/or modify
> - * it under the terms of the GNU General Public License version 2 as
> - * published by the Free Software Foundation.
> - *
> - * 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/>.
>   */
>  
>  #ifndef __ARM_PSCI_H__
> diff --git a/arch/arm/include/asm/ptrace.h b/arch/arm/include/asm/ptrace.h
> index 042e0cef700b..f5d78faa63ca 100644
> --- a/arch/arm/include/asm/ptrace.h
> +++ b/arch/arm/include/asm/ptrace.h
> @@ -1,12 +1,8 @@
> -/*
> - *  arch/arm/include/asm/ptrace.h
> - *
> - *  Copyright (C) 1996-2003 Russell King
> - *
> - * This program is free software; you can redistribute it and/or modify
> - * it under the terms of the GNU General Public License version 2 as
> - * published by the Free Software Foundation.
> - */
> +// SPDX-License-Identifier: GPL-2.0-only
> +// SPDX-FileCopyrightText: 1996-2003 Russell King
> +
> +/* arch/arm/include/asm/ptrace.h */
> +
>  #ifndef __ASM_ARM_PTRACE_H
>  #define __ASM_ARM_PTRACE_H
>  
> diff --git a/arch/arm/include/asm/setup.h b/arch/arm/include/asm/setup.h
> index 6ce35fb8d3d0..ad3c4fa90944 100644
> --- a/arch/arm/include/asm/setup.h
> +++ b/arch/arm/include/asm/setup.h
> @@ -1,10 +1,7 @@
> +// SPDX-License-Identifier: GPL-2.0-only
> +// SPDX-FileCopyrightText: 1997-1999 Russell King
> +
>  /*
> - *  Copyright (C) 1997-1999 Russell King
> - *
> - * This program is free software; you can redistribute it and/or modify
> - * it under the terms of the GNU General Public License version 2 as
> - * published by the Free Software Foundation.
> - *
>   *  Structure passed to kernel to tell it about the
>   *  hardware it's running on.  See linux/Documentation/arm/Setup
>   *  for more info.
> diff --git a/arch/arm/include/asm/unified.h b/arch/arm/include/asm/unified.h
> index 13a2bfffa759..4a3881d8348a 100644
> --- a/arch/arm/include/asm/unified.h
> +++ b/arch/arm/include/asm/unified.h
> @@ -1,18 +1,7 @@
> -/*
> - * include/asm-arm/unified.h - Unified Assembler Syntax helper macros
> - *
> - * Copyright (C) 2008 ARM Limited
> - *
> - * This program is free software; you can redistribute it and/or modify
> - * it under the terms of the GNU General Public License version 2 as
> - * published by the Free Software Foundation.
> - *
> - * 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.
> - *
> - */
> +// SPDX-License-Identifier: GPL-2.0-only
> +// SPDX-FileCopyrightText: 2008 ARM Limited
> +
> +/* Unified Assembler Syntax helper macros */
>  
>  #ifndef __ASM_UNIFIED_H
>  #define __ASM_UNIFIED_H
> diff --git a/arch/arm/include/asm/unwind.h b/arch/arm/include/asm/unwind.h
> index a6f3a91743be..bd71e0bcfc07 100644
> --- a/arch/arm/include/asm/unwind.h
> +++ b/arch/arm/include/asm/unwind.h
> @@ -1,18 +1,7 @@
> -/*
> - * arch/arm/include/asm/unwind.h
> - *
> - * Copyright (C) 2008 ARM Limited
> - *
> - * This program is free software; you can redistribute it and/or modify
> - * it under the terms of the GNU General Public License version 2 as
> - * published by the Free Software Foundation.
> - *
> - * 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.
> - *
> - */
> +// SPDX-License-Identifier: GPL-2.0-only
> +// SPDX-FileCopyrightText: 2008 ARM Limited
> +
> +/* arch/arm/include/asm/unwind.h */
>  
>  #ifndef __ASM_UNWIND_H
>  #define __ASM_UNWIND_H
> 

-- 
Pengutronix e.K.                           |                             |
Steuerwalder Str. 21                       | http://www.pengutronix.de/  |
31137 Hildesheim, Germany                  | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
barebox mailing list
barebox@xxxxxxxxxxxxxxxxxxx
http://lists.infradead.org/mailman/listinfo/barebox




[Index of Archives]     [Linux Embedded]     [Linux USB Devel]     [Linux Audio Users]     [Yosemite News]     [Linux Kernel]     [Linux SCSI]     [XFree86]

  Powered by Linux