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 /drivers/mtd | |
| parent | 83d290c56fab2d38cd1ab4c4cc7099559c1d5046 (diff) | |
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 'drivers/mtd')
| -rw-r--r-- | drivers/mtd/ubispl/ubi-wrapper.h | 3 | ||||
| -rw-r--r-- | drivers/mtd/ubispl/ubispl.c | 3 | ||||
| -rw-r--r-- | drivers/mtd/ubispl/ubispl.h | 3 |
3 files changed, 3 insertions, 6 deletions
diff --git a/drivers/mtd/ubispl/ubi-wrapper.h b/drivers/mtd/ubispl/ubi-wrapper.h index 72b9dcb76d..b58f42dd1a 100644 --- a/drivers/mtd/ubispl/ubi-wrapper.h +++ b/drivers/mtd/ubispl/ubi-wrapper.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL 2.0+ OR BSD-3-Clause */ /* * The parts taken from the kernel implementation are: * @@ -6,8 +7,6 @@ * UBISPL specific defines: * * Copyright (c) Thomas Gleixner <tglx@linutronix.de> - * - * SPDX-License-Identifier: GPL 2.0+ BSD-3-Clause */ /* diff --git a/drivers/mtd/ubispl/ubispl.c b/drivers/mtd/ubispl/ubispl.c index a81a8e715d..eeb1cbefb7 100644 --- a/drivers/mtd/ubispl/ubispl.c +++ b/drivers/mtd/ubispl/ubispl.c @@ -1,11 +1,10 @@ +// SPDX-License-Identifier: GPL-2.0+ OR BSD-3-Clause /* * Copyright (c) Thomas Gleixner <tglx@linutronix.de> * * The parts taken from the kernel implementation are: * * Copyright (c) International Business Machines Corp., 2006 - * - * SPDX-License-Identifier: GPL 2.0+ BSD-3-Clause */ #include <common.h> diff --git a/drivers/mtd/ubispl/ubispl.h b/drivers/mtd/ubispl/ubispl.h index 9227881f63..9e40b46eac 100644 --- a/drivers/mtd/ubispl/ubispl.h +++ b/drivers/mtd/ubispl/ubispl.h @@ -1,7 +1,6 @@ +/* SPDX-License-Identifier: GPL 2.0+ OR BSD-3-Clause */ /* * Copyright (c) Thomas Gleixner <tglx@linutronix.de> - * - * SPDX-License-Identifier: GPL 2.0+ BSD-3-Clause */ #ifndef _UBOOT_MTD_UBISPL_H |