diff options
| author | Tom Rini | 2018-05-06 17:58:06 -0400 |
|---|---|---|
| committer | Tom Rini | 2018-05-07 09:34:12 -0400 |
| commit | 83d290c56fab2d38cd1ab4c4cc7099559c1d5046 (patch) | |
| tree | 5e5d1b40b52aaf96b707e0da2474573306d22f7b /fs | |
| parent | 7ce85318cfff5fd82a059131761559cba7fef309 (diff) | |
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 'fs')
76 files changed, 76 insertions, 163 deletions
diff --git a/fs/Makefile b/fs/Makefile index 8a8175b7af3..bad0c2cc33e 100644 --- a/fs/Makefile +++ b/fs/Makefile @@ -1,10 +1,8 @@ +# SPDX-License-Identifier: GPL-2.0+ # # (C) Copyright 2000-2006 # Wolfgang Denk, DENX Software Engineering, wd@denx.de. # Copyright (c) 2012, NVIDIA CORPORATION. All rights reserved. -# -# SPDX-License-Identifier: GPL-2.0+ -# ifdef CONFIG_SPL_BUILD obj-$(CONFIG_SPL_FAT_SUPPORT) += fat/ diff --git a/fs/btrfs/Makefile b/fs/btrfs/Makefile index 01731557e69..9b3159296ff 100644 --- a/fs/btrfs/Makefile +++ b/fs/btrfs/Makefile @@ -1,8 +1,6 @@ +# SPDX-License-Identifier: GPL-2.0+ # # 2017 Marek Behun, CZ.NIC, marek.behun@nic.cz -# -# SPDX-License-Identifier: GPL-2.0+ -# obj-y := btrfs.o chunk-map.o compression.o ctree.o dev.o dir-item.o \ extent-io.o hash.o inode.o root.o subvolume.o super.o diff --git a/fs/btrfs/btrfs.c b/fs/btrfs/btrfs.c index b01b111bfb4..6f35854823e 100644 --- a/fs/btrfs/btrfs.c +++ b/fs/btrfs/btrfs.c @@ -1,9 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * BTRFS filesystem implementation for U-Boot * * 2017 Marek Behun, CZ.NIC, marek.behun@nic.cz - * - * SPDX-License-Identifier: GPL-2.0+ */ #include "btrfs.h" diff --git a/fs/btrfs/btrfs.h b/fs/btrfs/btrfs.h index 4247cbbb097..27d78837c54 100644 --- a/fs/btrfs/btrfs.h +++ b/fs/btrfs/btrfs.h @@ -1,9 +1,8 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * BTRFS filesystem implementation for U-Boot * * 2017 Marek Behun, CZ.NIC, marek.behun@nic.cz - * - * SPDX-License-Identifier: GPL-2.0+ */ #ifndef __BTRFS_BTRFS_H__ diff --git a/fs/btrfs/btrfs_tree.h b/fs/btrfs/btrfs_tree.h index f171b242887..f90fbb29514 100644 --- a/fs/btrfs/btrfs_tree.h +++ b/fs/btrfs/btrfs_tree.h @@ -1,7 +1,6 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * From linux/include/uapi/linux/btrfs_tree.h - * - * SPDX-License-Identifier: GPL-2.0+ */ #ifndef __BTRFS_BTRFS_TREE_H__ diff --git a/fs/btrfs/chunk-map.c b/fs/btrfs/chunk-map.c index ce7330b1b77..b3b5ef7652e 100644 --- a/fs/btrfs/chunk-map.c +++ b/fs/btrfs/chunk-map.c @@ -1,9 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * BTRFS filesystem implementation for U-Boot * * 2017 Marek Behun, CZ.NIC, marek.behun@nic.cz - * - * SPDX-License-Identifier: GPL-2.0+ */ #include "btrfs.h" diff --git a/fs/btrfs/compression.c b/fs/btrfs/compression.c index b1b4498fba5..e5601b8f2bf 100644 --- a/fs/btrfs/compression.c +++ b/fs/btrfs/compression.c @@ -1,9 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * BTRFS filesystem implementation for U-Boot * * 2017 Marek Behun, CZ.NIC, marek.behun@nic.cz - * - * SPDX-License-Identifier: GPL-2.0+ */ #include "btrfs.h" diff --git a/fs/btrfs/conv-funcs.h b/fs/btrfs/conv-funcs.h index f2e7944e4ed..30791cd628f 100644 --- a/fs/btrfs/conv-funcs.h +++ b/fs/btrfs/conv-funcs.h @@ -1,9 +1,8 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * Functions to convert BTRFS structures from disk to CPU endianness and back. * * 2017 Marek Behun, CZ.NIC, marek.behun@nic.cz - * - * SPDX-License-Identifier: GPL-2.0+ */ #ifndef __BTRFS_CONV_FUNCS_H__ diff --git a/fs/btrfs/ctree.c b/fs/btrfs/ctree.c index c15fca34172..4da36a9bc77 100644 --- a/fs/btrfs/ctree.c +++ b/fs/btrfs/ctree.c @@ -1,9 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * BTRFS filesystem implementation for U-Boot * * 2017 Marek Behun, CZ.NIC, marek.behun@nic.cz - * - * SPDX-License-Identifier: GPL-2.0+ */ #include "btrfs.h" diff --git a/fs/btrfs/ctree.h b/fs/btrfs/ctree.h index 39f4473ae5f..65c152a52fc 100644 --- a/fs/btrfs/ctree.h +++ b/fs/btrfs/ctree.h @@ -1,10 +1,9 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * From linux/fs/btrfs/ctree.h * Copyright (C) 2007,2008 Oracle. All rights reserved. * * Modified in 2017 by Marek Behun, CZ.NIC, marek.behun@nic.cz - * - * SPDX-License-Identifier: GPL-2.0+ */ #ifndef __BTRFS_CTREE_H__ diff --git a/fs/btrfs/dev.c b/fs/btrfs/dev.c index fd2e9b61279..ada3800f1e1 100644 --- a/fs/btrfs/dev.c +++ b/fs/btrfs/dev.c @@ -1,9 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * BTRFS filesystem implementation for U-Boot * * 2017 Marek Behun, CZ.NIC, marek.behun@nic.cz - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/fs/btrfs/dir-item.c b/fs/btrfs/dir-item.c index 970563404fe..63b5bf0a860 100644 --- a/fs/btrfs/dir-item.c +++ b/fs/btrfs/dir-item.c @@ -1,9 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * BTRFS filesystem implementation for U-Boot * * 2017 Marek Behun, CZ.NIC, marek.behun@nic.cz - * - * SPDX-License-Identifier: GPL-2.0+ */ #include "btrfs.h" diff --git a/fs/btrfs/extent-io.c b/fs/btrfs/extent-io.c index feb91432e97..7263f41644e 100644 --- a/fs/btrfs/extent-io.c +++ b/fs/btrfs/extent-io.c @@ -1,9 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * BTRFS filesystem implementation for U-Boot * * 2017 Marek Behun, CZ.NIC, marek.behun@nic.cz - * - * SPDX-License-Identifier: GPL-2.0+ */ #include "btrfs.h" diff --git a/fs/btrfs/hash.c b/fs/btrfs/hash.c index cde3abd3dfb..52a8ceaf0c8 100644 --- a/fs/btrfs/hash.c +++ b/fs/btrfs/hash.c @@ -1,9 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * BTRFS filesystem implementation for U-Boot * * 2017 Marek Behun, CZ.NIC, marek.behun@nic.cz - * - * SPDX-License-Identifier: GPL-2.0+ */ #include "btrfs.h" diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c index f785b600fac..991c2f68c3b 100644 --- a/fs/btrfs/inode.c +++ b/fs/btrfs/inode.c @@ -1,9 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * BTRFS filesystem implementation for U-Boot * * 2017 Marek Behun, CZ.NIC, marek.behun@nic.cz - * - * SPDX-License-Identifier: GPL-2.0+ */ #include "btrfs.h" diff --git a/fs/btrfs/root.c b/fs/btrfs/root.c index c405813b692..127b67fd1c8 100644 --- a/fs/btrfs/root.c +++ b/fs/btrfs/root.c @@ -1,9 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * BTRFS filesystem implementation for U-Boot * * 2017 Marek Behun, CZ.NIC, marek.behun@nic.cz - * - * SPDX-License-Identifier: GPL-2.0+ */ #include "btrfs.h" diff --git a/fs/btrfs/subvolume.c b/fs/btrfs/subvolume.c index 54e0ab45463..06e54f33109 100644 --- a/fs/btrfs/subvolume.c +++ b/fs/btrfs/subvolume.c @@ -1,9 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * BTRFS filesystem implementation for U-Boot * * 2017 Marek Behun, CZ.NIC, marek.behun@nic.cz - * - * SPDX-License-Identifier: GPL-2.0+ */ #include "btrfs.h" diff --git a/fs/btrfs/super.c b/fs/btrfs/super.c index 7e2528c4fb6..ad6641f3148 100644 --- a/fs/btrfs/super.c +++ b/fs/btrfs/super.c @@ -1,9 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * BTRFS filesystem implementation for U-Boot * * 2017 Marek Behun, CZ.NIC, marek.behun@nic.cz - * - * SPDX-License-Identifier: GPL-2.0+ */ #include "btrfs.h" diff --git a/fs/cbfs/Makefile b/fs/cbfs/Makefile index a106e05dd84..e8e9dfe47aa 100644 --- a/fs/cbfs/Makefile +++ b/fs/cbfs/Makefile @@ -1,6 +1,4 @@ +# SPDX-License-Identifier: GPL-2.0+ # Copyright (c) 2011 The Chromium OS Authors. All rights reserved. -# -# SPDX-License-Identifier: GPL-2.0+ -# obj-y := cbfs.o diff --git a/fs/cbfs/cbfs.c b/fs/cbfs/cbfs.c index 46da8f134fa..0dce639b49c 100644 --- a/fs/cbfs/cbfs.c +++ b/fs/cbfs/cbfs.c @@ -1,7 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (c) 2011 The Chromium OS Authors. All rights reserved. - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/fs/cramfs/Makefile b/fs/cramfs/Makefile index 12d73a375e9..2bf4187f85b 100644 --- a/fs/cramfs/Makefile +++ b/fs/cramfs/Makefile @@ -1,9 +1,7 @@ +# SPDX-License-Identifier: GPL-2.0+ # # (C) Copyright 2000-2006 # Wolfgang Denk, DENX Software Engineering, wd@denx.de. -# -# SPDX-License-Identifier: GPL-2.0+ -# obj-y := cramfs.o obj-y += uncompress.o diff --git a/fs/ext4/Makefile b/fs/ext4/Makefile index 8d15bdad675..c2544beee3a 100644 --- a/fs/ext4/Makefile +++ b/fs/ext4/Makefile @@ -1,3 +1,4 @@ +# SPDX-License-Identifier: GPL-2.0+ # # (C) Copyright 2006 # Wolfgang Denk, DENX Software Engineering, wd@denx.de. @@ -5,9 +6,6 @@ # (C) Copyright 2003 # Pavel Bartusek, Sysgo Real-Time Solutions AG, pba@sysgo.de # -# -# SPDX-License-Identifier: GPL-2.0+ -# obj-y := ext4fs.o ext4_common.o dev.o obj-$(CONFIG_EXT4_WRITE) += ext4_write.o ext4_journal.o crc16.o diff --git a/fs/ext4/dev.c b/fs/ext4/dev.c index f04fa08f64e..29076880bcc 100644 --- a/fs/ext4/dev.c +++ b/fs/ext4/dev.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * (C) Copyright 2011 - 2012 Samsung Electronics * EXT4 filesystem implementation in Uboot by @@ -13,8 +14,6 @@ * * (C) Copyright 2003 - 2004 * Sysgo AG, <www.elinos.com>, Pavel Bartusek <pba@sysgo.com> - * - * SPDX-License-Identifier: GPL-2.0+ */ /* diff --git a/fs/ext4/ext4_common.c b/fs/ext4/ext4_common.c index e3cc30a1e0a..672fead815d 100644 --- a/fs/ext4/ext4_common.c +++ b/fs/ext4/ext4_common.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * (C) Copyright 2011 - 2012 Samsung Electronics * EXT4 filesystem implementation in Uboot by @@ -15,8 +16,6 @@ * Copyright (C) 2003, 2004 Free Software Foundation, Inc. * * ext4write : Based on generic ext4 protocol. - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/fs/ext4/ext4_common.h b/fs/ext4/ext4_common.h index 04d56028a0b..1ee81ab7ce8 100644 --- a/fs/ext4/ext4_common.h +++ b/fs/ext4/ext4_common.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * (C) Copyright 2011 - 2012 Samsung Electronics * EXT4 filesystem implementation in Uboot by @@ -15,8 +16,6 @@ * Copyright (C) 2003, 2004 Free Software Foundation, Inc. * * ext4write : Based on generic ext4 protocol. - * - * SPDX-License-Identifier: GPL-2.0+ */ #ifndef __EXT4_COMMON__ diff --git a/fs/ext4/ext4_journal.c b/fs/ext4/ext4_journal.c index fed6287eac4..148593da7fe 100644 --- a/fs/ext4/ext4_journal.c +++ b/fs/ext4/ext4_journal.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * (C) Copyright 2011 - 2012 Samsung Electronics * EXT4 filesystem implementation in Uboot by @@ -10,7 +11,6 @@ * Written by Stephen C. Tweedie <sct@redhat.com> * * Copyright 1998-2000 Red Hat, Inc --- All Rights Reserved - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/fs/ext4/ext4_journal.h b/fs/ext4/ext4_journal.h index 3d05ad53154..c9cf195f333 100644 --- a/fs/ext4/ext4_journal.h +++ b/fs/ext4/ext4_journal.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * (C) Copyright 2011 - 2012 Samsung Electronics * EXT4 filesystem implementation in Uboot by @@ -11,7 +12,6 @@ * Written by Stephen C. Tweedie <sct@redhat.com> * * Copyright 1998-2000 Red Hat, Inc --- All Rights Reserved - * SPDX-License-Identifier: GPL-2.0+ */ #ifndef __EXT4_JRNL__ diff --git a/fs/ext4/ext4_write.c b/fs/ext4/ext4_write.c index d710a86d59c..a7f543f7df7 100644 --- a/fs/ext4/ext4_write.c +++ b/fs/ext4/ext4_write.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * (C) Copyright 2011 - 2012 Samsung Electronics * EXT4 filesystem implementation in Uboot by @@ -17,8 +18,6 @@ * Copyright (C) 2003, 2004 Free Software Foundation, Inc. * * ext4write : Based on generic ext4 protocol. - * - * SPDX-License-Identifier: GPL-2.0+ */ diff --git a/fs/ext4/ext4fs.c b/fs/ext4/ext4fs.c index 9ee2caf2fa1..4b36a3e6082 100644 --- a/fs/ext4/ext4fs.c +++ b/fs/ext4/ext4fs.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * (C) Copyright 2011 - 2012 Samsung Electronics * EXT4 filesystem implementation in Uboot by @@ -17,8 +18,6 @@ * Copyright (C) 2003, 2004 Free Software Foundation, Inc. * * ext4write : Based on generic ext4 protocol. - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/fs/fat/Makefile b/fs/fat/Makefile index 3e2a6b01a89..e64b61a0b43 100644 --- a/fs/fat/Makefile +++ b/fs/fat/Makefile @@ -1,6 +1,4 @@ -# -# -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0+ # obj-$(CONFIG_FS_FAT) := fat.o diff --git a/fs/fat/fat.c b/fs/fat/fat.c index dd7888cd6d4..4efe8a3edaf 100644 --- a/fs/fat/fat.c +++ b/fs/fat/fat.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * fat.c * @@ -5,8 +6,6 @@ * * 2002-07-28 - rjones@nexus-tech.net - ported to ppcboot v1.1.6 * 2003-03-10 - kharris@nexus-tech.net - ported to uboot - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/fs/fat/fat_write.c b/fs/fat/fat_write.c index 2b753df2820..3b77557b3ed 100644 --- a/fs/fat/fat_write.c +++ b/fs/fat/fat_write.c @@ -1,9 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * fat_write.c * * R/W (V)FAT 12/16/32 filesystem implementation by Donggeun Kim - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> @@ -1,7 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0 /* * Copyright (c) 2012, NVIDIA CORPORATION. All rights reserved. - * - * SPDX-License-Identifier: GPL-2.0 */ #include <config.h> diff --git a/fs/fs_internal.c b/fs/fs_internal.c index 5cdd272c9de..d369c43ca68 100644 --- a/fs/fs_internal.c +++ b/fs/fs_internal.c @@ -1,9 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0 /* * 2017 by Marek Behun <marek.behun@nic.cz> * * Derived from code in ext4/dev.c, which was based on reiserfs/dev.c - * - * SPDX-License-Identifier: GPL-2.0 */ #include <common.h> diff --git a/fs/jffs2/Makefile b/fs/jffs2/Makefile index 3625d748d57..ec7428c8410 100644 --- a/fs/jffs2/Makefile +++ b/fs/jffs2/Makefile @@ -1,9 +1,7 @@ +# SPDX-License-Identifier: GPL-2.0+ # # (C) Copyright 2000-2006 # Wolfgang Denk, DENX Software Engineering, wd@denx.de. -# -# SPDX-License-Identifier: GPL-2.0+ -# obj-$(CONFIG_JFFS2_LZO) += compr_lzo.o obj-y += compr_rtime.o diff --git a/fs/jffs2/mergesort.c b/fs/jffs2/mergesort.c index 6e633a11338..fca77aa6511 100644 --- a/fs/jffs2/mergesort.c +++ b/fs/jffs2/mergesort.c @@ -1,11 +1,10 @@ +// SPDX-License-Identifier: MIT /* * This file is copyright 2001 Simon Tatham. * Rewritten from original source 2006 by Dan Merillat for use in u-boot. * * Original code can be found at: * http://www.chiark.greenend.org.uk/~sgtatham/algorithms/listsort.html - * - * SPDX-License-Identifier: MIT */ #include <common.h> diff --git a/fs/jffs2/mini_inflate.c b/fs/jffs2/mini_inflate.c index 7bfbdb68019..3072eedd8c1 100644 --- a/fs/jffs2/mini_inflate.c +++ b/fs/jffs2/mini_inflate.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0+ /*------------------------------------------------------------------------- * Filename: mini_inflate.c * Version: $Id: mini_inflate.c,v 1.3 2002/01/24 22:58:42 rfeany Exp $ @@ -5,9 +6,6 @@ * Author: Russ Dill <Russ.Dill@asu.edu> * Description: Mini inflate implementation (RFC 1951) *-----------------------------------------------------------------------*/ -/* - * SPDX-License-Identifier: GPL-2.0+ - */ #include <config.h> #include <jffs2/mini_inflate.h> diff --git a/fs/reiserfs/Makefile b/fs/reiserfs/Makefile index 5a692f0ee77..63dd8957534 100644 --- a/fs/reiserfs/Makefile +++ b/fs/reiserfs/Makefile @@ -1,3 +1,4 @@ +# SPDX-License-Identifier: GPL-2.0+ # # (C) Copyright 2006 # Wolfgang Denk, DENX Software Engineering, wd@denx.de. @@ -5,8 +6,5 @@ # (C) Copyright 2003 # Pavel Bartusek, Sysgo Real-Time Solutions AG, pba@sysgo.de # -# -# SPDX-License-Identifier: GPL-2.0+ -# obj-y := reiserfs.o dev.o mode_string.o diff --git a/fs/reiserfs/dev.c b/fs/reiserfs/dev.c index 7b786e4ed35..c6b67795df5 100644 --- a/fs/reiserfs/dev.c +++ b/fs/reiserfs/dev.c @@ -1,8 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * (C) Copyright 2003 - 2004 * Sysgo AG, <www.elinos.com>, Pavel Bartusek <pba@sysgo.com> - * - * SPDX-License-Identifier: GPL-2.0+ */ diff --git a/fs/reiserfs/mode_string.c b/fs/reiserfs/mode_string.c index ec18dc16e90..638cf6368da 100644 --- a/fs/reiserfs/mode_string.c +++ b/fs/reiserfs/mode_string.c @@ -1,9 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * mode_string implementation for busybox * * Copyright (C) 2003 Manuel Novoa III <mjn3@codepoet.org> - * - * SPDX-License-Identifier: GPL-2.0+ */ /* Aug 13, 2003 diff --git a/fs/reiserfs/reiserfs.c b/fs/reiserfs/reiserfs.c index 1d6fa083cea..635aab2eba7 100644 --- a/fs/reiserfs/reiserfs.c +++ b/fs/reiserfs/reiserfs.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright 2000-2002 by Hans Reiser, licensing governed by reiserfs/README * @@ -7,8 +8,6 @@ * (C) Copyright 2003 - 2004 * Sysgo AG, <www.elinos.com>, Pavel Bartusek <pba@sysgo.com> * - * - * SPDX-License-Identifier: GPL-2.0+ */ /* An implementation for the ReiserFS filesystem ported from GRUB. diff --git a/fs/reiserfs/reiserfs_private.h b/fs/reiserfs/reiserfs_private.h index 9d14c7171b8..c8867e24fef 100644 --- a/fs/reiserfs/reiserfs_private.h +++ b/fs/reiserfs/reiserfs_private.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * Copyright 2000-2002 by Hans Reiser, licensing governed by reiserfs/README * @@ -7,8 +8,6 @@ * (C) Copyright 2003 - 2004 * Sysgo AG, <www.elinos.com>, Pavel Bartusek <pba@sysgo.com> * - * - * SPDX-License-Identifier: GPL-2.0+ */ /* An implementation for the ReiserFS filesystem ported from GRUB. diff --git a/fs/sandbox/Makefile b/fs/sandbox/Makefile index ca238f6d7da..06090519bf4 100644 --- a/fs/sandbox/Makefile +++ b/fs/sandbox/Makefile @@ -1,3 +1,4 @@ +# SPDX-License-Identifier: GPL-2.0+ # # Copyright (c) 2012, Google Inc. # @@ -6,8 +7,5 @@ # # (C) Copyright 2003 # Pavel Bartusek, Sysgo Real-Time Solutions AG, pba@sysgo.de -# -# SPDX-License-Identifier: GPL-2.0+ -# obj-y := sandboxfs.o diff --git a/fs/sandbox/sandboxfs.c b/fs/sandbox/sandboxfs.c index ca802613370..1e253611c36 100644 --- a/fs/sandbox/sandboxfs.c +++ b/fs/sandbox/sandboxfs.c @@ -1,7 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (c) 2012, Google Inc. - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/fs/ubifs/Makefile b/fs/ubifs/Makefile index 5efb349d076..64d64472945 100644 --- a/fs/ubifs/Makefile +++ b/fs/ubifs/Makefile @@ -1,3 +1,4 @@ +# SPDX-License-Identifier: GPL-2.0+ # # (C) Copyright 2006 # Wolfgang Denk, DENX Software Engineering, wd@denx.de. @@ -5,9 +6,6 @@ # (C) Copyright 2003 # Pavel Bartusek, Sysgo Real-Time Solutions AG, pba@sysgo.de # -# -# SPDX-License-Identifier: GPL-2.0+ -# obj-y := ubifs.o io.o super.o sb.o master.o lpt.o obj-y += lpt_commit.o scan.o lprops.o diff --git a/fs/ubifs/budget.c b/fs/ubifs/budget.c index 1b4683fc8e7..9eb5d3fed12 100644 --- a/fs/ubifs/budget.c +++ b/fs/ubifs/budget.c @@ -1,10 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * This file is part of UBIFS. * * Copyright (C) 2006-2008 Nokia Corporation. * - * SPDX-License-Identifier: GPL-2.0+ - * * Authors: Adrian Hunter * Artem Bityutskiy (Битюцкий Артём) */ diff --git a/fs/ubifs/debug.c b/fs/ubifs/debug.c index 38c91d07347..ee841307038 100644 --- a/fs/ubifs/debug.c +++ b/fs/ubifs/debug.c @@ -1,10 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * This file is part of UBIFS. * * Copyright (C) 2006-2008 Nokia Corporation * - * SPDX-License-Identifier: GPL-2.0+ - * * Authors: Artem Bityutskiy (Битюцкий Артём) * Adrian Hunter */ diff --git a/fs/ubifs/debug.h b/fs/ubifs/debug.h index 98140834f9d..bad0c67f5da 100644 --- a/fs/ubifs/debug.h +++ b/fs/ubifs/debug.h @@ -1,10 +1,9 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * This file is part of UBIFS. * * Copyright (C) 2006-2008 Nokia Corporation. * - * SPDX-License-Identifier: GPL-2.0+ - * * Authors: Artem Bityutskiy (Битюцкий Артём) * Adrian Hunter */ diff --git a/fs/ubifs/gc.c b/fs/ubifs/gc.c index c6657a27118..42f22a487e1 100644 --- a/fs/ubifs/gc.c +++ b/fs/ubifs/gc.c @@ -1,10 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0 /* * This file is part of UBIFS. * * Copyright (C) 2006-2008 Nokia Corporation. * - * SPDX-License-Identifier: GPL-2.0 - * * Authors: Adrian Hunter * Artem Bityutskiy (Битюцкий Артём) */ diff --git a/fs/ubifs/io.c b/fs/ubifs/io.c index 51a95bb8552..8d7f8feebb5 100644 --- a/fs/ubifs/io.c +++ b/fs/ubifs/io.c @@ -1,11 +1,10 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * This file is part of UBIFS. * * Copyright (C) 2006-2008 Nokia Corporation. * Copyright (C) 2006, 2007 University of Szeged, Hungary * - * SPDX-License-Identifier: GPL-2.0+ - * * Authors: Artem Bityutskiy (Битюцкий Артём) * Adrian Hunter * Zoltan Sogor diff --git a/fs/ubifs/key.h b/fs/ubifs/key.h index b5c4884e303..70c2faf331b 100644 --- a/fs/ubifs/key.h +++ b/fs/ubifs/key.h @@ -1,10 +1,9 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * This file is part of UBIFS. * * Copyright (C) 2006-2008 Nokia Corporation. * - * SPDX-License-Identifier: GPL-2.0+ - * * Authors: Artem Bityutskiy (Битюцкий Артём) * Adrian Hunter */ diff --git a/fs/ubifs/log.c b/fs/ubifs/log.c index a07fdef12f2..331a891a576 100644 --- a/fs/ubifs/log.c +++ b/fs/ubifs/log.c @@ -1,10 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * This file is part of UBIFS. * * Copyright (C) 2006-2008 Nokia Corporation. * - * SPDX-License-Identifier: GPL-2.0+ - * * Authors: Artem Bityutskiy (Битюцкий Артём) * Adrian Hunter */ diff --git a/fs/ubifs/lprops.c b/fs/ubifs/lprops.c index 292ea7ab27b..5473d339978 100644 --- a/fs/ubifs/lprops.c +++ b/fs/ubifs/lprops.c @@ -1,10 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * This file is part of UBIFS. * * Copyright (C) 2006-2008 Nokia Corporation. * - * SPDX-License-Identifier: GPL-2.0+ - * * Authors: Adrian Hunter * Artem Bityutskiy (Битюцкий Артём) */ diff --git a/fs/ubifs/lpt.c b/fs/ubifs/lpt.c index b22b63b9438..c0076bde742 100644 --- a/fs/ubifs/lpt.c +++ b/fs/ubifs/lpt.c @@ -1,10 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * This file is part of UBIFS. * * Copyright (C) 2006-2008 Nokia Corporation. * - * SPDX-License-Identifier: GPL-2.0+ - * * Authors: Adrian Hunter * Artem Bityutskiy (Битюцкий Артём) */ diff --git a/fs/ubifs/lpt_commit.c b/fs/ubifs/lpt_commit.c index 2df9130efd1..260216205d9 100644 --- a/fs/ubifs/lpt_commit.c +++ b/fs/ubifs/lpt_commit.c @@ -1,10 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * This file is part of UBIFS. * * Copyright (C) 2006-2008 Nokia Corporation. * - * SPDX-License-Identifier: GPL-2.0+ - * * Authors: Adrian Hunter * Artem Bityutskiy (Битюцкий Артём) */ diff --git a/fs/ubifs/master.c b/fs/ubifs/master.c index 4dd0bbb2d3f..5654d45dfbd 100644 --- a/fs/ubifs/master.c +++ b/fs/ubifs/master.c @@ -1,10 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * This file is part of UBIFS. * * Copyright (C) 2006-2008 Nokia Corporation. * - * SPDX-License-Identifier: GPL-2.0+ - * * Authors: Artem Bityutskiy (Битюцкий Артём) * Adrian Hunter */ diff --git a/fs/ubifs/misc.h b/fs/ubifs/misc.h index 7cad2bed1b2..449bcfccbb4 100644 --- a/fs/ubifs/misc.h +++ b/fs/ubifs/misc.h @@ -1,10 +1,9 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * This file is part of UBIFS. * * Copyright (C) 2006-2008 Nokia Corporation * - * SPDX-License-Identifier: GPL-2.0+ - * * Authors: Artem Bityutskiy (Битюцкий Артём) * Adrian Hunter */ diff --git a/fs/ubifs/orphan.c b/fs/ubifs/orphan.c index f5c8e23d0b3..c807ff1beb9 100644 --- a/fs/ubifs/orphan.c +++ b/fs/ubifs/orphan.c @@ -1,10 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * This file is part of UBIFS. * * Copyright (C) 2006-2008 Nokia Corporation. * - * SPDX-License-Identifier: GPL-2.0+ - * * Author: Adrian Hunter */ diff --git a/fs/ubifs/recovery.c b/fs/ubifs/recovery.c index 386a9c5e54a..621804c6fd2 100644 --- a/fs/ubifs/recovery.c +++ b/fs/ubifs/recovery.c @@ -1,10 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * This file is part of UBIFS. * * Copyright (C) 2006-2008 Nokia Corporation * - * SPDX-License-Identifier: GPL-2.0+ - * * Authors: Adrian Hunter * Artem Bityutskiy (Битюцкий Артём) */ diff --git a/fs/ubifs/replay.c b/fs/ubifs/replay.c index 176125e3809..4064157f154 100644 --- a/fs/ubifs/replay.c +++ b/fs/ubifs/replay.c @@ -1,10 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * This file is part of UBIFS. * * Copyright (C) 2006-2008 Nokia Corporation. * - * SPDX-License-Identifier: GPL-2.0+ - * * Authors: Adrian Hunter * Artem Bityutskiy (Битюцкий Артём) */ diff --git a/fs/ubifs/sb.c b/fs/ubifs/sb.c index 7c7d92a6031..52db611d1c7 100644 --- a/fs/ubifs/sb.c +++ b/fs/ubifs/sb.c @@ -1,10 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * This file is part of UBIFS. * * Copyright (C) 2006-2008 Nokia Corporation. * - * SPDX-License-Identifier: GPL-2.0+ - * * Authors: Artem Bityutskiy (Битюцкий Артём) * Adrian Hunter */ diff --git a/fs/ubifs/scan.c b/fs/ubifs/scan.c index 12a3597468d..4a977ae8cb4 100644 --- a/fs/ubifs/scan.c +++ b/fs/ubifs/scan.c @@ -1,10 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * This file is part of UBIFS. * * Copyright (C) 2006-2008 Nokia Corporation * - * SPDX-License-Identifier: GPL-2.0+ - * * Authors: Adrian Hunter * Artem Bityutskiy (Битюцкий Артём) */ diff --git a/fs/ubifs/super.c b/fs/ubifs/super.c index 2c478cba963..abdef1e6ab8 100644 --- a/fs/ubifs/super.c +++ b/fs/ubifs/super.c @@ -1,10 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * This file is part of UBIFS. * * Copyright (C) 2006-2008 Nokia Corporation. * - * SPDX-License-Identifier: GPL-2.0+ - * * Authors: Artem Bityutskiy (Битюцкий Артём) * Adrian Hunter */ diff --git a/fs/ubifs/tnc.c b/fs/ubifs/tnc.c index f6316a32e3b..86774f8fa27 100644 --- a/fs/ubifs/tnc.c +++ b/fs/ubifs/tnc.c @@ -1,10 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * This file is part of UBIFS. * * Copyright (C) 2006-2008 Nokia Corporation. * - * SPDX-License-Identifier: GPL-2.0+ - * * Authors: Adrian Hunter * Artem Bityutskiy (Битюцкий Артём) */ diff --git a/fs/ubifs/tnc_misc.c b/fs/ubifs/tnc_misc.c index b1bb6470e17..b8ea7e9ddb6 100644 --- a/fs/ubifs/tnc_misc.c +++ b/fs/ubifs/tnc_misc.c @@ -1,10 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * This file is part of UBIFS. * * Copyright (C) 2006-2008 Nokia Corporation. * - * SPDX-License-Identifier: GPL-2.0+ - * * Authors: Adrian Hunter * Artem Bityutskiy (Битюцкий Артём) */ diff --git a/fs/ubifs/ubifs-media.h b/fs/ubifs/ubifs-media.h index 90b8ffacfbc..2b5b26a01b0 100644 --- a/fs/ubifs/ubifs-media.h +++ b/fs/ubifs/ubifs-media.h @@ -1,10 +1,9 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * This file is part of UBIFS. * * Copyright (C) 2006-2008 Nokia Corporation. * - * SPDX-License-Identifier: GPL-2.0+ - * * Authors: Artem Bityutskiy (Битюцкий Артём) * Adrian Hunter */ diff --git a/fs/ubifs/ubifs.c b/fs/ubifs/ubifs.c index 4465523d5fb..8249879d8a5 100644 --- a/fs/ubifs/ubifs.c +++ b/fs/ubifs/ubifs.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * This file is part of UBIFS. * @@ -8,8 +9,6 @@ * * Authors: Artem Bityutskiy (Битюцкий Артём) * Adrian Hunter - * - * SPDX-License-Identifier: GPL-2.0 */ #include <common.h> diff --git a/fs/ubifs/ubifs.h b/fs/ubifs/ubifs.h index cbc4cb2bc89..78c3a68216e 100644 --- a/fs/ubifs/ubifs.h +++ b/fs/ubifs/ubifs.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * This file is part of UBIFS. * @@ -6,8 +7,6 @@ * (C) Copyright 2008-2009 * Stefan Roese, DENX Software Engineering, sr@denx.de. * - * SPDX-License-Identifier: GPL-2.0+ - * * Authors: Artem Bityutskiy (Битюцкий Артём) * Adrian Hunter */ diff --git a/fs/yaffs2/Makefile b/fs/yaffs2/Makefile index b69ea73f6e9..3c1bb4492b6 100644 --- a/fs/yaffs2/Makefile +++ b/fs/yaffs2/Makefile @@ -1,6 +1,5 @@ +# SPDX-License-Identifier: GPL-2.0 # Makefile for YAFFS direct test -# -# # YAFFS: Yet another Flash File System. A NAND-flash specific file system. # # Copyright (C) 2003 Aleph One Ltd. @@ -8,7 +7,6 @@ # # Created by Charles Manning <charles@aleph1.co.uk> # -# SPDX-License-Identifier: GPL-2.0 # obj-y := \ diff --git a/fs/yaffs2/yaffs_qsort.c b/fs/yaffs2/yaffs_qsort.c index 1ca5895740b..b463569815d 100644 --- a/fs/yaffs2/yaffs_qsort.c +++ b/fs/yaffs2/yaffs_qsort.c @@ -1,8 +1,7 @@ +// SPDX-License-Identifier: BSD-3-Clause /* * Copyright (c) 1992, 1993 * The Regents of the University of California. All rights reserved. - * - * SPDX-License-Identifier: BSD-3-Clause */ #include "yportenv.h" diff --git a/fs/zfs/Makefile b/fs/zfs/Makefile index fa58b7fcdec..37a0547e8aa 100644 --- a/fs/zfs/Makefile +++ b/fs/zfs/Makefile @@ -1,8 +1,6 @@ +# SPDX-License-Identifier: GPL-2.0+ # # (C) Copyright 2012 # Jorgen Lundman <lundman at lundman.net> -# -# SPDX-License-Identifier: GPL-2.0+ -# obj-y := dev.o zfs.o zfs_fletcher.o zfs_sha256.o zfs_lzjb.o diff --git a/fs/zfs/dev.c b/fs/zfs/dev.c index 7dda42b48ba..3cdb9e03edc 100644 --- a/fs/zfs/dev.c +++ b/fs/zfs/dev.c @@ -1,11 +1,10 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * * based on code of fs/reiserfs/dev.c by * * (C) Copyright 2003 - 2004 * Sysgo AG, <www.elinos.com>, Pavel Bartusek <pba@sysgo.com> - * - * SPDX-License-Identifier: GPL-2.0+ */ diff --git a/fs/zfs/zfs.c b/fs/zfs/zfs.c index ca67afbb2ee..4331c16064c 100644 --- a/fs/zfs/zfs.c +++ b/fs/zfs/zfs.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * * ZFS filesystem ported to u-boot by @@ -7,8 +8,6 @@ * Copyright (C) 1999,2000,2001,2002,2003,2004 * Free Software Foundation, Inc. * Copyright 2004 Sun Microsystems, Inc. - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/fs/zfs/zfs_fletcher.c b/fs/zfs/zfs_fletcher.c index d4ddf3b4e0a..008a303ec79 100644 --- a/fs/zfs/zfs_fletcher.c +++ b/fs/zfs/zfs_fletcher.c @@ -1,8 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * GRUB -- GRand Unified Bootloader * Copyright (C) 1999,2000,2001,2002,2003,2004 Free Software Foundation, Inc. - * - * SPDX-License-Identifier: GPL-2.0+ */ /* * Copyright 2007 Sun Microsystems, Inc. All rights reserved. diff --git a/fs/zfs/zfs_lzjb.c b/fs/zfs/zfs_lzjb.c index 607dfbb519f..b42d4980129 100644 --- a/fs/zfs/zfs_lzjb.c +++ b/fs/zfs/zfs_lzjb.c @@ -1,8 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * GRUB -- GRand Unified Bootloader * Copyright (C) 1999,2000,2001,2002,2003,2004 Free Software Foundation, Inc. - * - * SPDX-License-Identifier: GPL-2.0+ */ /* * Copyright 2007 Sun Microsystems, Inc. All rights reserved. diff --git a/fs/zfs/zfs_sha256.c b/fs/zfs/zfs_sha256.c index bd6b84745b7..cb5b1c06834 100644 --- a/fs/zfs/zfs_sha256.c +++ b/fs/zfs/zfs_sha256.c @@ -1,8 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * GRUB -- GRand Unified Bootloader * Copyright (C) 1999,2000,2001,2002,2003,2004 Free Software Foundation, Inc. - * - * SPDX-License-Identifier: GPL-2.0+ */ /* * Copyright 2007 Sun Microsystems, Inc. All rights reserved. |