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 --- board/socrates/Makefile | 4 +--- board/socrates/ddr.c | 3 +-- board/socrates/law.c | 3 +-- board/socrates/nand.c | 3 +-- board/socrates/sdram.c | 3 +-- board/socrates/socrates.c | 3 +-- board/socrates/tlb.c | 3 +-- board/socrates/upm_table.h | 3 +-- 8 files changed, 8 insertions(+), 17 deletions(-) (limited to 'board/socrates') diff --git a/board/socrates/Makefile b/board/socrates/Makefile index 79bda718d5..e14db8e5d4 100644 --- a/board/socrates/Makefile +++ b/board/socrates/Makefile @@ -1,11 +1,9 @@ +# SPDX-License-Identifier: GPL-2.0+ # # (C) Copyright 2008 # Sergei Poselenov, Emcraft Systems, sposelenov@emcraft.com. # (C) Copyright 2001-2006 # Wolfgang Denk, DENX Software Engineering, wd@denx.de. -# -# SPDX-License-Identifier: GPL-2.0+ -# obj-y += socrates.o obj-y += law.o diff --git a/board/socrates/ddr.c b/board/socrates/ddr.c index fe8a8bfb69..3a94f7becc 100644 --- a/board/socrates/ddr.c +++ b/board/socrates/ddr.c @@ -1,7 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0 /* * Copyright 2008 Freescale Semiconductor, Inc. - * - * SPDX-License-Identifier: GPL-2.0 */ #include diff --git a/board/socrates/law.c b/board/socrates/law.c index 449a030820..44703e8aca 100644 --- a/board/socrates/law.c +++ b/board/socrates/law.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * (C) Copyright 2008 * Sergei Poselenov, Emcraft Systems, sposelenov@emcraft.com. @@ -6,8 +7,6 @@ * * (C) Copyright 2000 * Wolfgang Denk, DENX Software Engineering, wd@denx.de. - * - * SPDX-License-Identifier: GPL-2.0+ */ #include diff --git a/board/socrates/nand.c b/board/socrates/nand.c index c7483fe0e6..07c493679b 100644 --- a/board/socrates/nand.c +++ b/board/socrates/nand.c @@ -1,8 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * (C) Copyright 2008 * Sergei Poselenov, Emcraft Systems, sposelenov@emcraft.com. - * - * SPDX-License-Identifier: GPL-2.0+ */ #include diff --git a/board/socrates/sdram.c b/board/socrates/sdram.c index aebd02f76c..4c76b4d0a8 100644 --- a/board/socrates/sdram.c +++ b/board/socrates/sdram.c @@ -1,8 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * (C) Copyright 2008 * Sergei Poselenov, Emcraft Systems, sposelenov@emcraft.com. - * - * SPDX-License-Identifier: GPL-2.0+ */ #include diff --git a/board/socrates/socrates.c b/board/socrates/socrates.c index a130b7daec..ff465a8ef2 100644 --- a/board/socrates/socrates.c +++ b/board/socrates/socrates.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * (C) Copyright 2008 * Sergei Poselenov, Emcraft Systems, sposelenov@emcraft.com. @@ -7,8 +8,6 @@ * Xianghua Xiao, (X.Xiao@motorola.com) * * (C) Copyright 2002 Scott McNutt - * - * SPDX-License-Identifier: GPL-2.0+ */ #include diff --git a/board/socrates/tlb.c b/board/socrates/tlb.c index f3b093a6a4..de80c3c0e5 100644 --- a/board/socrates/tlb.c +++ b/board/socrates/tlb.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * (C) Copyright 2008 * Sergei Poselenov, Emcraft Systems, sposelenov@emcraft.com. @@ -6,8 +7,6 @@ * * (C) Copyright 2000 * Wolfgang Denk, DENX Software Engineering, wd@denx.de. - * - * SPDX-License-Identifier: GPL-2.0+ */ #include diff --git a/board/socrates/upm_table.h b/board/socrates/upm_table.h index 600d5f0965..1fc9c5c9aa 100644 --- a/board/socrates/upm_table.h +++ b/board/socrates/upm_table.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * (C) Copyright 2008 * Sergei Poselenov, Emcraft Systems, sposelenov@emcraft.com. @@ -8,8 +9,6 @@ * * (C) Copyright 2000 * Wolfgang Denk, DENX Software Engineering, wd@denx.de. - * - * SPDX-License-Identifier: GPL-2.0+ */ #ifndef __UPM_TABLE_H -- cgit v1.2.3