[PATCH] treewide: Convert files covered by ARM copyright to SPDX
Ahmad Fatoum
a.fatoum at pengutronix.de
Fri Jul 10 10:56:56 EDT 2020
Hello,
On 7/8/20 6:04 PM, Uwe Kleine-König wrote:
> According to Marc Zyngier, former employee at ARM, the company owns the
> copyright for code created by its employees. Convert accordingly to SPDX
> with the usual rearrangements. Also dropped Marc's email address which
> doesn't work any more.
>
> Signed-off-by: Uwe Kleine-König <u.kleine-koenig at pengutronix.de>
> ---
> arch/arm/include/asm/esr.h | 6 ++---
> arch/arm/include/asm/psci.h | 6 ++---
> arch/arm/lib64/copy_template.S | 20 +++-----------
> arch/arm/lib64/memcpy.S | 19 +++----------
> arch/arm/lib64/memset.S | 19 +++----------
> .../mach-versatile/include/mach/platform.h | 18 +++----------
> drivers/clk/vexpress/clk-sp810.c | 4 +--
> drivers/i2c/busses/i2c-versatile.c | 13 +++++----
> drivers/serial/serial_pl010.c | 27 +++++--------------
> drivers/serial/serial_pl010.h | 23 ++++------------
> include/linux/amba/serial.h | 19 ++++---------
> include/linux/clk.h | 9 +++----
> 12 files changed, 46 insertions(+), 137 deletions(-)
>
> diff --git a/arch/arm/include/asm/esr.h b/arch/arm/include/asm/esr.h
> index 8e098e325d6e..6a5949fd487e 100644
> --- a/arch/arm/include/asm/esr.h
> +++ b/arch/arm/include/asm/esr.h
> @@ -1,9 +1,7 @@
> // SPDX-License-Identifier: GPL-2.0-only
> +// SPDX-FileCopyrightText: 2013 ARM Ltd
>
> -/*
> - * Copyright (C) 2013 - ARM Ltd
> - * Author: Marc Zyngier <marc.zyngier at arm.com>
> - */
> +/* Author: Marc Zyngier */
>
> #ifndef __ASM_ESR_H
> #define __ASM_ESR_H
> diff --git a/arch/arm/include/asm/psci.h b/arch/arm/include/asm/psci.h
> index f62bc8c63ef4..65d23b32b999 100644
> --- a/arch/arm/include/asm/psci.h
> +++ b/arch/arm/include/asm/psci.h
> @@ -1,9 +1,7 @@
> // SPDX-License-Identifier: GPL-2.0-only
> +// SPDX-FileCopyrightText: 2013 ARM Ltd
>
> -/*
> - * Copyright (C) 2013 - ARM Ltd
> - * Author: Marc Zyngier <marc.zyngier at arm.com>
> - */
> +/* Author: Marc Zyngier */
>
> #ifndef __ARM_PSCI_H__
> #define __ARM_PSCI_H__
> diff --git a/arch/arm/lib64/copy_template.S b/arch/arm/lib64/copy_template.S
> index cc9a84260de8..d5c6e90f82fd 100644
> --- a/arch/arm/lib64/copy_template.S
> +++ b/arch/arm/lib64/copy_template.S
> @@ -1,28 +1,16 @@
> +// SPDX-License-Identifier: GPL-2.0-only
> +// SPDX-FileCopyrightText: 2013 ARM Ltd.
> +// SPDX-FileCopyrightText: 2013 Linaro
While I can't reproduce with OSELAS.Toolchain 2019.12.0, the kernel
Documentation[1] says:
If a specific tool cannot handle the standard comment style, then the
appropriate comment mechanism which the tool accepts shall be used.
This is the reason for having the “/* */” style comment in C header files.
There was build breakage observed with generated .lds files where ‘ld’
failed to parse the C++ comment. This has been fixed by now, but there
are still older assembler tools which cannot handle C++ style comments.
We should follow suit. Please change comment style.
[1]: https://www.kernel.org/doc/html/v4.18/process/license-rules.html#license-identifier-syntax
> +
> /*
> - * Copyright (C) 2013 ARM Ltd.
> - * Copyright (C) 2013 Linaro.
> - *
> * This code is based on glibc cortex strings work originally authored by Linaro
> * and re-licensed under GPLv2 for the Linux kernel. The original code can
> * be found @
> *
> * http://bazaar.launchpad.net/~linaro-toolchain-dev/cortex-strings/trunk/
> * files/head:/src/aarch64/
> - *
> - * 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/>.
> */
>
> -
> /*
> * Copy a buffer from src to dest (alignment handled by the hardware)
> *
> diff --git a/arch/arm/lib64/memcpy.S b/arch/arm/lib64/memcpy.S
> index a70e96ca296d..6f6d2f6fe194 100644
> --- a/arch/arm/lib64/memcpy.S
> +++ b/arch/arm/lib64/memcpy.S
> @@ -1,25 +1,14 @@
> +// SPDX-License-Identifier: GPL-2.0-only
> +// SPDX-FileCopyrightText: 2013 ARM Ltd.
> +// SPDX-FileCopyrightText: 2013 Linaro
> +
> /*
> - * Copyright (C) 2013 ARM Ltd.
> - * Copyright (C) 2013 Linaro.
> - *
> * This code is based on glibc cortex strings work originally authored by Linaro
> * and re-licensed under GPLv2 for the Linux kernel. The original code can
> * be found @
> *
> * http://bazaar.launchpad.net/~linaro-toolchain-dev/cortex-strings/trunk/
> * files/head:/src/aarch64/
> - *
> - * 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/>.
> */
>
> #include <linux/linkage.h>
> diff --git a/arch/arm/lib64/memset.S b/arch/arm/lib64/memset.S
> index d17bcc6125e0..29aa9fdae5e4 100644
> --- a/arch/arm/lib64/memset.S
> +++ b/arch/arm/lib64/memset.S
> @@ -1,25 +1,14 @@
> +// SPDX-License-Identifier: GPL-2.0-only
> +// SPDX-FileCopyrightText: 2013 ARM Ltd.
> +// SPDX-FileCopyrightText: 2013 Linaro
> +
> /*
> - * Copyright (C) 2013 ARM Ltd.
> - * Copyright (C) 2013 Linaro.
> - *
> * This code is based on glibc cortex strings work originally authored by Linaro
> * and re-licensed under GPLv2 for the Linux kernel. The original code can
> * be found @
> *
> * http://bazaar.launchpad.net/~linaro-toolchain-dev/cortex-strings/trunk/
> * files/head:/src/aarch64/
> - *
> - * 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/>.
> */
>
> #include <linux/linkage.h>
> diff --git a/arch/arm/mach-versatile/include/mach/platform.h b/arch/arm/mach-versatile/include/mach/platform.h
> index 29c4d922b0c4..019ff6e1b0de 100644
> --- a/arch/arm/mach-versatile/include/mach/platform.h
> +++ b/arch/arm/mach-versatile/include/mach/platform.h
> @@ -1,21 +1,9 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later
> +// SPDX-FileCopyrightText: 2003 ARM Limited
> +
> /*
> - * ach-arm926ejs/include/mach/platform.h
> - *
> * Borrowed from Linux v2.6.35
> * arch/arm/mach-versatile/include/mach/platform.h
> - *
> - * Copyright (c) ARM Limited 2003. All rights reserved.
> - *
> - * 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 __address_h
> diff --git a/drivers/clk/vexpress/clk-sp810.c b/drivers/clk/vexpress/clk-sp810.c
> index 78ec67fd155b..968921203bc0 100644
> --- a/drivers/clk/vexpress/clk-sp810.c
> +++ b/drivers/clk/vexpress/clk-sp810.c
> @@ -1,7 +1,5 @@
> // SPDX-License-Identifier: GPL-2.0-only
> -/*
> - * Copyright (C) 2013 ARM Limited
> - */
> +// SPDX-FileCopyrightText: 2013 ARM Limited
>
> #include <common.h>
> #include <io.h>
> diff --git a/drivers/i2c/busses/i2c-versatile.c b/drivers/i2c/busses/i2c-versatile.c
> index 6a00c2a2eb29..ece483f6f5dc 100644
> --- a/drivers/i2c/busses/i2c-versatile.c
> +++ b/drivers/i2c/busses/i2c-versatile.c
> @@ -1,13 +1,12 @@
> +// SPDX-License-Identifier: GPL-2.0-only
> +// SPDX-FileCopyrightText: 2006 ARM Ltd.
> +
> /*
> - * i2c-versatile.c
> - *
> - * Copyright (C) 2006 ARM Ltd.
> - * written by Russell King, Deep Blue Solutions Ltd.
> + * i2c-versatile.c
> *
> - * 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.
> + * written by Russell King, Deep Blue Solutions Ltd.
> */
> +
> #include <common.h>
> #include <driver.h>
> #include <i2c/i2c.h>
> diff --git a/drivers/serial/serial_pl010.c b/drivers/serial/serial_pl010.c
> index 74a0c81d3eba..f2cf944e8f91 100644
> --- a/drivers/serial/serial_pl010.c
> +++ b/drivers/serial/serial_pl010.c
> @@ -1,24 +1,9 @@
> -/*
> - * Copyright (C) 2010 Matthias Kaehlcke <matthias at kaehlcke.net>
> - *
> - * (C) Copyright 2000
> - * Rob Taylor, Flying Pig Systems. robt at flyingpig.com.
> - *
> - * (C) Copyright 2004
> - * ARM Ltd.
> - * Philippe Robin, <philippe.robin at arm.com>
> - *
> - * 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: 2000 Rob Taylor <robt at flyingpig.com>, Flying Pig Systems
> +// SPDX-FileCopyrightText: 2004 ARM Ltd.
> +// SPDX-FileCopyrightText: 2010 Matthias Kaehlcke <matthias at kaehlcke.net>
> +
> +/* Contributor: Philippe Robin <philippe.robin at arm.com> */
>
> /* Simple U-Boot driver for the PrimeCell PL010/PL011 UARTs */
>
> diff --git a/drivers/serial/serial_pl010.h b/drivers/serial/serial_pl010.h
> index f442339ea36b..7724a9186618 100644
> --- a/drivers/serial/serial_pl010.h
> +++ b/drivers/serial/serial_pl010.h
> @@ -1,21 +1,8 @@
> -/*
> - * Copyright (C) 2010 Matthias Kaehlcke <matthias at kaehlcke.net>
> - *
> - * (C) Copyright 2003, 2004
> - * ARM Ltd.
> - * Philippe Robin, <philippe.robin at arm.com>
> - *
> - * 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: 2003, 2004 ARM Ltd.
> +// SPDX-FileCopyrightText: 2010 Matthias Kaehlcke <matthias at kaehlcke.net>
> +
> +/* Contributor: Philippe Robin <philippe.robin at arm.com> */
>
> struct hldc_struct {
> uint32_t ctrl;
> diff --git a/include/linux/amba/serial.h b/include/linux/amba/serial.h
> index 8ff22d5c8c55..d3bbe74e7dde 100644
> --- a/include/linux/amba/serial.h
> +++ b/include/linux/amba/serial.h
> @@ -1,22 +1,13 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later
> +// SPDX-FileCopyrightText: ARM Limited
> +// SPDX-FileCopyrightText: 2000 Deep Blue Solutions Ltd.
> +
> /*
> * linux/include/linux/amba/serial.h
> *
> * Internal header file for AMBA serial ports
> - *
> - * Copyright (C) ARM Limited
> - * Copyright (C) 2000 Deep Blue Solutions Ltd.
> - *
> - * 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 ASM_ARM_HARDWARE_SERIAL_AMBA_H
> #define ASM_ARM_HARDWARE_SERIAL_AMBA_H
>
> diff --git a/include/linux/clk.h b/include/linux/clk.h
> index a005e7233de8..717eeca3361f 100644
> --- a/include/linux/clk.h
> +++ b/include/linux/clk.h
> @@ -1,13 +1,12 @@
> +// SPDX-License-Identifier: GPL-2.0-only
> +// SPDX-FileCopyrightText: 2004 ARM Limited
> +
> /*
> * linux/include/linux/clk.h
> *
> - * Copyright (C) 2004 ARM Limited.
> * Written by Deep Blue Solutions 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.
> */
> +
> #ifndef __LINUX_CLK_H
> #define __LINUX_CLK_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 |
More information about the barebox
mailing list