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 --- lib/efi_selftest/efi_selftest.c | 3 +-- lib/efi_selftest/efi_selftest_bitblt.c | 3 +-- lib/efi_selftest/efi_selftest_block_device.c | 3 +-- lib/efi_selftest/efi_selftest_console.c | 3 +-- lib/efi_selftest/efi_selftest_controllers.c | 3 +-- lib/efi_selftest/efi_selftest_devicepath.c | 3 +-- lib/efi_selftest/efi_selftest_devicepath_util.c | 3 +-- lib/efi_selftest/efi_selftest_event_groups.c | 3 +-- lib/efi_selftest/efi_selftest_events.c | 3 +-- lib/efi_selftest/efi_selftest_exitbootservices.c | 3 +-- lib/efi_selftest/efi_selftest_fdt.c | 3 +-- lib/efi_selftest/efi_selftest_gop.c | 3 +-- lib/efi_selftest/efi_selftest_manageprotocols.c | 3 +-- lib/efi_selftest/efi_selftest_miniapp_exit.c | 3 +-- lib/efi_selftest/efi_selftest_miniapp_return.c | 3 +-- lib/efi_selftest/efi_selftest_snp.c | 3 +-- lib/efi_selftest/efi_selftest_startimage_exit.c | 3 +-- lib/efi_selftest/efi_selftest_startimage_return.c | 3 +-- lib/efi_selftest/efi_selftest_textinput.c | 3 +-- lib/efi_selftest/efi_selftest_textoutput.c | 3 +-- lib/efi_selftest/efi_selftest_tpl.c | 3 +-- lib/efi_selftest/efi_selftest_util.c | 3 +-- lib/efi_selftest/efi_selftest_watchdog.c | 3 +-- 23 files changed, 23 insertions(+), 46 deletions(-) (limited to 'lib/efi_selftest') diff --git a/lib/efi_selftest/efi_selftest.c b/lib/efi_selftest/efi_selftest.c index fd4fee726f..13eb2cd604 100644 --- a/lib/efi_selftest/efi_selftest.c +++ b/lib/efi_selftest/efi_selftest.c @@ -1,9 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * EFI efi_selftest * * Copyright (c) 2017 Heinrich Schuchardt - * - * SPDX-License-Identifier: GPL-2.0+ */ #include diff --git a/lib/efi_selftest/efi_selftest_bitblt.c b/lib/efi_selftest/efi_selftest_bitblt.c index 0fb76cc727..9033109807 100644 --- a/lib/efi_selftest/efi_selftest_bitblt.c +++ b/lib/efi_selftest/efi_selftest_bitblt.c @@ -1,10 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * efi_selftest_bitblt * * Copyright (c) 2017 Heinrich Schuchardt * - * SPDX-License-Identifier: GPL-2.0+ - * * Test the block image transfer in the graphical output protocol. * An animated submarine is shown. */ diff --git a/lib/efi_selftest/efi_selftest_block_device.c b/lib/efi_selftest/efi_selftest_block_device.c index a8979ed56b..4af8bd8cb2 100644 --- a/lib/efi_selftest/efi_selftest_block_device.c +++ b/lib/efi_selftest/efi_selftest_block_device.c @@ -1,10 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * efi_selftest_block * * Copyright (c) 2017 Heinrich Schuchardt * - * SPDX-License-Identifier: GPL-2.0+ - * * This test checks the driver for block IO devices. * A disk image is created in memory. * A handle is created for the new block IO device. diff --git a/lib/efi_selftest/efi_selftest_console.c b/lib/efi_selftest/efi_selftest_console.c index e1649f48bc..c3655a1fcc 100644 --- a/lib/efi_selftest/efi_selftest_console.c +++ b/lib/efi_selftest/efi_selftest_console.c @@ -1,9 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * EFI efi_selftest * * Copyright (c) 2017 Heinrich Schuchardt - * - * SPDX-License-Identifier: GPL-2.0+ */ #include diff --git a/lib/efi_selftest/efi_selftest_controllers.c b/lib/efi_selftest/efi_selftest_controllers.c index 1a22aba6f4..e30c11b1e4 100644 --- a/lib/efi_selftest/efi_selftest_controllers.c +++ b/lib/efi_selftest/efi_selftest_controllers.c @@ -1,10 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * efi_selftest_controllers * * Copyright (c) 2017 Heinrich Schuchardt * - * SPDX-License-Identifier: GPL-2.0+ - * * This unit test checks the following protocol services: * ConnectController, DisconnectController, * InstallProtocol, UninstallProtocol, diff --git a/lib/efi_selftest/efi_selftest_devicepath.c b/lib/efi_selftest/efi_selftest_devicepath.c index da68102eb2..adcf531e90 100644 --- a/lib/efi_selftest/efi_selftest_devicepath.c +++ b/lib/efi_selftest/efi_selftest_devicepath.c @@ -1,10 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * efi_selftest_devicepath * * Copyright (c) 2017 Heinrich Schuchardt * - * SPDX-License-Identifier: GPL-2.0+ - * * This unit test checks the following protocol services: * DevicePathToText */ diff --git a/lib/efi_selftest/efi_selftest_devicepath_util.c b/lib/efi_selftest/efi_selftest_devicepath_util.c index 2b5384f21b..5fef5cfccd 100644 --- a/lib/efi_selftest/efi_selftest_devicepath_util.c +++ b/lib/efi_selftest/efi_selftest_devicepath_util.c @@ -1,10 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * efi_selftest_devicepath_util * * Copyright (c) 2018 Heinrich Schuchardt * - * SPDX-License-Identifier: GPL-2.0+ - * * This unit test checks the device path utilities protocol. */ diff --git a/lib/efi_selftest/efi_selftest_event_groups.c b/lib/efi_selftest/efi_selftest_event_groups.c index 79e4ea1ce2..9b3c5132ef 100644 --- a/lib/efi_selftest/efi_selftest_event_groups.c +++ b/lib/efi_selftest/efi_selftest_event_groups.c @@ -1,10 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * efi_selftest_event_groups * * Copyright (c) 2018 Heinrich Schuchardt * - * SPDX-License-Identifier: GPL-2.0+ - * * This test checks the notification of group events and the * following services: * CreateEventEx, CloseEvent, SignalEvent, CheckEvent. diff --git a/lib/efi_selftest/efi_selftest_events.c b/lib/efi_selftest/efi_selftest_events.c index 5393e39352..47f9f99318 100644 --- a/lib/efi_selftest/efi_selftest_events.c +++ b/lib/efi_selftest/efi_selftest_events.c @@ -1,10 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * efi_selftest_events * * Copyright (c) 2017 Heinrich Schuchardt * - * SPDX-License-Identifier: GPL-2.0+ - * * This unit test uses timer events to check the implementation * of the following boottime services: * CreateEvent, CloseEvent, WaitForEvent, CheckEvent, SetTimer. diff --git a/lib/efi_selftest/efi_selftest_exitbootservices.c b/lib/efi_selftest/efi_selftest_exitbootservices.c index cddd11d52b..f1a136044d 100644 --- a/lib/efi_selftest/efi_selftest_exitbootservices.c +++ b/lib/efi_selftest/efi_selftest_exitbootservices.c @@ -1,10 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * efi_selftest_exitbootservices * * Copyright (c) 2017 Heinrich Schuchardt * - * SPDX-License-Identifier: GPL-2.0+ - * * This unit test checks that the notification function of an * EVT_SIGNAL_EXIT_BOOT_SERVICES event is called exactly once. */ diff --git a/lib/efi_selftest/efi_selftest_fdt.c b/lib/efi_selftest/efi_selftest_fdt.c index e5a8d6a6ae..c7bc242b5c 100644 --- a/lib/efi_selftest/efi_selftest_fdt.c +++ b/lib/efi_selftest/efi_selftest_fdt.c @@ -1,10 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * efi_selftest_pos * * Copyright (c) 2018 Heinrich Schuchardt * - * SPDX-License-Identifier: GPL-2.0+ - * * Test the EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL. * * The following services are tested: diff --git a/lib/efi_selftest/efi_selftest_gop.c b/lib/efi_selftest/efi_selftest_gop.c index 2a0553b115..5b0e2a9605 100644 --- a/lib/efi_selftest/efi_selftest_gop.c +++ b/lib/efi_selftest/efi_selftest_gop.c @@ -1,10 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * efi_selftest_gop * * Copyright (c) 2017 Heinrich Schuchardt * - * SPDX-License-Identifier: GPL-2.0+ - * * Test the graphical output protocol. */ diff --git a/lib/efi_selftest/efi_selftest_manageprotocols.c b/lib/efi_selftest/efi_selftest_manageprotocols.c index 874f86102d..3e4755c25e 100644 --- a/lib/efi_selftest/efi_selftest_manageprotocols.c +++ b/lib/efi_selftest/efi_selftest_manageprotocols.c @@ -1,10 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * efi_selftest_manageprotocols * * Copyright (c) 2017 Heinrich Schuchardt * - * SPDX-License-Identifier: GPL-2.0+ - * * This unit test checks the following protocol services: * InstallProtocolInterface, UninstallProtocolInterface, * InstallMultipleProtocolsInterfaces, UninstallMultipleProtocolsInterfaces, diff --git a/lib/efi_selftest/efi_selftest_miniapp_exit.c b/lib/efi_selftest/efi_selftest_miniapp_exit.c index 5ec57aba02..2ffdd65b75 100644 --- a/lib/efi_selftest/efi_selftest_miniapp_exit.c +++ b/lib/efi_selftest/efi_selftest_miniapp_exit.c @@ -1,10 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * efi_selftest_miniapp_exit * * Copyright (c) 2018 Heinrich Schuchardt * - * SPDX-License-Identifier: GPL-2.0+ - * * This EFI application is run by the StartImage selftest. * It uses the Exit boot service to return. */ diff --git a/lib/efi_selftest/efi_selftest_miniapp_return.c b/lib/efi_selftest/efi_selftest_miniapp_return.c index 0a82391df6..5709e39cac 100644 --- a/lib/efi_selftest/efi_selftest_miniapp_return.c +++ b/lib/efi_selftest/efi_selftest_miniapp_return.c @@ -1,10 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * efi_selftest_miniapp_return * * Copyright (c) 2018 Heinrich Schuchardt * - * SPDX-License-Identifier: GPL-2.0+ - * * This EFI application is run by the StartImage selftest. * It returns directly without calling the Exit boot service. */ diff --git a/lib/efi_selftest/efi_selftest_snp.c b/lib/efi_selftest/efi_selftest_snp.c index cc0705fb59..09bd53da82 100644 --- a/lib/efi_selftest/efi_selftest_snp.c +++ b/lib/efi_selftest/efi_selftest_snp.c @@ -1,10 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * efi_selftest_snp * * Copyright (c) 2017 Heinrich Schuchardt * - * SPDX-License-Identifier: GPL-2.0+ - * * This unit test covers the Simple Network Protocol as well as * the CopyMem and SetMem boottime services. * diff --git a/lib/efi_selftest/efi_selftest_startimage_exit.c b/lib/efi_selftest/efi_selftest_startimage_exit.c index 0809690e97..0d9e16437a 100644 --- a/lib/efi_selftest/efi_selftest_startimage_exit.c +++ b/lib/efi_selftest/efi_selftest_startimage_exit.c @@ -1,10 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * efi_selftest_start_image * * Copyright (c) 2018 Heinrich Schuchardt * - * SPDX-License-Identifier: GPL-2.0+ - * * This test checks the StartImage boot service. * The efi_selftest_miniapp_exit.efi application is loaded into memory * and started. diff --git a/lib/efi_selftest/efi_selftest_startimage_return.c b/lib/efi_selftest/efi_selftest_startimage_return.c index 2209911457..3c6249fdf1 100644 --- a/lib/efi_selftest/efi_selftest_startimage_return.c +++ b/lib/efi_selftest/efi_selftest_startimage_return.c @@ -1,10 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * efi_selftest_start_image * * Copyright (c) 2018 Heinrich Schuchardt * - * SPDX-License-Identifier: GPL-2.0+ - * * This test checks the StartImage boot service. * The efi_selftest_miniapp_return.efi application is loaded into memory * and started. diff --git a/lib/efi_selftest/efi_selftest_textinput.c b/lib/efi_selftest/efi_selftest_textinput.c index c890ff88b7..7aa84de89d 100644 --- a/lib/efi_selftest/efi_selftest_textinput.c +++ b/lib/efi_selftest/efi_selftest_textinput.c @@ -1,10 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * efi_selftest_textinput * * Copyright (c) 2018 Heinrich Schuchardt * - * SPDX-License-Identifier: GPL-2.0+ - * * Provides a unit test for the EFI_SIMPLE_TEXT_INPUT_PROTOCOL. * The unicode character and the scan code are printed for text * input. To run the test: diff --git a/lib/efi_selftest/efi_selftest_textoutput.c b/lib/efi_selftest/efi_selftest_textoutput.c index 6e8c90cc8b..3533647fd4 100644 --- a/lib/efi_selftest/efi_selftest_textoutput.c +++ b/lib/efi_selftest/efi_selftest_textoutput.c @@ -1,10 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * efi_selftest_textoutput * * Copyright (c) 2017 Heinrich Schuchardt * - * SPDX-License-Identifier: GPL-2.0+ - * * Test the EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL. * * The following services are tested: diff --git a/lib/efi_selftest/efi_selftest_tpl.c b/lib/efi_selftest/efi_selftest_tpl.c index 8243fae15b..61ae46b797 100644 --- a/lib/efi_selftest/efi_selftest_tpl.c +++ b/lib/efi_selftest/efi_selftest_tpl.c @@ -1,10 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * efi_selftest_events * * Copyright (c) 2017 Heinrich Schuchardt * - * SPDX-License-Identifier: GPL-2.0+ - * * This unit test uses timer events to check the handling of * task priority levels. */ diff --git a/lib/efi_selftest/efi_selftest_util.c b/lib/efi_selftest/efi_selftest_util.c index 1b17bf4d4b..87a04f898a 100644 --- a/lib/efi_selftest/efi_selftest_util.c +++ b/lib/efi_selftest/efi_selftest_util.c @@ -1,10 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * efi_selftest_util * * Copyright (c) 2017 Heinrich Schuchardt * - * SPDX-License-Identifier: GPL-2.0+ - * * Utility functions */ diff --git a/lib/efi_selftest/efi_selftest_watchdog.c b/lib/efi_selftest/efi_selftest_watchdog.c index e4af38407f..bff2330918 100644 --- a/lib/efi_selftest/efi_selftest_watchdog.c +++ b/lib/efi_selftest/efi_selftest_watchdog.c @@ -1,10 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * efi_selftest_watchdog * * Copyright (c) 2017 Heinrich Schuchardt * - * SPDX-License-Identifier: GPL-2.0+ - * * The 'watchdog timer' unit test checks that the watchdog timer * will not cause a system restart during the timeout period after * a timer reset. -- cgit