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 /net | |
| parent | 7ce85318cfff5fd82a059131761559cba7fef309 (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 'net')
| -rw-r--r-- | net/Makefile | 4 | ||||
| -rw-r--r-- | net/checksum.c | 3 | ||||
| -rw-r--r-- | net/dns.h | 3 | ||||
| -rw-r--r-- | net/eth-uclass.c | 3 | ||||
| -rw-r--r-- | net/eth_common.c | 3 | ||||
| -rw-r--r-- | net/eth_internal.h | 3 | ||||
| -rw-r--r-- | net/eth_legacy.c | 3 | ||||
| -rw-r--r-- | net/nfs.h | 3 | ||||
| -rw-r--r-- | net/rarp.c | 3 | ||||
| -rw-r--r-- | net/rarp.h | 3 | ||||
| -rw-r--r-- | net/sntp.h | 3 |
11 files changed, 11 insertions, 23 deletions
diff --git a/net/Makefile b/net/Makefile index ce6e5adfa5..d1e8e01f62 100644 --- a/net/Makefile +++ b/net/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+ -# #ccflags-y += -DDEBUG diff --git a/net/checksum.c b/net/checksum.c index a8c9ff5ea4..16ef416356 100644 --- a/net/checksum.c +++ b/net/checksum.c @@ -1,11 +1,10 @@ +// SPDX-License-Identifier: BSD-2-Clause /* * This file was originally taken from the FreeBSD project. * * Copyright (c) 2001 Charles Mott <cm@linktel.net> * Copyright (c) 2008 coresystems GmbH * All rights reserved. - * - * SPDX-License-Identifier: BSD-2-Clause */ #include <common.h> @@ -1,8 +1,7 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * (C) Masami Komiya <mkomiya@sonare.it> 2005 * Copyright 2009, Robin Getz <rgetz@blackfin.uclinux.org> - * - * SPDX-License-Identifier: GPL-2.0+ */ #ifndef __DNS_H__ diff --git a/net/eth-uclass.c b/net/eth-uclass.c index 240b596534..d20a1cf160 100644 --- a/net/eth-uclass.c +++ b/net/eth-uclass.c @@ -1,9 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * (C) Copyright 2001-2015 * Wolfgang Denk, DENX Software Engineering, wd@denx.de. * Joe Hershberger, National Instruments - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/net/eth_common.c b/net/eth_common.c index 0af91a9642..63f9379eec 100644 --- a/net/eth_common.c +++ b/net/eth_common.c @@ -1,9 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * (C) Copyright 2001-2015 * Wolfgang Denk, DENX Software Engineering, wd@denx.de. * Joe Hershberger, National Instruments - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/net/eth_internal.h b/net/eth_internal.h index 4b0e716b73..faff0ef866 100644 --- a/net/eth_internal.h +++ b/net/eth_internal.h @@ -1,9 +1,8 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * (C) Copyright 2001-2015 * Wolfgang Denk, DENX Software Engineering, wd@denx.de. * Joe Hershberger, National Instruments - * - * SPDX-License-Identifier: GPL-2.0+ */ #ifndef __ETH_INTERNAL_H diff --git a/net/eth_legacy.c b/net/eth_legacy.c index be0cf64a3d..2a9caa3509 100644 --- a/net/eth_legacy.c +++ b/net/eth_legacy.c @@ -1,9 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * (C) Copyright 2001-2015 * Wolfgang Denk, DENX Software Engineering, wd@denx.de. * Joe Hershberger, National Instruments - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> @@ -1,7 +1,6 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * (C) Masami Komiya <mkomiya@sonare.it> 2004 - * - * SPDX-License-Identifier: GPL-2.0+ */ #ifndef __NFS_H__ diff --git a/net/rarp.c b/net/rarp.c index 1fa11b690d..c1d9fcaf25 100644 --- a/net/rarp.c +++ b/net/rarp.c @@ -1,8 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * (C) Copyright 2000-2002 * Wolfgang Denk, DENX Software Engineering, wd@denx.de. - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/net/rarp.h b/net/rarp.h index 1ca8833ce5..de4504e5d8 100644 --- a/net/rarp.h +++ b/net/rarp.h @@ -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+ */ #if defined(CONFIG_CMD_RARP) diff --git a/net/sntp.h b/net/sntp.h index c38bceed3f..d3cbfbc69a 100644 --- a/net/sntp.h +++ b/net/sntp.h @@ -1,7 +1,6 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * (C) Masami Komiya <mkomiya@sonare.it> 2005 - * - * SPDX-License-Identifier: GPL-2.0+ */ #ifndef __SNTP_H__ |