diff options
| author | Tom Rini <trini@konsulko.com> | 2018-05-06 17:58:06 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2018-05-07 09:34:12 -0400 |
| commit | 83d290c56fab2d38cd1ab4c4cc7099559c1d5046 (patch) | |
| tree | 5e5d1b40b52aaf96b707e0da2474573306d22f7b /test | |
| parent | 7ce85318cfff5fd82a059131761559cba7fef309 (diff) | |
| download | u-boot-83d290c56fab2d38cd1ab4c4cc7099559c1d5046.tar.gz u-boot-83d290c56fab2d38cd1ab4c4cc7099559c1d5046.tar.bz2 u-boot-83d290c56fab2d38cd1ab4c4cc7099559c1d5046.zip | |
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 <trini@konsulko.com>
Diffstat (limited to 'test')
89 files changed, 90 insertions, 181 deletions
diff --git a/test/Makefile b/test/Makefile index 40f2244b79..1092011fdb 100644 --- a/test/Makefile +++ b/test/Makefile @@ -1,8 +1,6 @@ +# SPDX-License-Identifier: GPL-2.0+ # # (C) Copyright 2012 The Chromium Authors -# -# SPDX-License-Identifier: GPL-2.0+ -# obj-$(CONFIG_UNIT_TEST) += cmd_ut.o obj-$(CONFIG_UNIT_TEST) += ut.o diff --git a/test/cmd_ut.c b/test/cmd_ut.c index 6b24f463f3..934a5a931b 100644 --- a/test/cmd_ut.c +++ b/test/cmd_ut.c @@ -1,8 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0 /* * (C) Copyright 2015 * Joe Hershberger, National Instruments, joe.hershberger@ni.com - * - * SPDX-License-Identifier: GPL-2.0 */ #include <common.h> diff --git a/test/command_ut.c b/test/command_ut.c index f76d52569d..62f2828b7c 100644 --- a/test/command_ut.c +++ b/test/command_ut.c @@ -1,7 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (c) 2012, The Chromium Authors - * - * SPDX-License-Identifier: GPL-2.0+ */ #define DEBUG diff --git a/test/compression.c b/test/compression.c index fe27ad66ea..7bc0f73e09 100644 --- a/test/compression.c +++ b/test/compression.c @@ -1,7 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (c) 2013, The Chromium Authors - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/test/dm/Makefile b/test/dm/Makefile index 513c4561ad..f500bf1f88 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 85535d9eab..13eda3bd23 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 <p.marczak@samsung.com> - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/test/dm/blk.c b/test/dm/blk.c index 30d1e6184d..4de477bafa 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 <common.h> diff --git a/test/dm/bus.c b/test/dm/bus.c index 1da398ae3a..e9a4028f04 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 <common.h> diff --git a/test/dm/clk.c b/test/dm/clk.c index d3649103ee..b06906a3ec 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 <common.h> diff --git a/test/dm/cmd_dm.c b/test/dm/cmd_dm.c index a3c5971a8b..624fc829d8 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 <marex@denx.de> - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/test/dm/core.c b/test/dm/core.c index 052bf8fffb..c15a8406c0 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 <common.h> diff --git a/test/dm/eth.c b/test/dm/eth.c index 4915baf07c..1a7684a887 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 <joe.hershberger@ni.com> - * - * SPDX-License-Identifier: GPL-2.0 */ #include <common.h> diff --git a/test/dm/gpio.c b/test/dm/gpio.c index 6b01dbd73c..bb4b20cea9 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 <common.h> diff --git a/test/dm/i2c.c b/test/dm/i2c.c index e2688bfbe9..772f62b265 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 e46b41674d..89c0c95855 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 <common.h> diff --git a/test/dm/mailbox.c b/test/dm/mailbox.c index be7bd6de06..4562d2ac4f 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 <common.h> diff --git a/test/dm/mmc.c b/test/dm/mmc.c index c8c470c1b1..9ab0db1b66 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 <common.h> diff --git a/test/dm/pci.c b/test/dm/pci.c index a5b1290112..47b5d22af8 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 <common.h> diff --git a/test/dm/phy.c b/test/dm/phy.c index b262531962..21d92194b9 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 <jjhiblot@ti.com> - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/test/dm/pmic.c b/test/dm/pmic.c index 0e5d671924..b2061178fc 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 <p.marczak@samsung.com> - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/test/dm/power-domain.c b/test/dm/power-domain.c index 379a8fa3d6..a1e1df2bb2 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 <common.h> diff --git a/test/dm/pwm.c b/test/dm/pwm.c index cccd1ad162..b52ee21a69 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 <common.h> diff --git a/test/dm/ram.c b/test/dm/ram.c index 3a7c5fffdd..3efdb6b80b 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 <common.h> diff --git a/test/dm/regmap.c b/test/dm/regmap.c index f83a821112..abb718a89e 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 <common.h> diff --git a/test/dm/regulator.c b/test/dm/regulator.c index abd6522137..5d11e946b2 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 <p.marczak@samsung.com> - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/test/dm/remoteproc.c b/test/dm/remoteproc.c index 0e5f3305a2..3975c670f7 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 <common.h> #include <dm.h> diff --git a/test/dm/reset.c b/test/dm/reset.c index 8dc0023c08..c02866a2f0 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 <common.h> diff --git a/test/dm/rtc.c b/test/dm/rtc.c index 4345708a3d..e2bc648fdc 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 <sjg@chromium.org> */ diff --git a/test/dm/sf.c b/test/dm/sf.c index b0844629f9..35241b9f57 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 <common.h> diff --git a/test/dm/spi.c b/test/dm/spi.c index 24fa2a48ae..252b87431f 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 <common.h> diff --git a/test/dm/spmi.c b/test/dm/spmi.c index 0ecf70259b..e6a910859e 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 <mateusz.kulikowski@gmail.com> - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/test/dm/syscon.c b/test/dm/syscon.c index 99bff962a9..77c79285d9 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 <common.h> diff --git a/test/dm/sysreset.c b/test/dm/sysreset.c index 5e94c072b6..33a8bfb33c 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 <common.h> diff --git a/test/dm/test-driver.c b/test/dm/test-driver.c index 2b432a71fd..abb5b7115a 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 <morpheus.ibis@gmail.com> - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/test/dm/test-fdt.c b/test/dm/test-fdt.c index 0d11bfdb2f..8196844e89 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 <common.h> diff --git a/test/dm/test-main.c b/test/dm/test-main.c index 4478e6b8fc..4def795c79 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 <common.h> diff --git a/test/dm/test-uclass.c b/test/dm/test-uclass.c index 4a543bb621..25271c6ba0 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 <morpheus.ibis@gmail.com> - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/test/dm/timer.c b/test/dm/timer.c index ba9bdc10ca..9367dab5d5 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 <thomas@wytron.com.tw> - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/test/dm/usb.c b/test/dm/usb.c index 4e1c870408..3493617544 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 <common.h> diff --git a/test/dm/video.c b/test/dm/video.c index 2f7df4e611..ef74c2de72 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 <sjg@chromium.org> - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/test/dm/wdt.c b/test/dm/wdt.c index 01165022c1..1d31ec55c6 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 <common.h> diff --git a/test/env/Makefile b/test/env/Makefile index 5168bcb328..d71a11b6e2 100644 --- a/test/env/Makefile +++ b/test/env/Makefile @@ -1,8 +1,6 @@ +# SPDX-License-Identifier: GPL-2.0+ # # Copyright (c) 2015 National Instruments, Inc -# -# SPDX-License-Identifier: GPL-2.0+ -# obj-y += cmd_ut_env.o obj-y += attr.o diff --git a/test/env/attr.c b/test/env/attr.c index 45b8c753a4..8d5c0f1c3d 100644 --- a/test/env/attr.c +++ b/test/env/attr.c @@ -1,8 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0 /* * (C) Copyright 2015 * Joe Hershberger, National Instruments, joe.hershberger@ni.com - * - * SPDX-License-Identifier: GPL-2.0 */ #include <common.h> diff --git a/test/env/cmd_ut_env.c b/test/env/cmd_ut_env.c index 096afa83dd..54041a0219 100644 --- a/test/env/cmd_ut_env.c +++ b/test/env/cmd_ut_env.c @@ -1,8 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0 /* * (C) Copyright 2015 * Joe Hershberger, National Instruments, joe.hershberger@ni.com - * - * SPDX-License-Identifier: GPL-2.0 */ #include <common.h> diff --git a/test/fs/fat-noncontig-test.sh b/test/fs/fat-noncontig-test.sh index 65ed9a54bd..b02dae765f 100755 --- a/test/fs/fat-noncontig-test.sh +++ b/test/fs/fat-noncontig-test.sh @@ -1,8 +1,7 @@ #!/bin/bash +# SPDX-License-Identifier: GPL-2.0+ # (C) Copyright 2015 Stephen Warren -# -# SPDX-License-Identifier: GPL-2.0+ # This script tests U-Boot's FAT filesystem code's ability to read non- # contiguous files. diff --git a/test/image/test-imagetools.sh b/test/image/test-imagetools.sh index 952f975af1..256af71d42 100755 --- a/test/image/test-imagetools.sh +++ b/test/image/test-imagetools.sh @@ -1,11 +1,10 @@ #!/bin/bash +# SPDX-License-Identifier: GPL-2.0+ # # Written by Guilherme Maciel Ferreira <guilherme.maciel.ferreira@gmail.com> # # Sanity check for mkimage and dumpimage tools # -# SPDX-License-Identifier: GPL-2.0+ -# # To run this: # # make O=sandbox sandbox_config diff --git a/test/log/Makefile b/test/log/Makefile index b0da8dee28..e0d0a4745f 100644 --- a/test/log/Makefile +++ b/test/log/Makefile @@ -1,7 +1,5 @@ +# SPDX-License-Identifier: GPL-2.0+ # # Copyright (c) 2017 Google, Inc -# -# SPDX-License-Identifier: GPL-2.0+ -# obj-$(CONFIG_LOG_TEST) += log_test.o diff --git a/test/log/log_test.c b/test/log/log_test.c index 2c6227703f..de431b0823 100644 --- a/test/log/log_test.c +++ b/test/log/log_test.c @@ -1,10 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Logging support test program * * Copyright (c) 2017 Google, Inc * Written by Simon Glass <sjg@chromium.org> - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/test/overlay/Makefile b/test/overlay/Makefile index 416645c884..2deec929ab 100644 --- a/test/overlay/Makefile +++ b/test/overlay/Makefile @@ -1,9 +1,7 @@ +# SPDX-License-Identifier: GPL-2.0+ # # Copyright (c) 2016 NextThing Co # Copyright (c) 2016 Free Electrons -# -# SPDX-License-Identifier: GPL-2.0+ -# # Test files obj-y += cmd_ut_overlay.o diff --git a/test/overlay/cmd_ut_overlay.c b/test/overlay/cmd_ut_overlay.c index 6279e6d0c2..f7ff93799f 100644 --- a/test/overlay/cmd_ut_overlay.c +++ b/test/overlay/cmd_ut_overlay.c @@ -1,8 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (c) 2016 NextThing Co * Copyright (c) 2016 Free Electrons - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/test/overlay/test-fdt-base.dts b/test/overlay/test-fdt-base.dts index 2603adb682..38278334e4 100644 --- a/test/overlay/test-fdt-base.dts +++ b/test/overlay/test-fdt-base.dts @@ -1,8 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (c) 2016 NextThing Co * Copyright (c) 2016 Free Electrons - * - * SPDX-License-Identifier: GPL-2.0+ */ /dts-v1/; diff --git a/test/overlay/test-fdt-overlay-stacked.dts b/test/overlay/test-fdt-overlay-stacked.dts index 9fb7c7b017..6411adec53 100644 --- a/test/overlay/test-fdt-overlay-stacked.dts +++ b/test/overlay/test-fdt-overlay-stacked.dts @@ -1,9 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (c) 2016 NextThing Co * Copyright (c) 2016 Free Electrons * Copyright (c) 2018 Konsulko Group - * - * SPDX-License-Identifier: GPL-2.0+ */ /dts-v1/; diff --git a/test/overlay/test-fdt-overlay.dts b/test/overlay/test-fdt-overlay.dts index d30ecdf366..5a21b346d0 100644 --- a/test/overlay/test-fdt-overlay.dts +++ b/test/overlay/test-fdt-overlay.dts @@ -1,8 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (c) 2016 NextThing Co * Copyright (c) 2016 Free Electrons - * - * SPDX-License-Identifier: GPL-2.0+ */ /dts-v1/; diff --git a/test/print_ut.c b/test/print_ut.c index d8e9da8fa8..fb46db832e 100644 --- a/test/print_ut.c +++ b/test/print_ut.c @@ -1,7 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (c) 2012, The Chromium Authors - * - * SPDX-License-Identifier: GPL-2.0+ */ #define DEBUG diff --git a/test/py/conftest.py b/test/py/conftest.py index 83eaca46a9..446d8cb6fa 100644 --- a/test/py/conftest.py +++ b/test/py/conftest.py @@ -1,7 +1,6 @@ +# SPDX-License-Identifier: GPL-2.0 # Copyright (c) 2015 Stephen Warren # Copyright (c) 2015-2016, NVIDIA CORPORATION. All rights reserved. -# -# SPDX-License-Identifier: GPL-2.0 # Implementation of pytest run-time hook functions. These are invoked by # pytest at certain points during operation, e.g. startup, for each executed diff --git a/test/py/multiplexed_log.css b/test/py/multiplexed_log.css index 562f69f3b6..3db9927223 100644 --- a/test/py/multiplexed_log.css +++ b/test/py/multiplexed_log.css @@ -1,8 +1,7 @@ +/* SPDX-License-Identifier: GPL-2.0 */ /* * Copyright (c) 2015 Stephen Warren * Copyright (c) 2016, NVIDIA CORPORATION. All rights reserved. - * - * SPDX-License-Identifier: GPL-2.0 */ /* diff --git a/test/py/multiplexed_log.py b/test/py/multiplexed_log.py index a2cfd71746..f23d5dec68 100644 --- a/test/py/multiplexed_log.py +++ b/test/py/multiplexed_log.py @@ -1,7 +1,6 @@ +# SPDX-License-Identifier: GPL-2.0 # Copyright (c) 2015 Stephen Warren # Copyright (c) 2015-2016, NVIDIA CORPORATION. All rights reserved. -# -# SPDX-License-Identifier: GPL-2.0 # Generate an HTML-formatted log file containing multiple streams of data, # each represented in a well-delineated/-structured fashion. diff --git a/test/py/pytest.ini b/test/py/pytest.ini index 67e514f420..7e400682bf 100644 --- a/test/py/pytest.ini +++ b/test/py/pytest.ini @@ -1,7 +1,6 @@ +# SPDX-License-Identifier: GPL-2.0 # Copyright (c) 2015 Stephen Warren # Copyright (c) 2015-2016, NVIDIA CORPORATION. All rights reserved. -# -# SPDX-License-Identifier: GPL-2.0 # Static configuration data for pytest. pytest reads this at startup time. diff --git a/test/py/test.py b/test/py/test.py index 4695079ef7..04baf8df3b 100755 --- a/test/py/test.py +++ b/test/py/test.py @@ -1,9 +1,8 @@ #!/usr/bin/env python2 +# SPDX-License-Identifier: GPL-2.0 # Copyright (c) 2015 Stephen Warren # Copyright (c) 2015-2016, NVIDIA CORPORATION. All rights reserved. -# -# SPDX-License-Identifier: GPL-2.0 # Wrapper script to invoke pytest with the directory name that contains the # U-Boot tests. diff --git a/test/py/tests/test_000_version.py b/test/py/tests/test_000_version.py index 43a02e74f7..bd089ab543 100644 --- a/test/py/tests/test_000_version.py +++ b/test/py/tests/test_000_version.py @@ -1,7 +1,6 @@ +# SPDX-License-Identifier: GPL-2.0 # Copyright (c) 2015 Stephen Warren # Copyright (c) 2016, NVIDIA CORPORATION. All rights reserved. -# -# SPDX-License-Identifier: GPL-2.0 # pytest runs tests the order of their module path, which is related to the # filename containing the test. This file is named such that it is sorted diff --git a/test/py/tests/test_dfu.py b/test/py/tests/test_dfu.py index 8f6877c5c2..a24600376c 100644 --- a/test/py/tests/test_dfu.py +++ b/test/py/tests/test_dfu.py @@ -1,6 +1,5 @@ -# Copyright (c) 2016, NVIDIA CORPORATION. All rights reserved. -# # SPDX-License-Identifier: GPL-2.0 +# Copyright (c) 2016, NVIDIA CORPORATION. All rights reserved. # Test U-Boot's "dfu" command. The test starts DFU in U-Boot, waits for USB # device enumeration on the host, executes dfu-util multiple times to test diff --git a/test/py/tests/test_efi_loader.py b/test/py/tests/test_efi_loader.py index 906ef2feaa..35bd4194ae 100644 --- a/test/py/tests/test_efi_loader.py +++ b/test/py/tests/test_efi_loader.py @@ -1,9 +1,8 @@ +# SPDX-License-Identifier: GPL-2.0 # Copyright (c) 2016, NVIDIA CORPORATION. All rights reserved. # Copyright (c) 2016, Alexander Graf <agraf@suse.de> # # based on test_net.py. -# -# SPDX-License-Identifier: GPL-2.0 # Test efi loader implementation diff --git a/test/py/tests/test_efi_selftest.py b/test/py/tests/test_efi_selftest.py index b1ef6bd581..747d52d935 100644 --- a/test/py/tests/test_efi_selftest.py +++ b/test/py/tests/test_efi_selftest.py @@ -1,6 +1,5 @@ -# Copyright (c) 2017, Heinrich Schuchardt <xypron.glpk@gmx.de> -# # SPDX-License-Identifier: GPL-2.0 +# Copyright (c) 2017, Heinrich Schuchardt <xypron.glpk@gmx.de> # Test efi API implementation diff --git a/test/py/tests/test_env.py b/test/py/tests/test_env.py index f8694017b4..bfb5fc0d69 100644 --- a/test/py/tests/test_env.py +++ b/test/py/tests/test_env.py @@ -1,7 +1,6 @@ +# SPDX-License-Identifier: GPL-2.0 # Copyright (c) 2015 Stephen Warren # Copyright (c) 2015-2016, NVIDIA CORPORATION. All rights reserved. -# -# SPDX-License-Identifier: GPL-2.0 # Test operation of shell commands relating to environment variables. diff --git a/test/py/tests/test_fit.py b/test/py/tests/test_fit.py index 4b32bb18b8..e407ccc05a 100755 --- a/test/py/tests/test_fit.py +++ b/test/py/tests/test_fit.py @@ -1,6 +1,5 @@ -# Copyright (c) 2013, Google Inc. -# # SPDX-License-Identifier: GPL-2.0+ +# Copyright (c) 2013, Google Inc. # # Sanity check of the FIT handling in U-Boot diff --git a/test/py/tests/test_gpt.py b/test/py/tests/test_gpt.py index 886df43f8b..c8edb33642 100644 --- a/test/py/tests/test_gpt.py +++ b/test/py/tests/test_gpt.py @@ -1,7 +1,6 @@ +# SPDX-License-Identifier: GPL-2.0 # Copyright (c) 2017 Alison Chaiken # Copyright (c) 2017, NVIDIA CORPORATION. All rights reserved. -# -# SPDX-License-Identifier: GPL-2.0 # Test GPT manipulation commands. diff --git a/test/py/tests/test_help.py b/test/py/tests/test_help.py index 420090cf0d..d50295e5bd 100644 --- a/test/py/tests/test_help.py +++ b/test/py/tests/test_help.py @@ -1,7 +1,6 @@ +# SPDX-License-Identifier: GPL-2.0 # Copyright (c) 2015 Stephen Warren # Copyright (c) 2016, NVIDIA CORPORATION. All rights reserved. -# -# SPDX-License-Identifier: GPL-2.0 def test_help(u_boot_console): """Test that the "help" command can be executed.""" diff --git a/test/py/tests/test_hush_if_test.py b/test/py/tests/test_hush_if_test.py index c8f4208d31..1196e0a53f 100644 --- a/test/py/tests/test_hush_if_test.py +++ b/test/py/tests/test_hush_if_test.py @@ -1,6 +1,5 @@ -# Copyright (c) 2015-2016, NVIDIA CORPORATION. All rights reserved. -# # SPDX-License-Identifier: GPL-2.0 +# Copyright (c) 2015-2016, NVIDIA CORPORATION. All rights reserved. # Test operation of the "if" shell command. diff --git a/test/py/tests/test_log.py b/test/py/tests/test_log.py index 76f9236412..d1c2a36d8f 100644 --- a/test/py/tests/test_log.py +++ b/test/py/tests/test_log.py @@ -1,7 +1,6 @@ +# SPDX-License-Identifier: GPL-2.0+ # Copyright (c) 2016, Google Inc. # -# SPDX-License-Identifier: GPL-2.0+ -# # U-Boot Verified Boot Test """ diff --git a/test/py/tests/test_md.py b/test/py/tests/test_md.py index 5fe25826b3..83e3c546f4 100644 --- a/test/py/tests/test_md.py +++ b/test/py/tests/test_md.py @@ -1,7 +1,6 @@ +# SPDX-License-Identifier: GPL-2.0 # Copyright (c) 2015 Stephen Warren # Copyright (c) 2015-2016, NVIDIA CORPORATION. All rights reserved. -# -# SPDX-License-Identifier: GPL-2.0 import pytest import u_boot_utils diff --git a/test/py/tests/test_mmc_rd.py b/test/py/tests/test_mmc_rd.py index 7ff76228e2..c5858cb089 100644 --- a/test/py/tests/test_mmc_rd.py +++ b/test/py/tests/test_mmc_rd.py @@ -1,6 +1,5 @@ -# Copyright (c) 2018, NVIDIA CORPORATION. All rights reserved. -# # SPDX-License-Identifier: GPL-2.0 +# Copyright (c) 2018, NVIDIA CORPORATION. All rights reserved. # Test U-Boot's "mmc read" command. The test reads data from the eMMC or SD # card, and validates the no errors occurred, and that the expected data was diff --git a/test/py/tests/test_net.py b/test/py/tests/test_net.py index 293b73a496..f2e432b6af 100644 --- a/test/py/tests/test_net.py +++ b/test/py/tests/test_net.py @@ -1,6 +1,5 @@ -# Copyright (c) 2016, NVIDIA CORPORATION. All rights reserved. -# # SPDX-License-Identifier: GPL-2.0 +# Copyright (c) 2016, NVIDIA CORPORATION. All rights reserved. # Test various network-related functionality, such as the dhcp, ping, and # tftpboot commands. diff --git a/test/py/tests/test_ofplatdata.py b/test/py/tests/test_ofplatdata.py index 0660ce41d8..dd8a09f032 100644 --- a/test/py/tests/test_ofplatdata.py +++ b/test/py/tests/test_ofplatdata.py @@ -1,6 +1,5 @@ -# Copyright (c) 2016 Google, Inc -# # SPDX-License-Identifier: GPL-2.0+ +# Copyright (c) 2016 Google, Inc import pytest diff --git a/test/py/tests/test_sandbox_exit.py b/test/py/tests/test_sandbox_exit.py index 4e333ecedb..a301f4b559 100644 --- a/test/py/tests/test_sandbox_exit.py +++ b/test/py/tests/test_sandbox_exit.py @@ -1,7 +1,6 @@ +# SPDX-License-Identifier: GPL-2.0 # Copyright (c) 2015 Stephen Warren # Copyright (c) 2015-2016, NVIDIA CORPORATION. All rights reserved. -# -# SPDX-License-Identifier: GPL-2.0 import pytest import signal diff --git a/test/py/tests/test_sf.py b/test/py/tests/test_sf.py index 95a7564907..adf8b7dc89 100644 --- a/test/py/tests/test_sf.py +++ b/test/py/tests/test_sf.py @@ -1,7 +1,6 @@ +# SPDX-License-Identifier: GPL-2.0 # Copyright (c) 2016, Xilinx Inc. Michal Simek # Copyright (c) 2017, Xiphos Systems Corp. All rights reserved. -# -# SPDX-License-Identifier: GPL-2.0 import re import pytest diff --git a/test/py/tests/test_shell_basics.py b/test/py/tests/test_shell_basics.py index 0024d5f7f6..f54f7b7425 100644 --- a/test/py/tests/test_shell_basics.py +++ b/test/py/tests/test_shell_basics.py @@ -1,6 +1,5 @@ -# Copyright (c) 2015-2016, NVIDIA CORPORATION. All rights reserved. -# # SPDX-License-Identifier: GPL-2.0 +# Copyright (c) 2015-2016, NVIDIA CORPORATION. All rights reserved. # Test basic shell functionality, such as commands separate by semi-colons. diff --git a/test/py/tests/test_sleep.py b/test/py/tests/test_sleep.py index ccef24d7f7..b69edf26ef 100644 --- a/test/py/tests/test_sleep.py +++ b/test/py/tests/test_sleep.py @@ -1,6 +1,5 @@ -# Copyright (c) 2016, NVIDIA CORPORATION. All rights reserved. -# # SPDX-License-Identifier: GPL-2.0 +# Copyright (c) 2016, NVIDIA CORPORATION. All rights reserved. import pytest import time diff --git a/test/py/tests/test_ums.py b/test/py/tests/test_ums.py index 8c3ee2b053..e8eb43c76b 100644 --- a/test/py/tests/test_ums.py +++ b/test/py/tests/test_ums.py @@ -1,6 +1,5 @@ -# Copyright (c) 2015-2016, NVIDIA CORPORATION. All rights reserved. -# # SPDX-License-Identifier: GPL-2.0 +# Copyright (c) 2015-2016, NVIDIA CORPORATION. All rights reserved. # Test U-Boot's "ums" command. The test starts UMS in U-Boot, waits for USB # device enumeration on the host, reads a small block of data from the UMS diff --git a/test/py/tests/test_unknown_cmd.py b/test/py/tests/test_unknown_cmd.py index c27ab49d55..8fc284a924 100644 --- a/test/py/tests/test_unknown_cmd.py +++ b/test/py/tests/test_unknown_cmd.py @@ -1,7 +1,6 @@ +# SPDX-License-Identifier: GPL-2.0 # Copyright (c) 2015 Stephen Warren # Copyright (c) 2016, NVIDIA CORPORATION. All rights reserved. -# -# SPDX-License-Identifier: GPL-2.0 def test_unknown_command(u_boot_console): """Test that executing an unknown command causes U-Boot to print an diff --git a/test/py/tests/test_ut.py b/test/py/tests/test_ut.py index 5c25a2d465..62037d2c45 100644 --- a/test/py/tests/test_ut.py +++ b/test/py/tests/test_ut.py @@ -1,6 +1,5 @@ -# Copyright (c) 2016, NVIDIA CORPORATION. All rights reserved. -# # SPDX-License-Identifier: GPL-2.0 +# Copyright (c) 2016, NVIDIA CORPORATION. All rights reserved. import os.path import pytest diff --git a/test/py/tests/test_vboot.py b/test/py/tests/test_vboot.py index c4da79d114..ee939f2034 100644 --- a/test/py/tests/test_vboot.py +++ b/test/py/tests/test_vboot.py @@ -1,6 +1,5 @@ -# Copyright (c) 2016, Google Inc. -# # SPDX-License-Identifier: GPL-2.0+ +# Copyright (c) 2016, Google Inc. # # U-Boot Verified Boot Test diff --git a/test/py/u_boot_console_base.py b/test/py/u_boot_console_base.py index 4bccd72050..a14bad6e8c 100644 --- a/test/py/u_boot_console_base.py +++ b/test/py/u_boot_console_base.py @@ -1,7 +1,6 @@ +# SPDX-License-Identifier: GPL-2.0 # Copyright (c) 2015 Stephen Warren # Copyright (c) 2015-2016, NVIDIA CORPORATION. All rights reserved. -# -# SPDX-License-Identifier: GPL-2.0 # Common logic to interact with U-Boot via the console. This class provides # the interface that tests use to execute U-Boot shell commands and wait for diff --git a/test/py/u_boot_console_exec_attach.py b/test/py/u_boot_console_exec_attach.py index 445b58dda6..27834b55cd 100644 --- a/test/py/u_boot_console_exec_attach.py +++ b/test/py/u_boot_console_exec_attach.py @@ -1,7 +1,6 @@ +# SPDX-License-Identifier: GPL-2.0 # Copyright (c) 2015 Stephen Warren # Copyright (c) 2015-2016, NVIDIA CORPORATION. All rights reserved. -# -# SPDX-License-Identifier: GPL-2.0 # Logic to interact with U-Boot running on real hardware, typically via a # physical serial port. diff --git a/test/py/u_boot_console_sandbox.py b/test/py/u_boot_console_sandbox.py index 647e1f879f..a616cfb49f 100644 --- a/test/py/u_boot_console_sandbox.py +++ b/test/py/u_boot_console_sandbox.py @@ -1,7 +1,6 @@ +# SPDX-License-Identifier: GPL-2.0 # Copyright (c) 2015 Stephen Warren # Copyright (c) 2015-2016, NVIDIA CORPORATION. All rights reserved. -# -# SPDX-License-Identifier: GPL-2.0 # Logic to interact with the sandbox port of U-Boot, running as a sub-process. diff --git a/test/py/u_boot_spawn.py b/test/py/u_boot_spawn.py index 3a0fbfad90..108498a9a4 100644 --- a/test/py/u_boot_spawn.py +++ b/test/py/u_boot_spawn.py @@ -1,6 +1,5 @@ -# Copyright (c) 2015-2016, NVIDIA CORPORATION. All rights reserved. -# # SPDX-License-Identifier: GPL-2.0 +# Copyright (c) 2015-2016, NVIDIA CORPORATION. All rights reserved. # Logic to spawn a sub-process and interact with its stdio. diff --git a/test/py/u_boot_utils.py b/test/py/u_boot_utils.py index de9ee2643f..bb31e57b27 100644 --- a/test/py/u_boot_utils.py +++ b/test/py/u_boot_utils.py @@ -1,6 +1,5 @@ -# Copyright (c) 2016, NVIDIA CORPORATION. All rights reserved. -# # SPDX-License-Identifier: GPL-2.0 +# Copyright (c) 2016, NVIDIA CORPORATION. All rights reserved. # Utility code shared across multiple tests. diff --git a/test/time_ut.c b/test/time_ut.c index 8ca9fcb6aa..28c934e426 100644 --- a/test/time_ut.c +++ b/test/time_ut.c @@ -1,7 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (c) 2015 Google, Inc * Written by Simon Glass <sjg@chromium.org> - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/test/trace/test-trace.sh b/test/trace/test-trace.sh index 746793c83b..5130b2bf01 100755 --- a/test/trace/test-trace.sh +++ b/test/trace/test-trace.sh @@ -1,7 +1,7 @@ +#!/bin/bash +# SPDX-License-Identifier: GPL-2.0+ # Copyright (c) 2013 The Chromium OS Authors. # -# SPDX-License-Identifier: GPL-2.0+ -# # Simple test script for tracing with sandbox @@ -1,9 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Simple unit test library * * Copyright (c) 2013 Google, Inc - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> |