diff options
Diffstat (limited to 'fs')
76 files changed, 76 insertions, 163 deletions
diff --git a/fs/Makefile b/fs/Makefile index 8a8175b7af..bad0c2cc33 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 01731557e6..9b3159296f 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 b01b111bfb..6f35854823 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 4247cbbb09..27d78837c5 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 f171b24288..f90fbb2951 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 ce7330b1b7..b3b5ef7652 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 b1b4498fba..e5601b8f2b 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 f2e7944e4e..30791cd628 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 c15fca3417..4da36a9bc7 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 39f4473ae5..65c152a52f 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 fd2e9b6127..ada3800f1e 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 970563404f..63b5bf0a86 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 feb91432e9..7263f41644 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 cde3abd3df..52a8ceaf0c 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 f785b600fa..991c2f68c3 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 c405813b69..127b67fd1c 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 54e0ab4546..06e54f3310 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 7e2528c4fb..ad6641f314 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 a106e05dd8..e8e9dfe47a 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 46da8f134f..0dce639b49 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 12d73a375e..2bf4187f85 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 8d15bdad67..c2544beee3 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 f04fa08f64..29076880bc 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 e3cc30a1e0..672fead815 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 04d56028a0..1ee81ab7ce 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 fed6287eac..148593da7f 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 3d05ad5315..c9cf195f33 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 d710a86d59..a7f543f7df 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 9ee2caf2fa..4b36a3e608 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 3e2a6b01a8..e64b61a0b4 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 dd7888cd6d..4efe8a3eda 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 2b753df282..3b77557b3e 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 5cdd272c9d..d369c43ca6 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 3625d748d5..ec7428c841 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 6e633a1133..fca77aa651 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 7bfbdb6801..3072eedd8c 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 5a692f0ee7..63dd895753 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 7b786e4ed3..c6b67795df 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 ec18dc16e9..638cf6368d 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 1d6fa083ce..635aab2eba 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 9d14c7171b..c8867e24fe 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 ca238f6d7d..06090519bf 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 ca80261337..1e253611c3 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 5efb349d07..64d6447294 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 1b4683fc8e..9eb5d3fed1 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 38c91d0734..ee84130703 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 98140834f9..bad0c67f5d 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 c6657a2711..42f22a487e 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 51a95bb855..8d7f8feebb 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 b5c4884e30..70c2faf331 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 a07fdef12f..331a891a57 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 292ea7ab27..5473d33997 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 b22b63b943..c0076bde74 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 2df9130efd..260216205d 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 4dd0bbb2d3..5654d45dfb 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 7cad2bed1b..449bcfccbb 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 f5c8e23d0b..c807ff1beb 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 386a9c5e54..621804c6fd 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 176125e380..4064157f15 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 7c7d92a603..52db611d1c 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 12a3597468..4a977ae8cb 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 2c478cba96..abdef1e6ab 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 f6316a32e3..86774f8fa2 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 b1bb6470e1..b8ea7e9ddb 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 90b8ffacfb..2b5b26a01b 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 4465523d5f..8249879d8a 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 cbc4cb2bc8..78c3a68216 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 b69ea73f6e..3c1bb4492b 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 1ca5895740..b463569815 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 fa58b7fcde..37a0547e8a 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 7dda42b48b..3cdb9e03ed 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 ca67afbb2e..4331c16064 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 d4ddf3b4e0..008a303ec7 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 607dfbb519..b42d498012 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 bd6b84745b..cb5b1c0683 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. |