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/tqc/tqm834x/Makefile | 4 +--- board/tqc/tqm834x/pci.c | 3 +-- board/tqc/tqm834x/tqm834x.c | 3 +-- board/tqc/tqma6/Makefile | 4 +--- board/tqc/tqma6/clocks.cfg | 3 +-- board/tqc/tqma6/tqma6.c | 3 +-- board/tqc/tqma6/tqma6_bb.h | 3 +-- board/tqc/tqma6/tqma6_mba6.c | 3 +-- board/tqc/tqma6/tqma6_wru4.c | 3 +-- board/tqc/tqma6/tqma6dl.cfg | 3 +-- board/tqc/tqma6/tqma6q.cfg | 3 +-- board/tqc/tqma6/tqma6s.cfg | 3 +-- 12 files changed, 12 insertions(+), 26 deletions(-) (limited to 'board/tqc') diff --git a/board/tqc/tqm834x/Makefile b/board/tqc/tqm834x/Makefile index 12edc9af06..3aafbf7928 100644 --- a/board/tqc/tqm834x/Makefile +++ b/board/tqc/tqm834x/Makefile @@ -1,11 +1,9 @@ +# SPDX-License-Identifier: GPL-2.0+ # # (C) Copyright 2006 # Wolfgang Denk, DENX Software Engineering, wd@denx.de. # # Copyright 2004 Freescale Semiconductor, Inc. -# -# SPDX-License-Identifier: GPL-2.0+ -# obj-y += tqm834x.o obj-$(CONFIG_PCI) += pci.o diff --git a/board/tqc/tqm834x/pci.c b/board/tqc/tqm834x/pci.c index 43ecdf1495..34c68ac463 100644 --- a/board/tqc/tqm834x/pci.c +++ b/board/tqc/tqm834x/pci.c @@ -1,9 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * (C) Copyright 2005 * Wolfgang Denk, DENX Software Engineering, wd@denx.de. * Copyright (C) 2006-2009 Freescale Semiconductor, Inc. - * - * SPDX-License-Identifier: GPL-2.0+ */ #include diff --git a/board/tqc/tqm834x/tqm834x.c b/board/tqc/tqm834x/tqm834x.c index 4642342bfb..7c92f4f54c 100644 --- a/board/tqc/tqm834x/tqm834x.c +++ b/board/tqc/tqm834x/tqm834x.c @@ -1,8 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * (C) Copyright 2005 * Wolfgang Denk, DENX Software Engineering, wd@denx.de. - * - * SPDX-License-Identifier: GPL-2.0+ */ #include diff --git a/board/tqc/tqma6/Makefile b/board/tqc/tqma6/Makefile index 19b56d0165..7271297c70 100644 --- a/board/tqc/tqma6/Makefile +++ b/board/tqc/tqma6/Makefile @@ -1,8 +1,6 @@ +# SPDX-License-Identifier: GPL-2.0+ # # Copyright (C) 2014, Markus Niebel -# -# SPDX-License-Identifier: GPL-2.0+ -# obj-y := tqma6.o diff --git a/board/tqc/tqma6/clocks.cfg b/board/tqc/tqma6/clocks.cfg index d9dd273a2b..a98b30bfe7 100644 --- a/board/tqc/tqma6/clocks.cfg +++ b/board/tqc/tqma6/clocks.cfg @@ -1,9 +1,8 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * Copyright (C) 2013 Boundary Devices * Copyright (C) 2013, 2014 Markus Niebel * - * SPDX-License-Identifier: GPL-2.0+ - * * Refer doc/README.imximage for more details about how-to configure * and create imximage boot image */ diff --git a/board/tqc/tqma6/tqma6.c b/board/tqc/tqma6/tqma6.c index d13e75c207..816672edc6 100644 --- a/board/tqc/tqma6/tqma6.c +++ b/board/tqc/tqma6/tqma6.c @@ -1,11 +1,10 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (C) 2012 Freescale Semiconductor, Inc. * Author: Fabio Estevam * * Copyright (C) 2013, 2014 TQ Systems (ported SabreSD to TQMa6x) * Author: Markus Niebel - * - * SPDX-License-Identifier: GPL-2.0+ */ #include diff --git a/board/tqc/tqma6/tqma6_bb.h b/board/tqc/tqma6/tqma6_bb.h index fb7b4626a1..16b8fb9863 100644 --- a/board/tqc/tqma6/tqma6_bb.h +++ b/board/tqc/tqma6/tqma6_bb.h @@ -1,8 +1,7 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * Copyright (C) 2013, 2014 TQ Systems * Author: Markus Niebel - * - * SPDX-License-Identifier: GPL-2.0+ */ #ifndef __TQMA6_BB__ diff --git a/board/tqc/tqma6/tqma6_mba6.c b/board/tqc/tqma6/tqma6_mba6.c index 37ad916853..f7072b8563 100644 --- a/board/tqc/tqma6/tqma6_mba6.c +++ b/board/tqc/tqma6/tqma6_mba6.c @@ -1,11 +1,10 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (C) 2012 Freescale Semiconductor, Inc. * Author: Fabio Estevam * * Copyright (C) 2013, 2014 TQ Systems (ported SabreSD to TQMa6x) * Author: Markus Niebel - * - * SPDX-License-Identifier: GPL-2.0+ */ #include diff --git a/board/tqc/tqma6/tqma6_wru4.c b/board/tqc/tqma6/tqma6_wru4.c index 128748fcab..aaee9bfbec 100644 --- a/board/tqc/tqma6/tqma6_wru4.c +++ b/board/tqc/tqma6/tqma6_wru4.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (C) 2012 Freescale Semiconductor, Inc. * Author: Fabio Estevam @@ -6,8 +7,6 @@ * Author: Markus Niebel * * Copyright (C) 2015 Stefan Roese - * - * SPDX-License-Identifier: GPL-2.0+ */ #include diff --git a/board/tqc/tqma6/tqma6dl.cfg b/board/tqc/tqma6/tqma6dl.cfg index 716033f3fb..84c38b470b 100644 --- a/board/tqc/tqma6/tqma6dl.cfg +++ b/board/tqc/tqma6/tqma6dl.cfg @@ -1,8 +1,7 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * Copyright (C) 2014 - 2015 Markus Niebel * - * SPDX-License-Identifier: GPL-2.0+ - * * Refer doc/README.imximage for more details about how-to configure * and create imximage boot image * diff --git a/board/tqc/tqma6/tqma6q.cfg b/board/tqc/tqma6/tqma6q.cfg index f54dff7bf2..6141be673b 100644 --- a/board/tqc/tqma6/tqma6q.cfg +++ b/board/tqc/tqma6/tqma6q.cfg @@ -1,8 +1,7 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * Copyright (C) 2013, 2014 Markus Niebel * - * SPDX-License-Identifier: GPL-2.0+ - * * Refer doc/README.imximage for more details about how-to configure * and create imximage boot image * diff --git a/board/tqc/tqma6/tqma6s.cfg b/board/tqc/tqma6/tqma6s.cfg index 24d4e2f562..2d2d65ecc6 100644 --- a/board/tqc/tqma6/tqma6s.cfg +++ b/board/tqc/tqma6/tqma6s.cfg @@ -1,8 +1,7 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * Copyright (C) 2013, 2014 Markus Niebel * - * SPDX-License-Identifier: GPL-2.0+ - * * Refer doc/README.imximage for more details about how-to configure * and create imximage boot image * -- cgit v1.2.3