From 83d290c56fab2d38cd1ab4c4cc7099559c1d5046 Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Sun, 6 May 2018 17:58:06 -0400 Subject: 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 --- tools/dtoc/dtb_platdata.py | 3 +-- tools/dtoc/dtoc.py | 3 +-- tools/dtoc/dtoc_test.dts | 3 +-- tools/dtoc/dtoc_test_addr32.dts | 3 +-- tools/dtoc/dtoc_test_addr32_64.dts | 3 +-- tools/dtoc/dtoc_test_addr64.dts | 3 +-- tools/dtoc/dtoc_test_addr64_32.dts | 3 +-- tools/dtoc/dtoc_test_aliases.dts | 3 +-- tools/dtoc/dtoc_test_empty.dts | 3 +-- tools/dtoc/dtoc_test_phandle.dts | 3 +-- tools/dtoc/dtoc_test_simple.dts | 3 +-- tools/dtoc/fdt.py | 3 +-- tools/dtoc/fdt_util.py | 3 +-- tools/dtoc/test_dtoc.py | 4 +--- 14 files changed, 14 insertions(+), 29 deletions(-) (limited to 'tools/dtoc') diff --git a/tools/dtoc/dtb_platdata.py b/tools/dtoc/dtb_platdata.py index c5767e5fb4..2f7302e529 100644 --- a/tools/dtoc/dtb_platdata.py +++ b/tools/dtoc/dtb_platdata.py @@ -1,10 +1,9 @@ #!/usr/bin/python +# SPDX-License-Identifier: GPL-2.0+ # # Copyright (C) 2017 Google, Inc # Written by Simon Glass # -# SPDX-License-Identifier: GPL-2.0+ -# """Device tree to platform data class diff --git a/tools/dtoc/dtoc.py b/tools/dtoc/dtoc.py index 6eacfc90a0..008c0f4d69 100755 --- a/tools/dtoc/dtoc.py +++ b/tools/dtoc/dtoc.py @@ -1,10 +1,9 @@ #!/usr/bin/env python2 +# SPDX-License-Identifier: GPL-2.0+ # # Copyright (C) 2016 Google, Inc # Written by Simon Glass # -# SPDX-License-Identifier: GPL-2.0+ -# """Device tree to C tool diff --git a/tools/dtoc/dtoc_test.dts b/tools/dtoc/dtoc_test.dts index 1e86655975..b2259483a6 100644 --- a/tools/dtoc/dtoc_test.dts +++ b/tools/dtoc/dtoc_test.dts @@ -1,9 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Test device tree file for dtoc * * Copyright 2017 Google, Inc - * - * SPDX-License-Identifier: GPL-2.0+ */ /dts-v1/; diff --git a/tools/dtoc/dtoc_test_addr32.dts b/tools/dtoc/dtoc_test_addr32.dts index bcfdcae10b..239045497c 100644 --- a/tools/dtoc/dtoc_test_addr32.dts +++ b/tools/dtoc/dtoc_test_addr32.dts @@ -1,9 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Test device tree file for dtoc * * Copyright 2017 Google, Inc - * - * SPDX-License-Identifier: GPL-2.0+ */ /dts-v1/; diff --git a/tools/dtoc/dtoc_test_addr32_64.dts b/tools/dtoc/dtoc_test_addr32_64.dts index 1c96243310..7891ee59fa 100644 --- a/tools/dtoc/dtoc_test_addr32_64.dts +++ b/tools/dtoc/dtoc_test_addr32_64.dts @@ -1,9 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Test device tree file for dtoc * * Copyright 2017 Google, Inc - * - * SPDX-License-Identifier: GPL-2.0+ */ /dts-v1/; diff --git a/tools/dtoc/dtoc_test_addr64.dts b/tools/dtoc/dtoc_test_addr64.dts index 4c0ad0ec36..263d251386 100644 --- a/tools/dtoc/dtoc_test_addr64.dts +++ b/tools/dtoc/dtoc_test_addr64.dts @@ -1,9 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Test device tree file for dtoc * * Copyright 2017 Google, Inc - * - * SPDX-License-Identifier: GPL-2.0+ */ /dts-v1/; diff --git a/tools/dtoc/dtoc_test_addr64_32.dts b/tools/dtoc/dtoc_test_addr64_32.dts index c36f6b726e..759a7e8e26 100644 --- a/tools/dtoc/dtoc_test_addr64_32.dts +++ b/tools/dtoc/dtoc_test_addr64_32.dts @@ -1,9 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Test device tree file for dtoc * * Copyright 2017 Google, Inc - * - * SPDX-License-Identifier: GPL-2.0+ */ /dts-v1/; diff --git a/tools/dtoc/dtoc_test_aliases.dts b/tools/dtoc/dtoc_test_aliases.dts index c727f185af..e545816f4e 100644 --- a/tools/dtoc/dtoc_test_aliases.dts +++ b/tools/dtoc/dtoc_test_aliases.dts @@ -1,9 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Test device tree file for dtoc * * Copyright 2017 Google, Inc - * - * SPDX-License-Identifier: GPL-2.0+ */ /dts-v1/; diff --git a/tools/dtoc/dtoc_test_empty.dts b/tools/dtoc/dtoc_test_empty.dts index 1e86655975..b2259483a6 100644 --- a/tools/dtoc/dtoc_test_empty.dts +++ b/tools/dtoc/dtoc_test_empty.dts @@ -1,9 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Test device tree file for dtoc * * Copyright 2017 Google, Inc - * - * SPDX-License-Identifier: GPL-2.0+ */ /dts-v1/; diff --git a/tools/dtoc/dtoc_test_phandle.dts b/tools/dtoc/dtoc_test_phandle.dts index ba12b0fe65..91dfec5c63 100644 --- a/tools/dtoc/dtoc_test_phandle.dts +++ b/tools/dtoc/dtoc_test_phandle.dts @@ -1,9 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Test device tree file for dtoc * * Copyright 2017 Google, Inc - * - * SPDX-License-Identifier: GPL-2.0+ */ /dts-v1/; diff --git a/tools/dtoc/dtoc_test_simple.dts b/tools/dtoc/dtoc_test_simple.dts index 6afe674b1f..895cc1fea2 100644 --- a/tools/dtoc/dtoc_test_simple.dts +++ b/tools/dtoc/dtoc_test_simple.dts @@ -1,9 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Test device tree file for dtoc * * Copyright 2017 Google, Inc - * - * SPDX-License-Identifier: GPL-2.0+ */ /dts-v1/; diff --git a/tools/dtoc/fdt.py b/tools/dtoc/fdt.py index dbc338653b..7fab0cd8e9 100644 --- a/tools/dtoc/fdt.py +++ b/tools/dtoc/fdt.py @@ -1,10 +1,9 @@ #!/usr/bin/python +# SPDX-License-Identifier: GPL-2.0+ # # Copyright (C) 2016 Google, Inc # Written by Simon Glass # -# SPDX-License-Identifier: GPL-2.0+ -# import struct import sys diff --git a/tools/dtoc/fdt_util.py b/tools/dtoc/fdt_util.py index ad06245b42..2d09649f72 100644 --- a/tools/dtoc/fdt_util.py +++ b/tools/dtoc/fdt_util.py @@ -1,10 +1,9 @@ #!/usr/bin/python +# SPDX-License-Identifier: GPL-2.0+ # # Copyright (C) 2016 Google, Inc # Written by Simon Glass # -# SPDX-License-Identifier: GPL-2.0+ -# import os import struct diff --git a/tools/dtoc/test_dtoc.py b/tools/dtoc/test_dtoc.py index 0553b5cdf9..99f4e1a13a 100644 --- a/tools/dtoc/test_dtoc.py +++ b/tools/dtoc/test_dtoc.py @@ -1,8 +1,6 @@ -# +# SPDX-License-Identifier: GPL-2.0+ # Copyright (c) 2012 The Chromium OS Authors. # -# SPDX-License-Identifier: GPL-2.0+ -# """Tests for the dtb_platdata module -- cgit v1.2.3