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 /include | |
| 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 'include')
| -rw-r--r-- | include/api_public.h | 3 | ||||
| -rw-r--r-- | include/configs/stm32mp1.h | 3 | ||||
| -rw-r--r-- | include/miiphy.h | 3 | ||||
| -rw-r--r-- | include/power/stpmu1.h | 3 | ||||
| -rw-r--r-- | include/ubispl.h | 3 |
5 files changed, 5 insertions, 10 deletions
diff --git a/include/api_public.h b/include/api_public.h index f5c89f3f13..def103ce22 100644 --- a/include/api_public.h +++ b/include/api_public.h @@ -1,9 +1,8 @@ +/* SPDX-License-Identifier: GPL-2.0+ OR BSD-2-Clause */ /* * (C) Copyright 2007-2008 Semihalf * * Written by: Rafal Jaworowski <raj@semihalf.com> - * - * SPDX-License-Identifier: GPL-2.0+ BSD-2-Clause */ #ifndef _API_PUBLIC_H_ diff --git a/include/configs/stm32mp1.h b/include/configs/stm32mp1.h index b2b654ca7a..aea0d9855b 100644 --- a/include/configs/stm32mp1.h +++ b/include/configs/stm32mp1.h @@ -1,9 +1,8 @@ +/* SPDX-License-Identifier: GPL-2.0+ OR BSD-3-Clause */ /* * Copyright (C) 2018, STMicroelectronics - All Rights Reserved * * Configuration settings for the STM32MP15x CPU - * - * SPDX-License-Identifier: GPL-2.0+ BSD-3-Clause */ #ifndef __CONFIG_H diff --git a/include/miiphy.h b/include/miiphy.h index fe8928a3a9..2da28e311a 100644 --- a/include/miiphy.h +++ b/include/miiphy.h @@ -1,6 +1,5 @@ +/* SPDX-License-Identifier: GPL-2.0 OR IBM-pibs */ /* - * SPDX-License-Identifier: GPL-2.0 IBM-pibs - * * Additions (C) Copyright 2009 Industrie Dial Face S.p.A. */ /*----------------------------------------------------------------------------+ diff --git a/include/power/stpmu1.h b/include/power/stpmu1.h index 697e245b56..61c58f3b70 100644 --- a/include/power/stpmu1.h +++ b/include/power/stpmu1.h @@ -1,7 +1,6 @@ +/* SPDX-License-Identifier: GPL-2.0+ OR BSD-3-Clause */ /* * Copyright (C) 2018, STMicroelectronics - All Rights Reserved - * - * SPDX-License-Identifier: GPL-2.0+ BSD-3-Clause */ #ifndef __PMIC_STPMU1_H_ diff --git a/include/ubispl.h b/include/ubispl.h index 944653ed5a..1e5da94eb1 100644 --- a/include/ubispl.h +++ b/include/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_UBISPL_H #define __UBOOT_UBISPL_H |