diff options
| author | Tom Rini <trini@konsulko.com> | 2018-05-06 17:58:06 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2018-05-07 09:34:12 -0400 |
| commit | 83d290c56fab2d38cd1ab4c4cc7099559c1d5046 (patch) | |
| tree | 5e5d1b40b52aaf96b707e0da2474573306d22f7b /arch/sh/include | |
| 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 'arch/sh/include')
24 files changed, 24 insertions, 48 deletions
diff --git a/arch/sh/include/asm/byteorder.h b/arch/sh/include/asm/byteorder.h index 74fbfb3eb64..b5dfe4e4d8e 100644 --- a/arch/sh/include/asm/byteorder.h +++ b/arch/sh/include/asm/byteorder.h @@ -1,6 +1,4 @@ -/* - * SPDX-License-Identifier: GPL-2.0+ - */ +/* SPDX-License-Identifier: GPL-2.0+ */ #ifndef __ASM_SH_BYTEORDER_H_ #define __ASM_SH_BYTEORDER_H_ diff --git a/arch/sh/include/asm/config.h b/arch/sh/include/asm/config.h index cd297347894..bad0026648a 100644 --- a/arch/sh/include/asm/config.h +++ b/arch/sh/include/asm/config.h @@ -1,7 +1,6 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * Copyright 2009 Freescale Semiconductor, Inc. - * - * SPDX-License-Identifier: GPL-2.0+ */ #ifndef _ASM_CONFIG_H_ diff --git a/arch/sh/include/asm/cpu_sh2.h b/arch/sh/include/asm/cpu_sh2.h index 18a0f0ba24e..d98bedd6257 100644 --- a/arch/sh/include/asm/cpu_sh2.h +++ b/arch/sh/include/asm/cpu_sh2.h @@ -1,8 +1,7 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * Copyright (C) 2007,2008 Nobuhiro Iwamatsu <iwamatsu@nigauri.org> * Copyright (C) 2008 Renesas Solutions Corp. - * - * SPDX-License-Identifier: GPL-2.0+ */ #ifndef _ASM_CPU_SH2_H_ diff --git a/arch/sh/include/asm/cpu_sh3.h b/arch/sh/include/asm/cpu_sh3.h index 0c85e94f9f3..a5d3ff7b606 100644 --- a/arch/sh/include/asm/cpu_sh3.h +++ b/arch/sh/include/asm/cpu_sh3.h @@ -1,8 +1,7 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * (C) Copyright 2007-2009 Nobuhiro Iwamatsu <iwamatsu@nigauri.org> * (C) Copyright 2007 Yoshihiro Shimoda <shimoda.yoshihiro@renesas.com> - * - * SPDX-License-Identifier: GPL-2.0+ */ #ifndef _ASM_CPU_SH3_H_ diff --git a/arch/sh/include/asm/cpu_sh4.h b/arch/sh/include/asm/cpu_sh4.h index 9f48e4fe048..b558d6935cc 100644 --- a/arch/sh/include/asm/cpu_sh4.h +++ b/arch/sh/include/asm/cpu_sh4.h @@ -1,7 +1,6 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * (C) Copyright 2007,2008 Nobuhiro Iwamatsu <iwamatsu@nigauri.org> - * - * SPDX-License-Identifier: GPL-2.0+ */ #ifndef _ASM_CPU_SH4_H_ diff --git a/arch/sh/include/asm/cpu_sh7720.h b/arch/sh/include/asm/cpu_sh7720.h index 6a861bd99dc..5c361acdcb8 100644 --- a/arch/sh/include/asm/cpu_sh7720.h +++ b/arch/sh/include/asm/cpu_sh7720.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * Copyright 2007 (C) * Yoshihiro Shimoda <shimoda.yoshihiro@renesas.com> @@ -6,8 +7,6 @@ * Mark Jonas <mark.jonas@de.bosch.com> * * SH7720 Internal I/O register - * - * SPDX-License-Identifier: GPL-2.0+ */ #ifndef _ASM_CPU_SH7720_H_ diff --git a/arch/sh/include/asm/cpu_sh7722.h b/arch/sh/include/asm/cpu_sh7722.h index bf57e18a64e..9f1f6a04741 100644 --- a/arch/sh/include/asm/cpu_sh7722.h +++ b/arch/sh/include/asm/cpu_sh7722.h @@ -1,9 +1,8 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * (C) Copyright 2007 Nobuhiro Iwamatsu <iwamatsu@nigauri.org> * * SH7722 Internal I/O register - * - * SPDX-License-Identifier: GPL-2.0+ */ #ifndef _ASM_CPU_SH7722_H_ diff --git a/arch/sh/include/asm/cpu_sh7723.h b/arch/sh/include/asm/cpu_sh7723.h index 9d8cb8db444..59116cf0fe5 100644 --- a/arch/sh/include/asm/cpu_sh7723.h +++ b/arch/sh/include/asm/cpu_sh7723.h @@ -1,9 +1,8 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * (C) Copyright 2008 Renesas Solutions Corp. * * SH7723 Internal I/O register - * - * SPDX-License-Identifier: GPL-2.0+ */ #ifndef _ASM_CPU_SH7723_H_ diff --git a/arch/sh/include/asm/cpu_sh7724.h b/arch/sh/include/asm/cpu_sh7724.h index 88c418a17f8..7a81e1677e5 100644 --- a/arch/sh/include/asm/cpu_sh7724.h +++ b/arch/sh/include/asm/cpu_sh7724.h @@ -1,9 +1,8 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * (C) Copyright 2008, 2011 Renesas Solutions Corp. * * SH7724 Internal I/O register - * - * SPDX-License-Identifier: GPL-2.0+ */ #ifndef _ASM_CPU_SH7724_H_ diff --git a/arch/sh/include/asm/cpu_sh7734.h b/arch/sh/include/asm/cpu_sh7734.h index 98fd61c2132..546f4fff9b4 100644 --- a/arch/sh/include/asm/cpu_sh7734.h +++ b/arch/sh/include/asm/cpu_sh7734.h @@ -1,9 +1,8 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * (C) Copyright 2008, 2011 Renesas Solutions Corp. * * SH7734 Internal I/O register - * - * SPDX-License-Identifier: GPL-2.0+ */ #ifndef _ASM_CPU_SH7734_H_ diff --git a/arch/sh/include/asm/cpu_sh7750.h b/arch/sh/include/asm/cpu_sh7750.h index d5bf3fd6d02..e0cafbdbba0 100644 --- a/arch/sh/include/asm/cpu_sh7750.h +++ b/arch/sh/include/asm/cpu_sh7750.h @@ -1,10 +1,9 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * (C) Copyright 2007 Nobuhiro Iwamatsu <iwamatsu@nigauri.org> * * SH7750/SH7750S/SH7750R/SH7751/SH7751R * Internal I/O register - * - * SPDX-License-Identifier: GPL-2.0+ */ #ifndef _ASM_CPU_SH7750_H_ diff --git a/arch/sh/include/asm/cpu_sh7752.h b/arch/sh/include/asm/cpu_sh7752.h index 229ab07af3d..e024423f25a 100644 --- a/arch/sh/include/asm/cpu_sh7752.h +++ b/arch/sh/include/asm/cpu_sh7752.h @@ -1,7 +1,6 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * Copyright (C) 2012 Renesas Solutions Corp. - * - * SPDX-License-Identifier: GPL-2.0+ */ #ifndef _ASM_CPU_SH7752_H_ diff --git a/arch/sh/include/asm/cpu_sh7753.h b/arch/sh/include/asm/cpu_sh7753.h index cd0e0bba6c2..2f779b137e1 100644 --- a/arch/sh/include/asm/cpu_sh7753.h +++ b/arch/sh/include/asm/cpu_sh7753.h @@ -1,7 +1,6 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * Copyright (C) 2012 Renesas Solutions Corp. - * - * SPDX-License-Identifier: GPL-2.0+ */ #ifndef _ASM_CPU_SH7753_H_ diff --git a/arch/sh/include/asm/cpu_sh7757.h b/arch/sh/include/asm/cpu_sh7757.h index a64602d8b8b..b3aaec2aaa1 100644 --- a/arch/sh/include/asm/cpu_sh7757.h +++ b/arch/sh/include/asm/cpu_sh7757.h @@ -1,7 +1,6 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * Copyright (C) 2011 Renesas Solutions Corp. - * - * SPDX-License-Identifier: GPL-2.0+ */ #ifndef _ASM_CPU_SH7757_H_ diff --git a/arch/sh/include/asm/cpu_sh7763.h b/arch/sh/include/asm/cpu_sh7763.h index 8ee1619432e..e56d135abef 100644 --- a/arch/sh/include/asm/cpu_sh7763.h +++ b/arch/sh/include/asm/cpu_sh7763.h @@ -1,8 +1,7 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * Copyright (C) 2008 Renesas Solutions Corp. * Copyright (C) 2007,2008 Nobuhiro Iwamatsu - * - * SPDX-License-Identifier: GPL-2.0+ */ #ifndef _ASM_CPU_SH7763_H_ #define _ASM_CPU_SH7763_H_ diff --git a/arch/sh/include/asm/cpu_sh7780.h b/arch/sh/include/asm/cpu_sh7780.h index 8302ce1c6ae..2ac3e930745 100644 --- a/arch/sh/include/asm/cpu_sh7780.h +++ b/arch/sh/include/asm/cpu_sh7780.h @@ -1,11 +1,10 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ #ifndef _ASM_CPU_SH7780_H_ #define _ASM_CPU_SH7780_H_ /* * Copyright (c) 2007,2008 Nobuhiro Iwamatsu * Copyright (c) 2008 Yusuke Goda <goda.yusuke@renesas.com> - * - * SPDX-License-Identifier: GPL-2.0+ */ #define CACHE_OC_NUM_WAYS 1 diff --git a/arch/sh/include/asm/cpu_sh7785.h b/arch/sh/include/asm/cpu_sh7785.h index ceef52d17b1..b0388957f98 100644 --- a/arch/sh/include/asm/cpu_sh7785.h +++ b/arch/sh/include/asm/cpu_sh7785.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ #ifndef _ASM_CPU_SH7785_H_ #define _ASM_CPU_SH7785_H_ @@ -5,8 +6,6 @@ * Copyright (c) 2007,2008 Nobuhiro Iwamatsu <iwamatsu@nigauri.org> * Copyright (c) 2008 Yusuke Goda <goda.yusuke@renesas.com> * Copyright (c) 2008 Yoshihiro Shimoda <shimoda.yoshihiro@renesas.com> - * - * SPDX-License-Identifier: GPL-2.0+ */ #define CACHE_OC_NUM_WAYS 1 diff --git a/arch/sh/include/asm/global_data.h b/arch/sh/include/asm/global_data.h index 7e59b9a4695..bd946ffd8fd 100644 --- a/arch/sh/include/asm/global_data.h +++ b/arch/sh/include/asm/global_data.h @@ -1,11 +1,10 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * (C) Copyright 2002-2010 * Wolfgang Denk, DENX Software Engineering, wd@denx.de. * * (C) Copyright 2007 * Nobuhiro Iwamatsu <iwamatsu@nigauri.org> - * - * SPDX-License-Identifier: GPL-2.0+ */ #ifndef __ASM_SH_GLOBALDATA_H_ diff --git a/arch/sh/include/asm/macro.h b/arch/sh/include/asm/macro.h index 72499ead76f..e15ec0a27ee 100644 --- a/arch/sh/include/asm/macro.h +++ b/arch/sh/include/asm/macro.h @@ -1,7 +1,6 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * Copyright (C) 2008 Yoshihiro Shimoda <shimoda.yoshihiro@renesas.com> - * - * SPDX-License-Identifier: GPL-2.0+ */ #ifndef __MACRO_H__ diff --git a/arch/sh/include/asm/mmc.h b/arch/sh/include/asm/mmc.h index c0960575479..5732b2bca3b 100644 --- a/arch/sh/include/asm/mmc.h +++ b/arch/sh/include/asm/mmc.h @@ -1,11 +1,10 @@ +/* SPDX-License-Identifier: GPL-2.0 */ /* * Renesas SuperH MMCIF driver. * * Copyright (C) 2012 Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com> * Copyright (C) 2012 Renesas Solutions Corp. * - * SPDX-License-Identifier: GPL-2.0 - * */ #ifndef _SH_MMC_H_ #define _SH_MMC_H_ diff --git a/arch/sh/include/asm/pci.h b/arch/sh/include/asm/pci.h index 71697e101f8..5d79d0ec58e 100644 --- a/arch/sh/include/asm/pci.h +++ b/arch/sh/include/asm/pci.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * SH4 PCI Controller (PCIC) for U-Boot. * (C) Dustin McIntire (dustin@sensoria.com) @@ -5,8 +6,6 @@ * (C) 2008 Yusuke Goda <goda.yusuke@renesas.com> * * u-boot/include/asm-sh/pci.h - * - * SPDX-License-Identifier: GPL-2.0+ */ #ifndef _ASM_PCI_H_ #define _ASM_PCI_H_ diff --git a/arch/sh/include/asm/sections.h b/arch/sh/include/asm/sections.h index 9ed1aa46ced..85859e59a13 100644 --- a/arch/sh/include/asm/sections.h +++ b/arch/sh/include/asm/sections.h @@ -1,6 +1,6 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * Copyright (c) 2012 The Chromium OS Authors. - * SPDX-License-Identifier: GPL-2.0+ */ #ifndef __ASM_SH_SECTIONS_H diff --git a/arch/sh/include/asm/u-boot.h b/arch/sh/include/asm/u-boot.h index 716d8e9f2dc..d1eb1ab7cb1 100644 --- a/arch/sh/include/asm/u-boot.h +++ b/arch/sh/include/asm/u-boot.h @@ -1,6 +1,5 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* - * SPDX-License-Identifier: GPL-2.0+ - * ******************************************************************** * NOTE: This header file defines an interface to U-Boot. Including * this (unmodified) header file in another file is considered normal diff --git a/arch/sh/include/asm/zimage.h b/arch/sh/include/asm/zimage.h index 0beb269d39a..23be23da314 100644 --- a/arch/sh/include/asm/zimage.h +++ b/arch/sh/include/asm/zimage.h @@ -1,9 +1,8 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * (C) Copyright 2010 * Renesas Solutions Corp. * Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com> - * - * SPDX-License-Identifier: GPL-2.0+ */ #ifndef _ASM_ZIMAGE_H_ |