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 --- arch/sandbox/lib/Makefile | 4 +--- arch/sandbox/lib/bootm.c | 2 +- arch/sandbox/lib/interrupts.c | 3 +-- arch/sandbox/lib/pci_io.c | 3 +-- 4 files changed, 4 insertions(+), 8 deletions(-) (limited to 'arch/sandbox/lib') diff --git a/arch/sandbox/lib/Makefile b/arch/sandbox/lib/Makefile index a79ade7b11..52eef2e662 100644 --- a/arch/sandbox/lib/Makefile +++ b/arch/sandbox/lib/Makefile @@ -1,11 +1,9 @@ +# SPDX-License-Identifier: GPL-2.0+ # # Copyright (c) 2011 The Chromium OS Authors. # # (C) Copyright 2002-2006 # Wolfgang Denk, DENX Software Engineering, wd@denx.de. -# -# SPDX-License-Identifier: GPL-2.0+ -# obj-y += interrupts.o obj-$(CONFIG_PCI) += pci_io.o diff --git a/arch/sandbox/lib/bootm.c b/arch/sandbox/lib/bootm.c index c7226ff30d..2de03fb8e0 100644 --- a/arch/sandbox/lib/bootm.c +++ b/arch/sandbox/lib/bootm.c @@ -1,7 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (c) 2011 The Chromium OS Authors. * Copyright (c) 2015 Sjoerd Simons - * SPDX-License-Identifier: GPL-2.0+ */ #include diff --git a/arch/sandbox/lib/interrupts.c b/arch/sandbox/lib/interrupts.c index c6d8ae913a..4ddcd37522 100644 --- a/arch/sandbox/lib/interrupts.c +++ b/arch/sandbox/lib/interrupts.c @@ -1,9 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (c) 2011 The Chromium OS Authors. * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. - * - * SPDX-License-Identifier: GPL-2.0+ */ #include diff --git a/arch/sandbox/lib/pci_io.c b/arch/sandbox/lib/pci_io.c index 0de124f315..5039973cd7 100644 --- a/arch/sandbox/lib/pci_io.c +++ b/arch/sandbox/lib/pci_io.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+ */ /* -- cgit