summaryrefslogtreecommitdiff
path: root/examples
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2018-05-06 17:58:06 -0400
committerTom Rini <trini@konsulko.com>2018-05-07 09:34:12 -0400
commit83d290c56fab2d38cd1ab4c4cc7099559c1d5046 (patch)
tree5e5d1b40b52aaf96b707e0da2474573306d22f7b /examples
parent7ce85318cfff5fd82a059131761559cba7fef309 (diff)
SPDX: Convert all of our single license tags to Linux Kernel style
When U-Boot started using SPDX tags we were among the early adopters and there weren't a lot of other examples to borrow from. So we picked the area of the file that usually had a full license text and replaced it with an appropriate SPDX-License-Identifier: entry. Since then, the Linux Kernel has adopted SPDX tags and they place it as the very first line in a file (except where shebangs are used, then it's second line) and with slightly different comment styles than us. In part due to community overlap, in part due to better tag visibility and in part for other minor reasons, switch over to that style. This commit changes all instances where we have a single declared license in the tag as both the before and after are identical in tag contents. There's also a few places where I found we did not have a tag and have introduced one. Signed-off-by: Tom Rini <trini@konsulko.com>
Diffstat (limited to 'examples')
-rw-r--r--examples/Makefile4
-rw-r--r--examples/api/Makefile4
-rw-r--r--examples/api/crt0.S3
-rw-r--r--examples/api/demo.c3
-rw-r--r--examples/api/glue.c3
-rw-r--r--examples/api/glue.h3
-rw-r--r--examples/api/libgenwrap.c3
-rw-r--r--examples/standalone/Makefile4
-rw-r--r--examples/standalone/hello_world.c3
-rw-r--r--examples/standalone/mips.lds3
-rw-r--r--examples/standalone/mips64.lds3
-rw-r--r--examples/standalone/nds32.lds3
-rw-r--r--examples/standalone/ppc_longjmp.S3
-rw-r--r--examples/standalone/ppc_setjmp.S3
-rw-r--r--examples/standalone/riscv.lds3
-rw-r--r--examples/standalone/sched.c4
-rw-r--r--examples/standalone/smc91111_eeprom.c3
-rw-r--r--examples/standalone/sparc.lds3
18 files changed, 18 insertions, 40 deletions
diff --git a/examples/Makefile b/examples/Makefile
index 8e329d7cd5d..d440bc56553 100644
--- a/examples/Makefile
+++ b/examples/Makefile
@@ -1,6 +1,4 @@
-#
-# SPDX-License-Identifier: GPL-2.0+
-#
+# SPDX-License-Identifier: GPL-2.0+
ifndef CONFIG_SANDBOX
diff --git a/examples/api/Makefile b/examples/api/Makefile
index 9068727b98b..476ca7103c5 100644
--- a/examples/api/Makefile
+++ b/examples/api/Makefile
@@ -1,8 +1,6 @@
+# SPDX-License-Identifier: GPL-2.0+
#
# (C) Copyright 2007 Semihalf
-#
-# SPDX-License-Identifier: GPL-2.0+
-#
# Provide symbol API_BUILD to signal that the API example is being built.
KBUILD_CPPFLAGS += -DAPI_BUILD
diff --git a/examples/api/crt0.S b/examples/api/crt0.S
index 5a7049d6b4b..57bba9d851d 100644
--- a/examples/api/crt0.S
+++ b/examples/api/crt0.S
@@ -1,9 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* (C) Copyright 2007 Semihalf
*
* Written by: Rafal Jaworowski <raj@semihalf.com>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#if defined(CONFIG_PPC)
diff --git a/examples/api/demo.c b/examples/api/demo.c
index 8c30457ce7f..e177bf17eb1 100644
--- a/examples/api/demo.c
+++ b/examples/api/demo.c
@@ -1,9 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0+
/*
* (C) Copyright 2007-2008 Semihalf
*
* Written by: Rafal Jaworowski <raj@semihalf.com>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#include <common.h>
diff --git a/examples/api/glue.c b/examples/api/glue.c
index 575c1e55f33..9c8ed8d11cf 100644
--- a/examples/api/glue.c
+++ b/examples/api/glue.c
@@ -1,7 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0+
/*
* (C) Copyright 2007-2008 Semihalf, Rafal Jaworowski <raj@semihalf.com>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#include <common.h>
diff --git a/examples/api/glue.h b/examples/api/glue.h
index 91c8c1ca630..f9745604b6c 100644
--- a/examples/api/glue.h
+++ b/examples/api/glue.h
@@ -1,9 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* (C) Copyright 2007 Semihalf
*
* Written by: Rafal Jaworowski <raj@semihalf.com>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
/*
diff --git a/examples/api/libgenwrap.c b/examples/api/libgenwrap.c
index ba51007b14a..67b2d641fc7 100644
--- a/examples/api/libgenwrap.c
+++ b/examples/api/libgenwrap.c
@@ -1,10 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0+
/*
* (C) Copyright 2007 Semihalf
*
* Written by: Rafal Jaworowski <raj@semihalf.com>
*
- * SPDX-License-Identifier: GPL-2.0+
- *
* This is is a set of wrappers/stubs that allow to use certain routines from
* U-Boot's lib in the standalone app. This way way we can re-use
* existing code e.g. operations on strings and similar.
diff --git a/examples/standalone/Makefile b/examples/standalone/Makefile
index c9d6206f291..09364d84a0a 100644
--- a/examples/standalone/Makefile
+++ b/examples/standalone/Makefile
@@ -1,9 +1,7 @@
+# SPDX-License-Identifier: GPL-2.0+
#
# (C) Copyright 2000-2006
# Wolfgang Denk, DENX Software Engineering, wd@denx.de.
-#
-# SPDX-License-Identifier: GPL-2.0+
-#
extra-y := hello_world
extra-$(CONFIG_SMC91111) += smc91111_eeprom
diff --git a/examples/standalone/hello_world.c b/examples/standalone/hello_world.c
index bd8b392315b..1f61bb47772 100644
--- a/examples/standalone/hello_world.c
+++ b/examples/standalone/hello_world.c
@@ -1,8 +1,7 @@
+// SPDX-License-Identifier: GPL-2.0+
/*
* (C) Copyright 2000
* Wolfgang Denk, DENX Software Engineering, wd@denx.de.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#include <common.h>
diff --git a/examples/standalone/mips.lds b/examples/standalone/mips.lds
index 849f0aabf42..163d6efefd8 100644
--- a/examples/standalone/mips.lds
+++ b/examples/standalone/mips.lds
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* (C) Copyright 2003
* Wolfgang Denk Engineering, <wd@denx.de>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
/*
diff --git a/examples/standalone/mips64.lds b/examples/standalone/mips64.lds
index 865effd7e7b..d67396ab713 100644
--- a/examples/standalone/mips64.lds
+++ b/examples/standalone/mips64.lds
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* (C) Copyright 2003
* Wolfgang Denk Engineering, <wd@denx.de>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
/*
diff --git a/examples/standalone/nds32.lds b/examples/standalone/nds32.lds
index 3097a16911b..5a04f43c9a6 100644
--- a/examples/standalone/nds32.lds
+++ b/examples/standalone/nds32.lds
@@ -1,9 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2011 Andes Technology Corporation
* Shawn Lin, Andes Technology Corporation <nobuhiro@andestech.com>
* Macpaul Lin, Andes Technology Corporation <macpaul@andestech.com>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
OUTPUT_FORMAT("elf32-nds32", "elf32-nds32", "elf32-nds32")
diff --git a/examples/standalone/ppc_longjmp.S b/examples/standalone/ppc_longjmp.S
index bf01daae88d..50dc2b9456c 100644
--- a/examples/standalone/ppc_longjmp.S
+++ b/examples/standalone/ppc_longjmp.S
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: LGPL-2.1+ */
/* longjmp for PowerPC.
Copyright (C) 1995, 1996, 1997, 1999, 2000 Free Software Foundation, Inc.
This file is part of the GNU C Library.
-
- * SPDX-License-Identifier: LGPL-2.1+
*/
#include <ppc_asm.tmpl>
diff --git a/examples/standalone/ppc_setjmp.S b/examples/standalone/ppc_setjmp.S
index 29c295bd3b6..d538fb0f2cc 100644
--- a/examples/standalone/ppc_setjmp.S
+++ b/examples/standalone/ppc_setjmp.S
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: LGPL-2.1+ */
/* setjmp for PowerPC.
Copyright (C) 1995, 1996, 1997, 1999, 2000 Free Software Foundation, Inc.
This file is part of the GNU C Library.
-
- * SPDX-License-Identifier: LGPL-2.1+
*/
#include <ppc_asm.tmpl>
diff --git a/examples/standalone/riscv.lds b/examples/standalone/riscv.lds
index 7d8c482250d..9a25861052d 100644
--- a/examples/standalone/riscv.lds
+++ b/examples/standalone/riscv.lds
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2017 Andes Technology Corporation
* Rick Chen, Andes Technology Corporation <rick@andestech.com>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
OUTPUT_ARCH(riscv)
diff --git a/examples/standalone/sched.c b/examples/standalone/sched.c
index f2c49612769..1c529607132 100644
--- a/examples/standalone/sched.c
+++ b/examples/standalone/sched.c
@@ -1,6 +1,4 @@
-/*
- * SPDX-License-Identifier: GPL-2.0+
- */
+// SPDX-License-Identifier: GPL-2.0+
#include <common.h>
#include <exports.h>
diff --git a/examples/standalone/smc91111_eeprom.c b/examples/standalone/smc91111_eeprom.c
index 38fadede1e2..5ffefc8f36b 100644
--- a/examples/standalone/smc91111_eeprom.c
+++ b/examples/standalone/smc91111_eeprom.c
@@ -1,9 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0+
/*
* (C) Copyright 2004
* Robin Getz rgetz@blacfin.uclinux.org
*
- * SPDX-License-Identifier: GPL-2.0+
- *
* Heavily borrowed from the following peoples GPL'ed software:
* - Wolfgang Denk, DENX Software Engineering, wd@denx.de
* Das U-Boot
diff --git a/examples/standalone/sparc.lds b/examples/standalone/sparc.lds
index 7461edaa427..30719a3c43a 100644
--- a/examples/standalone/sparc.lds
+++ b/examples/standalone/sparc.lds
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* (C) Copyright 2003, Psyent Corporation <www.psyent.com>
* Scott McNutt <smcnutt@psyent.com>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/