aboutsummaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
Diffstat (limited to 'test')
-rw-r--r--test/Makefile4
-rw-r--r--test/cmd_ut.c3
-rw-r--r--test/command_ut.c3
-rw-r--r--test/compression.c3
-rw-r--r--test/dm/Makefile4
-rw-r--r--test/dm/adc.c3
-rw-r--r--test/dm/blk.c3
-rw-r--r--test/dm/bus.c3
-rw-r--r--test/dm/clk.c3
-rw-r--r--test/dm/cmd_dm.c3
-rw-r--r--test/dm/core.c3
-rw-r--r--test/dm/eth.c3
-rw-r--r--test/dm/gpio.c3
-rw-r--r--test/dm/i2c.c3
-rw-r--r--test/dm/led.c3
-rw-r--r--test/dm/mailbox.c3
-rw-r--r--test/dm/mmc.c3
-rw-r--r--test/dm/pci.c3
-rw-r--r--test/dm/phy.c3
-rw-r--r--test/dm/pmic.c3
-rw-r--r--test/dm/power-domain.c3
-rw-r--r--test/dm/pwm.c3
-rw-r--r--test/dm/ram.c3
-rw-r--r--test/dm/regmap.c3
-rw-r--r--test/dm/regulator.c3
-rw-r--r--test/dm/remoteproc.c2
-rw-r--r--test/dm/reset.c3
-rw-r--r--test/dm/rtc.c3
-rw-r--r--test/dm/sf.c3
-rw-r--r--test/dm/spi.c3
-rw-r--r--test/dm/spmi.c3
-rw-r--r--test/dm/syscon.c3
-rw-r--r--test/dm/sysreset.c3
-rw-r--r--test/dm/test-driver.c3
-rw-r--r--test/dm/test-fdt.c3
-rw-r--r--test/dm/test-main.c3
-rw-r--r--test/dm/test-uclass.c3
-rw-r--r--test/dm/timer.c3
-rw-r--r--test/dm/usb.c3
-rw-r--r--test/dm/video.c3
-rw-r--r--test/dm/wdt.c3
-rw-r--r--test/env/Makefile4
-rw-r--r--test/env/attr.c3
-rw-r--r--test/env/cmd_ut_env.c3
-rwxr-xr-xtest/fs/fat-noncontig-test.sh3
-rwxr-xr-xtest/image/test-imagetools.sh3
-rw-r--r--test/log/Makefile4
-rw-r--r--test/log/log_test.c3
-rw-r--r--test/overlay/Makefile4
-rw-r--r--test/overlay/cmd_ut_overlay.c3
-rw-r--r--test/overlay/test-fdt-base.dts3
-rw-r--r--test/overlay/test-fdt-overlay-stacked.dts3
-rw-r--r--test/overlay/test-fdt-overlay.dts3
-rw-r--r--test/print_ut.c3
-rw-r--r--test/py/conftest.py3
-rw-r--r--test/py/multiplexed_log.css3
-rw-r--r--test/py/multiplexed_log.py3
-rw-r--r--test/py/pytest.ini3
-rwxr-xr-xtest/py/test.py3
-rw-r--r--test/py/tests/test_000_version.py3
-rw-r--r--test/py/tests/test_dfu.py3
-rw-r--r--test/py/tests/test_efi_loader.py3
-rw-r--r--test/py/tests/test_efi_selftest.py3
-rw-r--r--test/py/tests/test_env.py3
-rwxr-xr-xtest/py/tests/test_fit.py3
-rw-r--r--test/py/tests/test_gpt.py3
-rw-r--r--test/py/tests/test_help.py3
-rw-r--r--test/py/tests/test_hush_if_test.py3
-rw-r--r--test/py/tests/test_log.py3
-rw-r--r--test/py/tests/test_md.py3
-rw-r--r--test/py/tests/test_mmc_rd.py3
-rw-r--r--test/py/tests/test_net.py3
-rw-r--r--test/py/tests/test_ofplatdata.py3
-rw-r--r--test/py/tests/test_sandbox_exit.py3
-rw-r--r--test/py/tests/test_sf.py3
-rw-r--r--test/py/tests/test_shell_basics.py3
-rw-r--r--test/py/tests/test_sleep.py3
-rw-r--r--test/py/tests/test_ums.py3
-rw-r--r--test/py/tests/test_unknown_cmd.py3
-rw-r--r--test/py/tests/test_ut.py3
-rw-r--r--test/py/tests/test_vboot.py3
-rw-r--r--test/py/u_boot_console_base.py3
-rw-r--r--test/py/u_boot_console_exec_attach.py3
-rw-r--r--test/py/u_boot_console_sandbox.py3
-rw-r--r--test/py/u_boot_spawn.py3
-rw-r--r--test/py/u_boot_utils.py3
-rw-r--r--test/time_ut.c2
-rwxr-xr-xtest/trace/test-trace.sh4
-rw-r--r--test/ut.c3
89 files changed, 90 insertions, 181 deletions
diff --git a/test/Makefile b/test/Makefile
index 40f2244..1092011 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 6b24f46..934a5a9 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 f76d525..62f2828 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 fe27ad6..7bc0f73 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 513c456..f500bf1 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 85535d9..13eda3b 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 30d1e61..4de477b 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 1da398a..e9a4028 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 d364910..b06906a 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 a3c5971..624fc82 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 052bf8f..c15a840 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 4915baf..1a7684a 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 6b01dbd..bb4b20c 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 e2688bf..772f62b 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 e46b416..89c0c95 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 be7bd6d..4562d2a 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 c8c470c..9ab0db1 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 a5b1290..47b5d22 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 b262531..21d9219 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 0e5d671..b206117 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 379a8fa..a1e1df2 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 cccd1ad..b52ee21 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 3a7c5ff..3efdb6b 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 f83a821..abb718a 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 abd6522..5d11e94 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 0e5f330..3975c67 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 8dc0023..c02866a 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 4345708..e2bc648 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 b084462..35241b9 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 24fa2a4..252b874 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 0ecf702..e6a9108 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 99bff96..77c7928 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 5e94c07..33a8bfb 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 2b432a7..abb5b71 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 0d11bfd..8196844 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 4478e6b..4def795 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 4a543bb..25271c6 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 ba9bdc1..9367dab 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 4e1c870..3493617 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 2f7df4e..ef74c2d 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 0116502..1d31ec5 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 5168bcb..d71a11b 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 45b8c75..8d5c0f1 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 096afa8..54041a0 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 65ed9a5..b02dae7 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 952f975..256af71 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 b0da8de..e0d0a47 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 2c62277..de431b0 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 416645c..2deec92 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 6279e6d..f7ff937 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 2603adb..3827833 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 9fb7c7b..6411ade 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 d30ecdf..5a21b34 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 d8e9da8..fb46db8 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 83eaca4..446d8cb 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 562f69f..3db9927 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 a2cfd71..f23d5de 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 67e514f..7e40068 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 4695079..04baf8d 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 43a02e7..bd089ab 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 8f6877c..a246003 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 906ef2f..35bd419 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 b1ef6bd..747d52d 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 f869401..bfb5fc0 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 4b32bb1..e407ccc 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 886df43..c8edb33 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 420090c..d50295e 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 c8f4208..1196e0a 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 76f9236..d1c2a36 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 5fe2582..83e3c54 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 7ff7622..c5858cb 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 293b73a..f2e432b 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 0660ce4..dd8a09f 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 4e333ec..a301f4b 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 95a7564..adf8b7d 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 0024d5f..f54f7b7 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 ccef24d..b69edf2 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 8c3ee2b..e8eb43c 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 c27ab49..8fc284a 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 5c25a2d..62037d2 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 c4da79d..ee939f2 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 4bccd72..a14bad6 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 445b58d..27834b5 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 647e1f8..a616cfb 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 3a0fbfa..108498a 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 de9ee26..bb31e57 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 8ca9fcb..28c934e 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 746793c..5130b2b 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
diff --git a/test/ut.c b/test/ut.c
index fa0f02d..5579804 100644
--- a/test/ut.c
+++ b/test/ut.c
@@ -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>