mail archive of the barebox mailing list
 help / color / mirror / Atom feed
* [PATCH] arch/arm/lib64: Convert to SPDX-License and -Copyright specifiers
@ 2020-07-10 14:42 Uwe Kleine-König
  2020-07-10 14:51 ` Ahmad Fatoum
  0 siblings, 1 reply; 2+ messages in thread
From: Uwe Kleine-König @ 2020-07-10 14:42 UTC (permalink / raw)
  To: barebox

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@pengutronix.de>
---
 arch/arm/lib64/armlinux.c    | 14 ++------------
 arch/arm/lib64/barebox.lds.S | 18 ++----------------
 arch/arm/lib64/div0.c        | 18 +++---------------
 arch/arm/lib64/setjmp.S      |  4 +---
 arch/arm/lib64/stacktrace.c  | 11 +----------
 5 files changed, 9 insertions(+), 56 deletions(-)

diff --git a/arch/arm/lib64/armlinux.c b/arch/arm/lib64/armlinux.c
index bcff770793e7..a5f122edcd2a 100644
--- a/arch/arm/lib64/armlinux.c
+++ b/arch/arm/lib64/armlinux.c
@@ -1,15 +1,5 @@
-/*
- * Copyright (C) 2018 Sascha Hauer <s.hauer@pengutronix.de>
- *
- * 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
+// SPDX-FileCopyrightText: 2018 Sascha Hauer <s.hauer@pengutronix.de>
 
 #include <boot.h>
 #include <common.h>
diff --git a/arch/arm/lib64/barebox.lds.S b/arch/arm/lib64/barebox.lds.S
index 8ae7bfb71c77..a47b79ced38c 100644
--- a/arch/arm/lib64/barebox.lds.S
+++ b/arch/arm/lib64/barebox.lds.S
@@ -1,19 +1,5 @@
-/*
- * (C) Copyright 2000-2004
- * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
- *
- * 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-2004 Wolfgang Denk <wd@denx.de>, DENX Software Engineering
 
 #include <asm-generic/barebox.lds.h>
 
diff --git a/arch/arm/lib64/div0.c b/arch/arm/lib64/div0.c
index 46f6452419f8..56ecba750c93 100644
--- a/arch/arm/lib64/div0.c
+++ b/arch/arm/lib64/div0.c
@@ -1,18 +1,6 @@
-/*
- * (C) Copyright 2002
- * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
- *
- * 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: 2002 Wolfgang Denk <wd@denx.de>, DENX Software Engineering
+
 #include <common.h>
 
 extern void __div0(void);
diff --git a/arch/arm/lib64/setjmp.S b/arch/arm/lib64/setjmp.S
index a7f6d054170f..0910e2f5a6c3 100644
--- a/arch/arm/lib64/setjmp.S
+++ b/arch/arm/lib64/setjmp.S
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: GPL-2.0+ */
-/*
- * (C) 2017 Theobroma Systems Design und Consulting GmbH
- */
+/* SPDX-FileCopyrightText: 2017 Theobroma Systems Design und Consulting GmbH */
 
 #include <config.h>
 #include <linux/linkage.h>
diff --git a/arch/arm/lib64/stacktrace.c b/arch/arm/lib64/stacktrace.c
index 43911884466d..db5691a6098c 100644
--- a/arch/arm/lib64/stacktrace.c
+++ b/arch/arm/lib64/stacktrace.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 <asm/stacktrace.h>
-- 
2.27.0


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

^ permalink raw reply	[flat|nested] 2+ messages in thread

* Re: [PATCH] arch/arm/lib64: Convert to SPDX-License and -Copyright specifiers
  2020-07-10 14:42 [PATCH] arch/arm/lib64: Convert to SPDX-License and -Copyright specifiers Uwe Kleine-König
@ 2020-07-10 14:51 ` Ahmad Fatoum
  0 siblings, 0 replies; 2+ messages in thread
From: Ahmad Fatoum @ 2020-07-10 14:51 UTC (permalink / raw)
  To: Uwe Kleine-König, barebox

Hello Uwe,

On 7/10/20 4:42 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@pengutronix.de>
> ---
>  arch/arm/lib64/armlinux.c    | 14 ++------------
>  arch/arm/lib64/barebox.lds.S | 18 ++----------------
>  arch/arm/lib64/div0.c        | 18 +++---------------
>  arch/arm/lib64/setjmp.S      |  4 +---
>  arch/arm/lib64/stacktrace.c  | 11 +----------
>  5 files changed, 9 insertions(+), 56 deletions(-)
> 
> diff --git a/arch/arm/lib64/armlinux.c b/arch/arm/lib64/armlinux.c
> index bcff770793e7..a5f122edcd2a 100644
> --- a/arch/arm/lib64/armlinux.c
> +++ b/arch/arm/lib64/armlinux.c
> @@ -1,15 +1,5 @@
> -/*
> - * Copyright (C) 2018 Sascha Hauer <s.hauer@pengutronix.de>
> - *
> - * 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
> +// SPDX-FileCopyrightText: 2018 Sascha Hauer <s.hauer@pengutronix.de>
>  
>  #include <boot.h>
>  #include <common.h>
> diff --git a/arch/arm/lib64/barebox.lds.S b/arch/arm/lib64/barebox.lds.S
> index 8ae7bfb71c77..a47b79ced38c 100644
> --- a/arch/arm/lib64/barebox.lds.S
> +++ b/arch/arm/lib64/barebox.lds.S
> @@ -1,19 +1,5 @@
> -/*
> - * (C) Copyright 2000-2004
> - * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
> - *
> - * 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-2004 Wolfgang Denk <wd@denx.de>, DENX Software Engineering

You can't have // comments in linker scripts. Better use /* */ in .S and .h files.
>  
>  #include <asm-generic/barebox.lds.h>
>  
> diff --git a/arch/arm/lib64/div0.c b/arch/arm/lib64/div0.c
> index 46f6452419f8..56ecba750c93 100644
> --- a/arch/arm/lib64/div0.c
> +++ b/arch/arm/lib64/div0.c
> @@ -1,18 +1,6 @@
> -/*
> - * (C) Copyright 2002
> - * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
> - *
> - * 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: 2002 Wolfgang Denk <wd@denx.de>, DENX Software Engineering
> +
>  #include <common.h>
>  
>  extern void __div0(void);
> diff --git a/arch/arm/lib64/setjmp.S b/arch/arm/lib64/setjmp.S
> index a7f6d054170f..0910e2f5a6c3 100644
> --- a/arch/arm/lib64/setjmp.S
> +++ b/arch/arm/lib64/setjmp.S
> @@ -1,7 +1,5 @@
>  /* SPDX-License-Identifier: GPL-2.0+ */
> -/*
> - * (C) 2017 Theobroma Systems Design und Consulting GmbH
> - */
> +/* SPDX-FileCopyrightText: 2017 Theobroma Systems Design und Consulting GmbH */
>  
>  #include <config.h>
>  #include <linux/linkage.h>
> diff --git a/arch/arm/lib64/stacktrace.c b/arch/arm/lib64/stacktrace.c
> index 43911884466d..db5691a6098c 100644
> --- a/arch/arm/lib64/stacktrace.c
> +++ b/arch/arm/lib64/stacktrace.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 <asm/stacktrace.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@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2020-07-10 14:51 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-07-10 14:42 [PATCH] arch/arm/lib64: Convert to SPDX-License and -Copyright specifiers Uwe Kleine-König
2020-07-10 14:51 ` Ahmad Fatoum

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox