diff options
| author | Tom Rini <trini@konsulko.com> | 2018-05-06 18:27:01 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2018-05-07 10:24:31 -0400 |
| commit | 4549e789c1d58a8c48e8a20f1b4bdb83e978c954 (patch) | |
| tree | 648eaa39815f3a90803d378f87a36ea08f6beb6a /lib | |
| parent | 83d290c56fab2d38cd1ab4c4cc7099559c1d5046 (diff) | |
| download | u-boot-4549e789c1d58a8c48e8a20f1b4bdb83e978c954.tar.gz | |
SPDX: Convert all of our multiple 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 multiple licenses (in
these cases, dual license) declared in the SPDX-License-Identifier tag.
In this case we change from listing "LICENSE-A LICENSE-B" or "LICENSE-A
or LICENSE-B" or "(LICENSE-A OR LICENSE-B)" to "LICENSE-A OR LICENSE-B"
as per the Linux Kernel style document. Note that parenthesis are
allowed so when they were used before we continue to use them.
Reviewed-by: Fabio Estevam <fabio.estevam@nxp.com>
Signed-off-by: Tom Rini <trini@konsulko.com>
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/libfdt/fdt_region.c | 2 | ||||
| -rw-r--r-- | lib/libfdt/fdt_ro.c | 2 | ||||
| -rw-r--r-- | lib/lz4_wrapper.c | 3 |
3 files changed, 3 insertions, 4 deletions
diff --git a/lib/libfdt/fdt_region.c b/lib/libfdt/fdt_region.c index 054c4b302f..d3b9a60e99 100644 --- a/lib/libfdt/fdt_region.c +++ b/lib/libfdt/fdt_region.c @@ -1,8 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0+ OR BSD-2-Clause /* * libfdt - Flat Device Tree manipulation * Copyright (C) 2013 Google, Inc * Written by Simon Glass <sjg@chromium.org> - * SPDX-License-Identifier: GPL-2.0+ BSD-2-Clause */ #include <linux/libfdt_env.h> diff --git a/lib/libfdt/fdt_ro.c b/lib/libfdt/fdt_ro.c index d972d031c6..4b7008d88f 100644 --- a/lib/libfdt/fdt_ro.c +++ b/lib/libfdt/fdt_ro.c @@ -1,7 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0+ OR BSD-2-Clause /* * libfdt - Flat Device Tree manipulation * Copyright (C) 2006 David Gibson, IBM Corporation. - * SPDX-License-Identifier: GPL-2.0+ BSD-2-Clause */ #include <linux/libfdt_env.h> diff --git a/lib/lz4_wrapper.c b/lib/lz4_wrapper.c index 6dc8b764b3..487d39ef02 100644 --- a/lib/lz4_wrapper.c +++ b/lib/lz4_wrapper.c @@ -1,7 +1,6 @@ +// SPDX-License-Identifier: GPL 2.0+ OR BSD-3-Clause /* * Copyright 2015 Google Inc. - * - * SPDX-License-Identifier: GPL 2.0+ BSD-3-Clause */ #include <common.h> |