[PATCH v2 2/2] arm/cpu: Replace license and copyright boilerplate by SPDX identfiers

Fri Jul 3 03:49:36 EDT 2020


On 7/2/20 4:36 PM, Uwe Kleine-König wrote:
> This adapts all files that were identifed by licensecheck
> (https://salsa.debian.org/build-common-team/licensecheck.git) as
> licensed under the GPL.
> 
> While touching these files also do some minor comment reformatting to
> get some uniform layout.
> 
> Signed-off-by: Uwe Kleine-König <u.kleine-koenig at pengutronix.de>

Reviewed-by: Ahmad Fatoum <a.fatoum at pengutronix.de>

> ---
>  arch/arm/cpu/cache_64.c      | 11 +----------
>  arch/arm/cpu/common.c        | 15 ++-------------
>  arch/arm/cpu/cpu.c           | 16 ++--------------
>  arch/arm/cpu/cpuinfo.c       | 18 ++++--------------
>  arch/arm/cpu/dtb.c           | 16 +++-------------
>  arch/arm/cpu/interrupts.c    | 17 ++---------------
>  arch/arm/cpu/interrupts_64.c | 19 ++++---------------
>  arch/arm/cpu/mmu.c           | 15 ++-------------
>  arch/arm/cpu/mmu_64.c        | 17 +++--------------
>  arch/arm/cpu/mmuinfo.c       | 14 ++------------
>  arch/arm/cpu/no-mmu.c        | 18 ++++--------------
>  arch/arm/cpu/psci.c          | 11 +----------
>  arch/arm/cpu/start.c         | 16 +++-------------
>  arch/arm/cpu/uncompress.c    | 22 ++++++----------------
>  14 files changed, 39 insertions(+), 186 deletions(-)
> 
> diff --git a/arch/arm/cpu/cache_64.c b/arch/arm/cpu/cache_64.c
> index 6e18d981a434..cb7bc0945c58 100644
> --- a/arch/arm/cpu/cache_64.c
> +++ b/arch/arm/cpu/cache_64.c
> @@ -1,13 +1,4 @@
> -/*
> - * 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.
> - *
> - * 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
>  
>  #include <common.h>
>  #include <init.h>
> diff --git a/arch/arm/cpu/common.c b/arch/arm/cpu/common.c
> index bc5d9b588251..33f148fc0eb9 100644
> --- a/arch/arm/cpu/common.c
> +++ b/arch/arm/cpu/common.c
> @@ -1,16 +1,5 @@
> -/*
> - * Copyright (c) 2010 Sascha Hauer <s.hauer at pengutronix.de>, Pengutronix
> - *
> - * 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: 2010 Sascha Hauer <s.hauer at pengutronix.de>, Pengutronix
>  
>  #include <common.h>
>  #include <init.h>
> diff --git a/arch/arm/cpu/cpu.c b/arch/arm/cpu/cpu.c
> index 0db852b33d3e..5b79dd2a8fc8 100644
> --- a/arch/arm/cpu/cpu.c
> +++ b/arch/arm/cpu/cpu.c
> @@ -1,17 +1,5 @@
> -/*
> - * cpu.c - A few helper functions for ARM
> - *
> - * Copyright (c) 2007 Sascha Hauer <s.hauer at pengutronix.de>, Pengutronix
> - *
> - * 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 Sascha Hauer <s.hauer at pengutronix.de>, Pengutronix
>  
>  /**
>   * @file
> diff --git a/arch/arm/cpu/cpuinfo.c b/arch/arm/cpu/cpuinfo.c
> index dd67b51ac288..a08fc253efbb 100644
> --- a/arch/arm/cpu/cpuinfo.c
> +++ b/arch/arm/cpu/cpuinfo.c
> @@ -1,17 +1,7 @@
> -/*
> - * cpuinfo.c - Show information about cp15 registers
> - *
> - * Copyright (c) 2009 Sascha Hauer <s.hauer at pengutronix.de>, Pengutronix
> - *
> - * 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: 2009 Sascha Hauer <s.hauer at pengutronix.de>, Pengutronix
> +
> +/* cpuinfo.c - Show information about cp15 registers */
>  
>  #include <common.h>
>  #include <command.h>
> diff --git a/arch/arm/cpu/dtb.c b/arch/arm/cpu/dtb.c
> index 1d126a827dd2..8094eebf0739 100644
> --- a/arch/arm/cpu/dtb.c
> +++ b/arch/arm/cpu/dtb.c
> @@ -1,16 +1,6 @@
> -/*
> - * Copyright (c) 2013 Sascha Hauer <s.hauer at pengutronix.de>, Pengutronix
> - *
> - * 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: 2013 Sascha Hauer <s.hauer at pengutronix.de>, Pengutronix
> +
>  #include <common.h>
>  #include <init.h>
>  #include <of.h>
> diff --git a/arch/arm/cpu/interrupts.c b/arch/arm/cpu/interrupts.c
> index 703a5a3ba706..a1728eb353c8 100644
> --- a/arch/arm/cpu/interrupts.c
> +++ b/arch/arm/cpu/interrupts.c
> @@ -1,18 +1,5 @@
> -/*
> - * interrupts.c - Interrupt Support Routines
> - *
> - * Copyright (c) 2007 Sascha Hauer <s.hauer at pengutronix.de>, Pengutronix
> - *
> - * 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 Sascha Hauer <s.hauer at pengutronix.de>, Pengutronix
>  
>  /**
>   * @file
> diff --git a/arch/arm/cpu/interrupts_64.c b/arch/arm/cpu/interrupts_64.c
> index f462835ffd8a..f54fdcd3dd50 100644
> --- a/arch/arm/cpu/interrupts_64.c
> +++ b/arch/arm/cpu/interrupts_64.c
> @@ -1,18 +1,7 @@
> -/*
> - * interrupts_64.c - Interrupt Support Routines
> - *
> - * Copyright (c) 2018 Sascha Hauer <s.hauer at pengutronix.de>, Pengutronix
> - *
> - * 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: 2018 Sascha Hauer <s.hauer at pengutronix.de>, Pengutronix
> +
> +/* interrupts_64.c - Interrupt Support Routines */
>  
>  #include <common.h>
>  #include <abort.h>
> diff --git a/arch/arm/cpu/mmu.c b/arch/arm/cpu/mmu.c
> index 2aa53229b323..6af228505dd1 100644
> --- a/arch/arm/cpu/mmu.c
> +++ b/arch/arm/cpu/mmu.c
> @@ -1,16 +1,5 @@
> -/*
> - * Copyright (c) 2009-2013 Sascha Hauer <s.hauer at pengutronix.de>, Pengutronix
> - *
> - * 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: 2009-2013 Sascha Hauer <s.hauer at pengutronix.de>, Pengutronix
>  
>  #define pr_fmt(fmt)	"mmu: " fmt
>  
> diff --git a/arch/arm/cpu/mmu_64.c b/arch/arm/cpu/mmu_64.c
> index 8324cedb25ad..7e9ae84810f6 100644
> --- a/arch/arm/cpu/mmu_64.c
> +++ b/arch/arm/cpu/mmu_64.c
> @@ -1,17 +1,6 @@
> -/*
> - * Copyright (c) 2009-2013 Sascha Hauer <s.hauer at pengutronix.de>, Pengutronix
> - * Copyright (c) 2016 Raphaël Poggi <poggi.raph at gmail.com>
> - *
> - * 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: 2009-2013 Sascha Hauer <s.hauer at pengutronix.de>, Pengutronix
> +// SPDX-FileCopyrightText: 2016 Raphaël Poggi <poggi.raph at gmail.com>
>  
>  #define pr_fmt(fmt)	"mmu: " fmt
>  
> diff --git a/arch/arm/cpu/mmuinfo.c b/arch/arm/cpu/mmuinfo.c
> index 1db6eb3869a5..1147c0a305b3 100644
> --- a/arch/arm/cpu/mmuinfo.c
> +++ b/arch/arm/cpu/mmuinfo.c
> @@ -1,17 +1,7 @@
> +// SPDX-License-Identifier: GPL-2.0-only
> +// SPDX-FileCopyrightText: 2012 Jan Luebbe <j.luebbe at pengutronix.de>, Pengutronix
>  /*
>   * mmuinfo.c - Show MMU/cache information from cp15 registers
> - *
> - * Copyright (c) Jan Luebbe <j.luebbe at pengutronix.de>, Pengutronix
> - *
> - * 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.
> - *
>   */
>  
>  #include <common.h>
> diff --git a/arch/arm/cpu/no-mmu.c b/arch/arm/cpu/no-mmu.c
> index 7268fa9b9d78..be3cfaf12bd2 100644
> --- a/arch/arm/cpu/no-mmu.c
> +++ b/arch/arm/cpu/no-mmu.c
> @@ -1,17 +1,7 @@
> -/*
> - * Copyright (c) 2015 Zodiac Inflight Innovation
> - * Author: Andrey Smirnov <andrew.smirnov at gmail.com>
> - *
> - * 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: 2015 Zodiac Inflight Innovation
> +
> +/* Author: Andrey Smirnov <andrew.smirnov at gmail.com> */
>  
>  #define pr_fmt(fmt)	"nommu: " fmt
>  
> diff --git a/arch/arm/cpu/psci.c b/arch/arm/cpu/psci.c
> index 5a69aaa81065..436561f8649f 100644
> --- a/arch/arm/cpu/psci.c
> +++ b/arch/arm/cpu/psci.c
> @@ -1,13 +1,4 @@
> -/*
> - * 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.
> - *
> - * 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
>  
>  #define pr_fmt(fmt)  "psci: " fmt
>  
> diff --git a/arch/arm/cpu/start.c b/arch/arm/cpu/start.c
> index 2cf21459da4b..aeca459cb1bb 100644
> --- a/arch/arm/cpu/start.c
> +++ b/arch/arm/cpu/start.c
> @@ -1,16 +1,6 @@
> -/*
> - * Copyright (c) 2010 Sascha Hauer <s.hauer at pengutronix.de>, Pengutronix
> - *
> - * 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: 2010 Sascha Hauer <s.hauer at pengutronix.de>, Pengutronix
> +
>  #define pr_fmt(fmt) "start.c: " fmt
>  
>  #include <common.h>
> diff --git a/arch/arm/cpu/uncompress.c b/arch/arm/cpu/uncompress.c
> index 3eb0132d53ef..db0fe98e0d83 100644
> --- a/arch/arm/cpu/uncompress.c
> +++ b/arch/arm/cpu/uncompress.c
> @@ -1,19 +1,9 @@
> -/*
> - * uncompress.c - uncompressor code for self extracing pbl image
> - *
> - * Copyright (c) 2010-2013 Sascha Hauer <s.hauer at pengutronix.de>, Pengutronix
> - * Copyright (c) 2012 Jean-Christophe PLAGNIOL-VILLARD <plagnioj at jcrosoft.com>
> - *
> - * 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: 2010-2013 Sascha Hauer <s.hauer at pengutronix.de>, Pengutronix
> +// SPDX-FileCopyrightText: 2012 Jean-Christophe PLAGNIOL-VILLARD <plagnioj at jcrosoft.com>
> +
> +/* uncompress.c - uncompressor code for self extracing pbl image */
> +
>  #define pr_fmt(fmt) "uncompress.c: " fmt
>  
>  #include <common.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 |