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 --- arch/arm/include/asm/arch-omap4/clock.h | 3 +-- arch/arm/include/asm/arch-omap4/cpu.h | 3 +-- arch/arm/include/asm/arch-omap4/ehci.h | 3 +-- arch/arm/include/asm/arch-omap4/gpio.h | 3 +-- arch/arm/include/asm/arch-omap4/hardware.h | 3 +-- arch/arm/include/asm/arch-omap4/i2c.h | 3 +-- arch/arm/include/asm/arch-omap4/mem.h | 3 +-- arch/arm/include/asm/arch-omap4/mux_omap4.h | 3 +-- arch/arm/include/asm/arch-omap4/omap.h | 3 +-- arch/arm/include/asm/arch-omap4/spl.h | 3 +-- arch/arm/include/asm/arch-omap4/sys_proto.h | 3 +-- 11 files changed, 11 insertions(+), 22 deletions(-) (limited to 'arch/arm/include/asm/arch-omap4') diff --git a/arch/arm/include/asm/arch-omap4/clock.h b/arch/arm/include/asm/arch-omap4/clock.h index a408c0cd41..037045ca31 100644 --- a/arch/arm/include/asm/arch-omap4/clock.h +++ b/arch/arm/include/asm/arch-omap4/clock.h @@ -1,10 +1,9 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * (C) Copyright 2010 * Texas Instruments, * * Aneesh V - * - * SPDX-License-Identifier: GPL-2.0+ */ #ifndef _CLOCKS_OMAP4_H_ #define _CLOCKS_OMAP4_H_ diff --git a/arch/arm/include/asm/arch-omap4/cpu.h b/arch/arm/include/asm/arch-omap4/cpu.h index f7595ae577..4c9ed45583 100644 --- a/arch/arm/include/asm/arch-omap4/cpu.h +++ b/arch/arm/include/asm/arch-omap4/cpu.h @@ -1,8 +1,7 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * (C) Copyright 2006-2010 * Texas Instruments, - * - * SPDX-License-Identifier: GPL-2.0+ */ #ifndef _CPU_H diff --git a/arch/arm/include/asm/arch-omap4/ehci.h b/arch/arm/include/asm/arch-omap4/ehci.h index 48ba622ed1..30bdaad64e 100644 --- a/arch/arm/include/asm/arch-omap4/ehci.h +++ b/arch/arm/include/asm/arch-omap4/ehci.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0 */ /* * OMAP EHCI port support * Based on LINUX KERNEL @@ -5,8 +6,6 @@ * * Copyright (C) 2011 Texas Instruments Incorporated - http://www.ti.com * Author: Govindraj R - * - * SPDX-License-Identifier: GPL-2.0 */ #ifndef _OMAP4_EHCI_H_ diff --git a/arch/arm/include/asm/arch-omap4/gpio.h b/arch/arm/include/asm/arch-omap4/gpio.h index 72ba1d71a2..aceb3e227c 100644 --- a/arch/arm/include/asm/arch-omap4/gpio.h +++ b/arch/arm/include/asm/arch-omap4/gpio.h @@ -1,9 +1,8 @@ +/* SPDX-License-Identifier: GPL-2.0 */ /* * Copyright (c) 2009 Wind River Systems, Inc. * Tom Rix * - * SPDX-License-Identifier: GPL-2.0 - * * This work is derived from the linux 2.6.27 kernel source * To fetch, use the kernel repository * git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git diff --git a/arch/arm/include/asm/arch-omap4/hardware.h b/arch/arm/include/asm/arch-omap4/hardware.h index f7011b4e90..48dc809249 100644 --- a/arch/arm/include/asm/arch-omap4/hardware.h +++ b/arch/arm/include/asm/arch-omap4/hardware.h @@ -1,11 +1,10 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * hardware.h * * hardware specific header * * Copyright (C) 2013, Texas Instruments, Incorporated - http://www.ti.com/ - * - * SPDX-License-Identifier: GPL-2.0+ */ #ifndef __OMAP_HARDWARE_H diff --git a/arch/arm/include/asm/arch-omap4/i2c.h b/arch/arm/include/asm/arch-omap4/i2c.h index 96c095436a..c60aac778e 100644 --- a/arch/arm/include/asm/arch-omap4/i2c.h +++ b/arch/arm/include/asm/arch-omap4/i2c.h @@ -1,8 +1,7 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * (C) Copyright 2004-2010 * Texas Instruments, - * - * SPDX-License-Identifier: GPL-2.0+ */ #ifndef _OMAP4_I2C_H_ #define _OMAP4_I2C_H_ diff --git a/arch/arm/include/asm/arch-omap4/mem.h b/arch/arm/include/asm/arch-omap4/mem.h index d2e708bba5..3026a002db 100644 --- a/arch/arm/include/asm/arch-omap4/mem.h +++ b/arch/arm/include/asm/arch-omap4/mem.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * (C) Copyright 2006-2008 * Texas Instruments, @@ -7,8 +8,6 @@ * * Initial Code from: * Richard Woodruff - * - * SPDX-License-Identifier: GPL-2.0+ */ #ifndef _MEM_H_ diff --git a/arch/arm/include/asm/arch-omap4/mux_omap4.h b/arch/arm/include/asm/arch-omap4/mux_omap4.h index b222778137..854203c4e2 100644 --- a/arch/arm/include/asm/arch-omap4/mux_omap4.h +++ b/arch/arm/include/asm/arch-omap4/mux_omap4.h @@ -1,11 +1,10 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * (C) Copyright 2004-2009 * Texas Instruments Incorporated * Richard Woodruff * Aneesh V * Balaji Krishnamoorthy - * - * SPDX-License-Identifier: GPL-2.0+ */ #ifndef _MUX_OMAP4_H_ #define _MUX_OMAP4_H_ diff --git a/arch/arm/include/asm/arch-omap4/omap.h b/arch/arm/include/asm/arch-omap4/omap.h index 1a3ff7dc2f..8919088a70 100644 --- a/arch/arm/include/asm/arch-omap4/omap.h +++ b/arch/arm/include/asm/arch-omap4/omap.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * (C) Copyright 2010 * Texas Instruments, @@ -8,8 +9,6 @@ * Derived from OMAP3 work by * Richard Woodruff * Syed Mohammed Khasim - * - * SPDX-License-Identifier: GPL-2.0+ */ #ifndef _OMAP4_H_ diff --git a/arch/arm/include/asm/arch-omap4/spl.h b/arch/arm/include/asm/arch-omap4/spl.h index bace92dae8..d24944af0a 100644 --- a/arch/arm/include/asm/arch-omap4/spl.h +++ b/arch/arm/include/asm/arch-omap4/spl.h @@ -1,8 +1,7 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * (C) Copyright 2012 * Texas Instruments, - * - * SPDX-License-Identifier: GPL-2.0+ */ #ifndef _ASM_ARCH_SPL_H_ #define _ASM_ARCH_SPL_H_ diff --git a/arch/arm/include/asm/arch-omap4/sys_proto.h b/arch/arm/include/asm/arch-omap4/sys_proto.h index c8298c57e1..b2a6887658 100644 --- a/arch/arm/include/asm/arch-omap4/sys_proto.h +++ b/arch/arm/include/asm/arch-omap4/sys_proto.h @@ -1,8 +1,7 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * (C) Copyright 2010 * Texas Instruments, - * - * SPDX-License-Identifier: GPL-2.0+ */ #ifndef _SYS_PROTO_H_ -- cgit