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 /tools/env | |
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 'tools/env')
-rw-r--r-- | tools/env/Makefile | 4 | ||||
-rw-r--r-- | tools/env/fw_env.c | 3 | ||||
-rw-r--r-- | tools/env/fw_env.h | 3 | ||||
-rw-r--r-- | tools/env/fw_env_main.c | 3 | ||||
-rw-r--r-- | tools/env/fw_env_private.h | 3 |
5 files changed, 5 insertions, 11 deletions
diff --git a/tools/env/Makefile b/tools/env/Makefile index 95a03c98e7..4633e0e72b 100644 --- a/tools/env/Makefile +++ b/tools/env/Makefile @@ -1,9 +1,7 @@ +# SPDX-License-Identifier: GPL-2.0+ # # (C) Copyright 2002-2006 # Wolfgang Denk, DENX Software Engineering, wd@denx.de. -# -# SPDX-License-Identifier: GPL-2.0+ -# # fw_printenv is supposed to run on the target system, which means it should be # built with cross tools. Although it may look weird, we only replace "HOSTCC" diff --git a/tools/env/fw_env.c b/tools/env/fw_env.c index 77eac3d6c1..4b2caf6960 100644 --- a/tools/env/fw_env.c +++ b/tools/env/fw_env.c @@ -1,11 +1,10 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * (C) Copyright 2000-2010 * Wolfgang Denk, DENX Software Engineering, wd@denx.de. * * (C) Copyright 2008 * Guennadi Liakhovetski, DENX Software Engineering, lg@denx.de. - * - * SPDX-License-Identifier: GPL-2.0+ */ #define _GNU_SOURCE diff --git a/tools/env/fw_env.h b/tools/env/fw_env.h index b86ca78ba2..b250e2f3d7 100644 --- a/tools/env/fw_env.h +++ b/tools/env/fw_env.h @@ -1,8 +1,7 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * (C) Copyright 2002-2008 * Wolfgang Denk, DENX Software Engineering, wd@denx.de. - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <stdint.h> diff --git a/tools/env/fw_env_main.c b/tools/env/fw_env_main.c index fb4afa5ee9..26ba6624cd 100644 --- a/tools/env/fw_env_main.c +++ b/tools/env/fw_env_main.c @@ -1,8 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * (C) Copyright 2000-2008 * Wolfgang Denk, DENX Software Engineering, wd@denx.de. - * - * SPDX-License-Identifier: GPL-2.0+ */ /* diff --git a/tools/env/fw_env_private.h b/tools/env/fw_env_private.h index 0c27da0b86..86be16dabc 100644 --- a/tools/env/fw_env_private.h +++ b/tools/env/fw_env_private.h @@ -1,8 +1,7 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * (C) Copyright 2002-2008 * Wolfgang Denk, DENX Software Engineering, wd@denx.de. - * - * SPDX-License-Identifier: GPL-2.0+ */ /* Pull in the current config to define the default environment */ |