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/mach-imx/boot_mode.h | 3 +-- arch/arm/include/asm/mach-imx/dma.h | 3 +-- arch/arm/include/asm/mach-imx/gpio.h | 3 +-- arch/arm/include/asm/mach-imx/hab.h | 3 +-- arch/arm/include/asm/mach-imx/imximage.cfg | 3 +-- arch/arm/include/asm/mach-imx/iomux-v3.h | 3 +-- arch/arm/include/asm/mach-imx/mx5_video.h | 3 +-- arch/arm/include/asm/mach-imx/mxc_i2c.h | 3 +-- arch/arm/include/asm/mach-imx/rdc-sema.h | 3 +-- arch/arm/include/asm/mach-imx/regs-apbh.h | 3 +-- arch/arm/include/asm/mach-imx/regs-bch.h | 3 +-- arch/arm/include/asm/mach-imx/regs-common.h | 3 +-- arch/arm/include/asm/mach-imx/regs-gpmi.h | 3 +-- arch/arm/include/asm/mach-imx/regs-lcdif.h | 3 +-- arch/arm/include/asm/mach-imx/regs-usbphy.h | 3 +-- arch/arm/include/asm/mach-imx/sata.h | 3 +-- arch/arm/include/asm/mach-imx/spi.h | 3 +-- arch/arm/include/asm/mach-imx/sys_proto.h | 3 +-- arch/arm/include/asm/mach-imx/syscounter.h | 3 +-- arch/arm/include/asm/mach-imx/video.h | 4 +--- 20 files changed, 20 insertions(+), 41 deletions(-) (limited to 'arch/arm/include/asm/mach-imx') diff --git a/arch/arm/include/asm/mach-imx/boot_mode.h b/arch/arm/include/asm/mach-imx/boot_mode.h index 300868a45e..8766e9d180 100644 --- a/arch/arm/include/asm/mach-imx/boot_mode.h +++ b/arch/arm/include/asm/mach-imx/boot_mode.h @@ -1,7 +1,6 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * Copyright (C) 2012 Boundary Devices Inc. - * - * SPDX-License-Identifier: GPL-2.0+ */ #ifndef _ASM_BOOT_MODE_H diff --git a/arch/arm/include/asm/mach-imx/dma.h b/arch/arm/include/asm/mach-imx/dma.h index 0244947b6e..ca70731b9e 100644 --- a/arch/arm/include/asm/mach-imx/dma.h +++ b/arch/arm/include/asm/mach-imx/dma.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * Freescale i.MX28 APBH DMA * @@ -6,8 +7,6 @@ * * Based on code from LTIB: * Copyright 2008-2010 Freescale Semiconductor, Inc. All Rights Reserved. - * - * SPDX-License-Identifier: GPL-2.0+ */ #ifndef __DMA_H__ diff --git a/arch/arm/include/asm/mach-imx/gpio.h b/arch/arm/include/asm/mach-imx/gpio.h index 26b296b216..1b7c9cd524 100644 --- a/arch/arm/include/asm/mach-imx/gpio.h +++ b/arch/arm/include/asm/mach-imx/gpio.h @@ -1,8 +1,7 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * Copyright (C) 2011 * Stefano Babic, DENX Software Engineering, - * - * SPDX-License-Identifier: GPL-2.0+ */ diff --git a/arch/arm/include/asm/mach-imx/hab.h b/arch/arm/include/asm/mach-imx/hab.h index ce9a44dacd..95df88423c 100644 --- a/arch/arm/include/asm/mach-imx/hab.h +++ b/arch/arm/include/asm/mach-imx/hab.h @@ -1,8 +1,7 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * Copyright (C) 2012-2015 Freescale Semiconductor, Inc. All Rights Reserved. * - * SPDX-License-Identifier: GPL-2.0+ - * */ #ifndef __SECURE_MX6Q_H__ diff --git a/arch/arm/include/asm/mach-imx/imximage.cfg b/arch/arm/include/asm/mach-imx/imximage.cfg index d62166fd06..8fbc0620c3 100644 --- a/arch/arm/include/asm/mach-imx/imximage.cfg +++ b/arch/arm/include/asm/mach-imx/imximage.cfg @@ -1,8 +1,7 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * i.MX image header offset values * Copyright (C) 2013 Marek Vasut - * - * SPDX-License-Identifier: GPL-2.0+ */ /* diff --git a/arch/arm/include/asm/mach-imx/iomux-v3.h b/arch/arm/include/asm/mach-imx/iomux-v3.h index 09094c9af6..bb93058637 100644 --- a/arch/arm/include/asm/mach-imx/iomux-v3.h +++ b/arch/arm/include/asm/mach-imx/iomux-v3.h @@ -1,11 +1,10 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * Based on Linux i.MX iomux-v3.h file: * Copyright (C) 2009 by Jan Weitzel Phytec Messtechnik GmbH, * * * Copyright (C) 2011 Freescale Semiconductor, Inc. - * - * SPDX-License-Identifier: GPL-2.0+ */ #ifndef __MACH_IOMUX_V3_H__ diff --git a/arch/arm/include/asm/mach-imx/mx5_video.h b/arch/arm/include/asm/mach-imx/mx5_video.h index ccaf010b78..dc6aa00c89 100644 --- a/arch/arm/include/asm/mach-imx/mx5_video.h +++ b/arch/arm/include/asm/mach-imx/mx5_video.h @@ -1,8 +1,7 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * Copyright (C) 2012 * Anatolij Gustschin, DENX Software Engineering, - * - * SPDX-License-Identifier: GPL-2.0+ */ #ifndef __MX5_VIDEO_H #define __MX5_VIDEO_H diff --git a/arch/arm/include/asm/mach-imx/mxc_i2c.h b/arch/arm/include/asm/mach-imx/mxc_i2c.h index 80018e4a14..8e1ea9af19 100644 --- a/arch/arm/include/asm/mach-imx/mxc_i2c.h +++ b/arch/arm/include/asm/mach-imx/mxc_i2c.h @@ -1,7 +1,6 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * Copyright (C) 2011 Freescale Semiconductor, Inc. All Rights Reserved. - * - * SPDX-License-Identifier: GPL-2.0+ */ #ifndef __ASM_ARCH_MXC_MXC_I2C_H__ #define __ASM_ARCH_MXC_MXC_I2C_H__ diff --git a/arch/arm/include/asm/mach-imx/rdc-sema.h b/arch/arm/include/asm/mach-imx/rdc-sema.h index 2c61e56126..70d6a76a9d 100644 --- a/arch/arm/include/asm/mach-imx/rdc-sema.h +++ b/arch/arm/include/asm/mach-imx/rdc-sema.h @@ -1,7 +1,6 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * Copyright (C) 2016 Freescale Semiconductor, Inc. - * - * SPDX-License-Identifier: GPL-2.0+ */ #ifndef __RDC_SEMA_H__ diff --git a/arch/arm/include/asm/mach-imx/regs-apbh.h b/arch/arm/include/asm/mach-imx/regs-apbh.h index 4cc4abaf85..d7baf13343 100644 --- a/arch/arm/include/asm/mach-imx/regs-apbh.h +++ b/arch/arm/include/asm/mach-imx/regs-apbh.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * Freescale i.MX28 APBH Register Definitions * @@ -6,8 +7,6 @@ * * Based on code from LTIB: * Copyright 2008-2010 Freescale Semiconductor, Inc. All Rights Reserved. - * - * SPDX-License-Identifier: GPL-2.0+ */ #ifndef __REGS_APBH_H__ diff --git a/arch/arm/include/asm/mach-imx/regs-bch.h b/arch/arm/include/asm/mach-imx/regs-bch.h index c0f673cc33..39ac5f4d45 100644 --- a/arch/arm/include/asm/mach-imx/regs-bch.h +++ b/arch/arm/include/asm/mach-imx/regs-bch.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * Freescale i.MX28 BCH Register Definitions * @@ -6,8 +7,6 @@ * * Based on code from LTIB: * Copyright 2008-2010 Freescale Semiconductor, Inc. All Rights Reserved. - * - * SPDX-License-Identifier: GPL-2.0+ */ #ifndef __MX28_REGS_BCH_H__ diff --git a/arch/arm/include/asm/mach-imx/regs-common.h b/arch/arm/include/asm/mach-imx/regs-common.h index 738267480e..0f9bd3cd7e 100644 --- a/arch/arm/include/asm/mach-imx/regs-common.h +++ b/arch/arm/include/asm/mach-imx/regs-common.h @@ -1,10 +1,9 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * Freescale i.MXS Register Accessors * * Copyright (C) 2011 Marek Vasut * on behalf of DENX Software Engineering GmbH - * - * SPDX-License-Identifier: GPL-2.0+ */ #ifndef __MXS_REGS_COMMON_H__ diff --git a/arch/arm/include/asm/mach-imx/regs-gpmi.h b/arch/arm/include/asm/mach-imx/regs-gpmi.h index 9ff646b227..80cb731724 100644 --- a/arch/arm/include/asm/mach-imx/regs-gpmi.h +++ b/arch/arm/include/asm/mach-imx/regs-gpmi.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * Freescale i.MX28 GPMI Register Definitions * @@ -6,8 +7,6 @@ * * Based on code from LTIB: * Copyright 2008-2010 Freescale Semiconductor, Inc. All Rights Reserved. - * - * SPDX-License-Identifier: GPL-2.0+ */ #ifndef __MX28_REGS_GPMI_H__ diff --git a/arch/arm/include/asm/mach-imx/regs-lcdif.h b/arch/arm/include/asm/mach-imx/regs-lcdif.h index 38a2c6d4ee..d294c90646 100644 --- a/arch/arm/include/asm/mach-imx/regs-lcdif.h +++ b/arch/arm/include/asm/mach-imx/regs-lcdif.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * Freescale i.MX28/6SX/6UL/7D LCDIF Register Definitions * @@ -6,8 +7,6 @@ * * Based on code from LTIB: * Copyright 2008-2010 Freescale Semiconductor, Inc. All Rights Reserved. - * - * SPDX-License-Identifier: GPL-2.0+ */ #ifndef __IMX_REGS_LCDIF_H__ diff --git a/arch/arm/include/asm/mach-imx/regs-usbphy.h b/arch/arm/include/asm/mach-imx/regs-usbphy.h index 220e45f344..2b18ec20f3 100644 --- a/arch/arm/include/asm/mach-imx/regs-usbphy.h +++ b/arch/arm/include/asm/mach-imx/regs-usbphy.h @@ -1,8 +1,7 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * Freescale USB PHY Register Definitions * - * SPDX-License-Identifier: GPL-2.0+ - * */ #ifndef __REGS_USBPHY_H__ diff --git a/arch/arm/include/asm/mach-imx/sata.h b/arch/arm/include/asm/mach-imx/sata.h index 6b864cbd11..cf9b73e68f 100644 --- a/arch/arm/include/asm/mach-imx/sata.h +++ b/arch/arm/include/asm/mach-imx/sata.h @@ -1,7 +1,6 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * Copyright 2011 Freescale Semiconductor, Inc. - * - * SPDX-License-Identifier: GPL-2.0+ */ #ifndef __IMX_SATA_H_ diff --git a/arch/arm/include/asm/mach-imx/spi.h b/arch/arm/include/asm/mach-imx/spi.h index 1d4473a04a..598a996a3c 100644 --- a/arch/arm/include/asm/mach-imx/spi.h +++ b/arch/arm/include/asm/mach-imx/spi.h @@ -1,7 +1,6 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * Copyright 2011 Freescale Semiconductor, Inc. - * - * SPDX-License-Identifier: GPL-2.0+ */ #ifndef __MXC_SPI_H_ diff --git a/arch/arm/include/asm/mach-imx/sys_proto.h b/arch/arm/include/asm/mach-imx/sys_proto.h index aa51c0d786..d1d6cbc462 100644 --- a/arch/arm/include/asm/mach-imx/sys_proto.h +++ b/arch/arm/include/asm/mach-imx/sys_proto.h @@ -1,8 +1,7 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * (C) Copyright 2009 * Stefano Babic, DENX Software Engineering, sbabic@denx.de. - * - * SPDX-License-Identifier: GPL-2.0+ */ #ifndef _SYS_PROTO_H_ diff --git a/arch/arm/include/asm/mach-imx/syscounter.h b/arch/arm/include/asm/mach-imx/syscounter.h index bdbe26ce35..a2cae1edb8 100644 --- a/arch/arm/include/asm/mach-imx/syscounter.h +++ b/arch/arm/include/asm/mach-imx/syscounter.h @@ -1,7 +1,6 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * Copyright (C) 2015 Freescale Semiconductor, Inc. - * - * SPDX-License-Identifier: GPL-2.0+ */ #ifndef _ASM_ARCH_SYSTEM_COUNTER_H diff --git a/arch/arm/include/asm/mach-imx/video.h b/arch/arm/include/asm/mach-imx/video.h index 941a031964..812e6f85e4 100644 --- a/arch/arm/include/asm/mach-imx/video.h +++ b/arch/arm/include/asm/mach-imx/video.h @@ -1,6 +1,4 @@ -/* - * SPDX-License-Identifier: GPL-2.0+ - */ +/* SPDX-License-Identifier: GPL-2.0+ */ #ifndef __IMX_VIDEO_H_ #define __IMX_VIDEO_H_ -- cgit v1.2.1