summaryrefslogtreecommitdiff
path: root/scripts/dtc
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2018-05-06 18:27:01 -0400
committerTom Rini <trini@konsulko.com>2018-05-07 10:24:31 -0400
commit4549e789c1d58a8c48e8a20f1b4bdb83e978c954 (patch)
tree648eaa39815f3a90803d378f87a36ea08f6beb6a /scripts/dtc
parent83d290c56fab2d38cd1ab4c4cc7099559c1d5046 (diff)
downloadu-boot-4549e789c1d58a8c48e8a20f1b4bdb83e978c954.tar.gz
u-boot-4549e789c1d58a8c48e8a20f1b4bdb83e978c954.tar.bz2
u-boot-4549e789c1d58a8c48e8a20f1b4bdb83e978c954.zip
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 'scripts/dtc')
-rw-r--r--scripts/dtc/pylibfdt/libfdt.i_shipped3
1 files changed, 1 insertions, 2 deletions
diff --git a/scripts/dtc/pylibfdt/libfdt.i_shipped b/scripts/dtc/pylibfdt/libfdt.i_shipped
index 5b1a8cf4d4..2c1c987c1d 100644
--- a/scripts/dtc/pylibfdt/libfdt.i_shipped
+++ b/scripts/dtc/pylibfdt/libfdt.i_shipped
@@ -1,9 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0+ OR BSD-2-Clause */
/*
* pylibfdt - Flat Device Tree manipulation in Python
* Copyright (C) 2017 Google, Inc.
* Written by Simon Glass <sjg@chromium.org>
- *
- * SPDX-License-Identifier: GPL-2.0+ BSD-2-Clause
*/
%module libfdt