diff options
author | Tom Rini <trini@konsulko.com> | 2018-05-06 17:58:06 -0400 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2018-05-07 09:34:12 -0400 |
commit | 83d290c56fab2d38cd1ab4c4cc7099559c1d5046 (patch) | |
tree | 5e5d1b40b52aaf96b707e0da2474573306d22f7b /examples | |
parent | 7ce85318cfff5fd82a059131761559cba7fef309 (diff) | |
download | u-boot-83d290c56fab2d38cd1ab4c4cc7099559c1d5046.tar.gz |
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/Makefile | 4 | ||||
-rw-r--r-- | examples/api/Makefile | 4 | ||||
-rw-r--r-- | examples/api/crt0.S | 3 | ||||
-rw-r--r-- | examples/api/demo.c | 3 | ||||
-rw-r--r-- | examples/api/glue.c | 3 | ||||
-rw-r--r-- | examples/api/glue.h | 3 | ||||
-rw-r--r-- | examples/api/libgenwrap.c | 3 | ||||
-rw-r--r-- | examples/standalone/Makefile | 4 | ||||
-rw-r--r-- | examples/standalone/hello_world.c | 3 | ||||
-rw-r--r-- | examples/standalone/mips.lds | 3 | ||||
-rw-r--r-- | examples/standalone/mips64.lds | 3 | ||||
-rw-r--r-- | examples/standalone/nds32.lds | 3 | ||||
-rw-r--r-- | examples/standalone/ppc_longjmp.S | 3 | ||||
-rw-r--r-- | examples/standalone/ppc_setjmp.S | 3 | ||||
-rw-r--r-- | examples/standalone/riscv.lds | 3 | ||||
-rw-r--r-- | examples/standalone/sched.c | 4 | ||||
-rw-r--r-- | examples/standalone/smc91111_eeprom.c | 3 | ||||
-rw-r--r-- | examples/standalone/sparc.lds | 3 |
18 files changed, 18 insertions, 40 deletions
diff --git a/examples/Makefile b/examples/Makefile index 8e329d7cd5..d440bc5655 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 9068727b98..476ca7103c 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 5a7049d6b4..57bba9d851 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 8c30457ce7..e177bf17eb 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 575c1e55f3..9c8ed8d11c 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 91c8c1ca63..f9745604b6 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 ba51007b14..67b2d641fc 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 c9d6206f29..09364d84a0 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 bd8b392315..1f61bb4777 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 849f0aabf4..163d6efefd 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 865effd7e7..d67396ab71 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 3097a16911..5a04f43c9a 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 bf01daae88..50dc2b9456 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 29c295bd3b..d538fb0f2c 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 7d8c482250..9a25861052 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 f2c4961276..1c52960713 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 38fadede1e..5ffefc8f36 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 7461edaa42..30719a3c43 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+ */ |