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 --- test/dm/Makefile | 4 +--- test/dm/adc.c | 3 +-- test/dm/blk.c | 3 +-- test/dm/bus.c | 3 +-- test/dm/clk.c | 3 +-- test/dm/cmd_dm.c | 3 +-- test/dm/core.c | 3 +-- test/dm/eth.c | 3 +-- test/dm/gpio.c | 3 +-- test/dm/i2c.c | 3 +-- test/dm/led.c | 3 +-- test/dm/mailbox.c | 3 +-- test/dm/mmc.c | 3 +-- test/dm/pci.c | 3 +-- test/dm/phy.c | 3 +-- test/dm/pmic.c | 3 +-- test/dm/power-domain.c | 3 +-- test/dm/pwm.c | 3 +-- test/dm/ram.c | 3 +-- test/dm/regmap.c | 3 +-- test/dm/regulator.c | 3 +-- test/dm/remoteproc.c | 2 +- test/dm/reset.c | 3 +-- test/dm/rtc.c | 3 +-- test/dm/sf.c | 3 +-- test/dm/spi.c | 3 +-- test/dm/spmi.c | 3 +-- test/dm/syscon.c | 3 +-- test/dm/sysreset.c | 3 +-- test/dm/test-driver.c | 3 +-- test/dm/test-fdt.c | 3 +-- test/dm/test-main.c | 3 +-- test/dm/test-uclass.c | 3 +-- test/dm/timer.c | 3 +-- test/dm/usb.c | 3 +-- test/dm/video.c | 3 +-- test/dm/wdt.c | 3 +-- 37 files changed, 37 insertions(+), 74 deletions(-) (limited to 'test/dm') diff --git a/test/dm/Makefile b/test/dm/Makefile index 513c4561ad1..f500bf1f88a 100644 --- a/test/dm/Makefile +++ b/test/dm/Makefile @@ -1,8 +1,6 @@ +# SPDX-License-Identifier: GPL-2.0+ # # Copyright (c) 2013 Google, Inc -# -# SPDX-License-Identifier: GPL-2.0+ -# obj-$(CONFIG_CMD_DM) += cmd_dm.o obj-$(CONFIG_UT_DM) += bus.o diff --git a/test/dm/adc.c b/test/dm/adc.c index 85535d9eabc..13eda3bd231 100644 --- a/test/dm/adc.c +++ b/test/dm/adc.c @@ -1,10 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Tests for the driver model ADC API * * Copyright (c) 2015 Samsung Electronics * Przemyslaw Marczak - * - * SPDX-License-Identifier: GPL-2.0+ */ #include diff --git a/test/dm/blk.c b/test/dm/blk.c index 30d1e6184df..4de477bafa3 100644 --- a/test/dm/blk.c +++ b/test/dm/blk.c @@ -1,7 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (C) 2015 Google, Inc - * - * SPDX-License-Identifier: GPL-2.0+ */ #include diff --git a/test/dm/bus.c b/test/dm/bus.c index 1da398ae3a8..e9a4028f047 100644 --- a/test/dm/bus.c +++ b/test/dm/bus.c @@ -1,7 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (c) 2014 Google, Inc - * - * SPDX-License-Identifier: GPL-2.0+ */ #include diff --git a/test/dm/clk.c b/test/dm/clk.c index d3649103ee6..b06906a3ecf 100644 --- a/test/dm/clk.c +++ b/test/dm/clk.c @@ -1,7 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (C) 2015 Google, Inc - * - * SPDX-License-Identifier: GPL-2.0+ */ #include diff --git a/test/dm/cmd_dm.c b/test/dm/cmd_dm.c index a3c5971a8b1..624fc829d8b 100644 --- a/test/dm/cmd_dm.c +++ b/test/dm/cmd_dm.c @@ -1,10 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (c) 2013 Google, Inc * * (C) Copyright 2012 * Marek Vasut - * - * SPDX-License-Identifier: GPL-2.0+ */ #include diff --git a/test/dm/core.c b/test/dm/core.c index 052bf8fffbf..c15a8406c09 100644 --- a/test/dm/core.c +++ b/test/dm/core.c @@ -1,9 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Tests for the core driver model code * * Copyright (c) 2013 Google, Inc - * - * SPDX-License-Identifier: GPL-2.0+ */ #include diff --git a/test/dm/eth.c b/test/dm/eth.c index 4915baf07c3..1a7684a887b 100644 --- a/test/dm/eth.c +++ b/test/dm/eth.c @@ -1,10 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0 /* * Copyright (c) 2015 National Instruments * * (C) Copyright 2015 * Joe Hershberger - * - * SPDX-License-Identifier: GPL-2.0 */ #include diff --git a/test/dm/gpio.c b/test/dm/gpio.c index 6b01dbd73c3..bb4b20cea93 100644 --- a/test/dm/gpio.c +++ b/test/dm/gpio.c @@ -1,7 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (C) 2013 Google, Inc - * - * SPDX-License-Identifier: GPL-2.0+ */ #include diff --git a/test/dm/i2c.c b/test/dm/i2c.c index e2688bfbe9c..772f62b265d 100644 --- a/test/dm/i2c.c +++ b/test/dm/i2c.c @@ -1,8 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (C) 2013 Google, Inc * - * SPDX-License-Identifier: GPL-2.0+ - * * Note: Test coverage does not include 10-bit addressing */ diff --git a/test/dm/led.c b/test/dm/led.c index e46b41674d9..89c0c95855d 100644 --- a/test/dm/led.c +++ b/test/dm/led.c @@ -1,7 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (C) 2015 Google, Inc - * - * SPDX-License-Identifier: GPL-2.0+ */ #include diff --git a/test/dm/mailbox.c b/test/dm/mailbox.c index be7bd6de060..4562d2ac4f8 100644 --- a/test/dm/mailbox.c +++ b/test/dm/mailbox.c @@ -1,7 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0 /* * Copyright (c) 2016, NVIDIA CORPORATION. - * - * SPDX-License-Identifier: GPL-2.0 */ #include diff --git a/test/dm/mmc.c b/test/dm/mmc.c index c8c470c1b1f..9ab0db1b66f 100644 --- a/test/dm/mmc.c +++ b/test/dm/mmc.c @@ -1,7 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (C) 2015 Google, Inc - * - * SPDX-License-Identifier: GPL-2.0+ */ #include diff --git a/test/dm/pci.c b/test/dm/pci.c index a5b12901128..47b5d22af8f 100644 --- a/test/dm/pci.c +++ b/test/dm/pci.c @@ -1,7 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (C) 2015 Google, Inc - * - * SPDX-License-Identifier: GPL-2.0+ */ #include diff --git a/test/dm/phy.c b/test/dm/phy.c index b262531962b..21d92194b97 100644 --- a/test/dm/phy.c +++ b/test/dm/phy.c @@ -1,8 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (C) 2017 Texas Instruments Incorporated - http://www.ti.com/ * Written by Jean-Jacques Hiblot - * - * SPDX-License-Identifier: GPL-2.0+ */ #include diff --git a/test/dm/pmic.c b/test/dm/pmic.c index 0e5d6719248..b2061178fca 100644 --- a/test/dm/pmic.c +++ b/test/dm/pmic.c @@ -1,10 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Tests for the driver model pmic API * * Copyright (c) 2015 Samsung Electronics * Przemyslaw Marczak - * - * SPDX-License-Identifier: GPL-2.0+ */ #include diff --git a/test/dm/power-domain.c b/test/dm/power-domain.c index 379a8fa3d6e..a1e1df2bb21 100644 --- a/test/dm/power-domain.c +++ b/test/dm/power-domain.c @@ -1,7 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0 /* * Copyright (c) 2016, NVIDIA CORPORATION. - * - * SPDX-License-Identifier: GPL-2.0 */ #include diff --git a/test/dm/pwm.c b/test/dm/pwm.c index cccd1ad1620..b52ee21a69e 100644 --- a/test/dm/pwm.c +++ b/test/dm/pwm.c @@ -1,7 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (C) 2017 Google, Inc - * - * SPDX-License-Identifier: GPL-2.0+ */ #include diff --git a/test/dm/ram.c b/test/dm/ram.c index 3a7c5fffddd..3efdb6b80b2 100644 --- a/test/dm/ram.c +++ b/test/dm/ram.c @@ -1,7 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (C) 2015 Google, Inc - * - * SPDX-License-Identifier: GPL-2.0+ */ #include diff --git a/test/dm/regmap.c b/test/dm/regmap.c index f83a8211122..abb718a89e0 100644 --- a/test/dm/regmap.c +++ b/test/dm/regmap.c @@ -1,7 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (C) 2015 Google, Inc - * - * SPDX-License-Identifier: GPL-2.0+ */ #include diff --git a/test/dm/regulator.c b/test/dm/regulator.c index abd65221371..5d11e946b29 100644 --- a/test/dm/regulator.c +++ b/test/dm/regulator.c @@ -1,10 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Tests for the driver model regulator API * * Copyright (c) 2015 Samsung Electronics * Przemyslaw Marczak - * - * SPDX-License-Identifier: GPL-2.0+ */ #include diff --git a/test/dm/remoteproc.c b/test/dm/remoteproc.c index 0e5f3305a25..3975c670f7b 100644 --- a/test/dm/remoteproc.c +++ b/test/dm/remoteproc.c @@ -1,7 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * (C) Copyright 2015 * Texas Instruments Incorporated - http://www.ti.com/ - * SPDX-License-Identifier: GPL-2.0+ */ #include #include diff --git a/test/dm/reset.c b/test/dm/reset.c index 8dc0023c080..c02866a2f0a 100644 --- a/test/dm/reset.c +++ b/test/dm/reset.c @@ -1,7 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0 /* * Copyright (c) 2016, NVIDIA CORPORATION. - * - * SPDX-License-Identifier: GPL-2.0 */ #include diff --git a/test/dm/rtc.c b/test/dm/rtc.c index 4345708a3db..e2bc648fdcf 100644 --- a/test/dm/rtc.c +++ b/test/dm/rtc.c @@ -1,7 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (C) 2015 Google, Inc - * - * SPDX-License-Identifier: GPL-2.0+ * Written by Simon Glass */ diff --git a/test/dm/sf.c b/test/dm/sf.c index b0844629f9e..35241b9f574 100644 --- a/test/dm/sf.c +++ b/test/dm/sf.c @@ -1,7 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (C) 2013 Google, Inc - * - * SPDX-License-Identifier: GPL-2.0+ */ #include diff --git a/test/dm/spi.c b/test/dm/spi.c index 24fa2a48ae9..252b87431fb 100644 --- a/test/dm/spi.c +++ b/test/dm/spi.c @@ -1,7 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (C) 2013 Google, Inc - * - * SPDX-License-Identifier: GPL-2.0+ */ #include diff --git a/test/dm/spmi.c b/test/dm/spmi.c index 0ecf70259b9..e6a910859e3 100644 --- a/test/dm/spmi.c +++ b/test/dm/spmi.c @@ -1,7 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * (C) Copyright 2015 Mateusz Kulikowski - * - * SPDX-License-Identifier: GPL-2.0+ */ #include diff --git a/test/dm/syscon.c b/test/dm/syscon.c index 99bff962a9a..77c79285d93 100644 --- a/test/dm/syscon.c +++ b/test/dm/syscon.c @@ -1,7 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (C) 2015 Google, Inc - * - * SPDX-License-Identifier: GPL-2.0+ */ #include diff --git a/test/dm/sysreset.c b/test/dm/sysreset.c index 5e94c072b65..33a8bfb33c4 100644 --- a/test/dm/sysreset.c +++ b/test/dm/sysreset.c @@ -1,7 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (C) 2015 Google, Inc - * - * SPDX-License-Identifier: GPL-2.0+ */ #include diff --git a/test/dm/test-driver.c b/test/dm/test-driver.c index 2b432a71fd6..abb5b7115a3 100644 --- a/test/dm/test-driver.c +++ b/test/dm/test-driver.c @@ -1,10 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (c) 2013 Google, Inc * * (C) Copyright 2012 * Pavel Herrmann - * - * SPDX-License-Identifier: GPL-2.0+ */ #include diff --git a/test/dm/test-fdt.c b/test/dm/test-fdt.c index 0d11bfdb2f9..8196844e89a 100644 --- a/test/dm/test-fdt.c +++ b/test/dm/test-fdt.c @@ -1,7 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (c) 2013 Google, Inc - * - * SPDX-License-Identifier: GPL-2.0+ */ #include diff --git a/test/dm/test-main.c b/test/dm/test-main.c index 4478e6b8fc6..4def795c798 100644 --- a/test/dm/test-main.c +++ b/test/dm/test-main.c @@ -1,7 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (c) 2013 Google, Inc - * - * SPDX-License-Identifier: GPL-2.0+ */ #include diff --git a/test/dm/test-uclass.c b/test/dm/test-uclass.c index 4a543bb6218..25271c6ba04 100644 --- a/test/dm/test-uclass.c +++ b/test/dm/test-uclass.c @@ -1,10 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (c) 2013 Google, Inc * * (C) Copyright 2012 * Pavel Herrmann - * - * SPDX-License-Identifier: GPL-2.0+ */ #include diff --git a/test/dm/timer.c b/test/dm/timer.c index ba9bdc10cae..9367dab5d5e 100644 --- a/test/dm/timer.c +++ b/test/dm/timer.c @@ -1,7 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (C) 2015 Thomas Chou - * - * SPDX-License-Identifier: GPL-2.0+ */ #include diff --git a/test/dm/usb.c b/test/dm/usb.c index 4e1c870408a..34936175449 100644 --- a/test/dm/usb.c +++ b/test/dm/usb.c @@ -1,7 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (C) 2015 Google, Inc - * - * SPDX-License-Identifier: GPL-2.0+ */ #include diff --git a/test/dm/video.c b/test/dm/video.c index 2f7df4e6115..ef74c2de721 100644 --- a/test/dm/video.c +++ b/test/dm/video.c @@ -1,8 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (c) 2014 Google, Inc * Written by Simon Glass - * - * SPDX-License-Identifier: GPL-2.0+ */ #include diff --git a/test/dm/wdt.c b/test/dm/wdt.c index 01165022c19..1d31ec55c64 100644 --- a/test/dm/wdt.c +++ b/test/dm/wdt.c @@ -1,7 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright 2017 Google, Inc - * - * SPDX-License-Identifier: GPL-2.0+ */ #include -- cgit v1.2.3