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/arm/mach-omap2 | |
parent | 7ce85318cfff5fd82a059131761559cba7fef309 (diff) | |
download | u-boot-83d290c56fab2d38cd1ab4c4cc7099559c1d5046.tar.gz |
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/arm/mach-omap2')
66 files changed, 66 insertions, 138 deletions
diff --git a/arch/arm/mach-omap2/Makefile b/arch/arm/mach-omap2/Makefile index d86643db34..0777a0c998 100644 --- a/arch/arm/mach-omap2/Makefile +++ b/arch/arm/mach-omap2/Makefile @@ -1,9 +1,7 @@ +# SPDX-License-Identifier: GPL-2.0+ # # (C) Copyright 2000-2003 # Wolfgang Denk, DENX Software Engineering, wd@denx.de. -# -# SPDX-License-Identifier: GPL-2.0+ -# obj-$(if $(filter am33xx,$(SOC)),y) += am33xx/ obj-$(CONFIG_OMAP34XX) += omap3/ diff --git a/arch/arm/mach-omap2/abb.c b/arch/arm/mach-omap2/abb.c index a0add6643e..108c93542d 100644 --- a/arch/arm/mach-omap2/abb.c +++ b/arch/arm/mach-omap2/abb.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Adaptive Body Bias programming sequence for OMAP family * @@ -5,8 +6,6 @@ * Texas Instruments, <www.ti.com> * * Andrii Tseglytskyi <andrii.tseglytskyi@ti.com> - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/arch/arm/mach-omap2/am33xx/Makefile b/arch/arm/mach-omap2/am33xx/Makefile index 9d4f83cb75..61c76d045f 100644 --- a/arch/arm/mach-omap2/am33xx/Makefile +++ b/arch/arm/mach-omap2/am33xx/Makefile @@ -1,8 +1,6 @@ +# SPDX-License-Identifier: GPL-2.0+ # # Copyright (C) 2011, Texas Instruments, Incorporated - http://www.ti.com/ -# -# SPDX-License-Identifier: GPL-2.0+ -# obj-$(CONFIG_AM33XX) += clock_am33xx.o obj-$(CONFIG_TI814X) += clock_ti814x.o diff --git a/arch/arm/mach-omap2/am33xx/board.c b/arch/arm/mach-omap2/am33xx/board.c index e1d4ddb44b..f5f2bd5308 100644 --- a/arch/arm/mach-omap2/am33xx/board.c +++ b/arch/arm/mach-omap2/am33xx/board.c @@ -1,11 +1,10 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * board.c * * Common board functions for AM33XX based boards * * Copyright (C) 2011, Texas Instruments, Incorporated - http://www.ti.com/ - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/arch/arm/mach-omap2/am33xx/chilisom.c b/arch/arm/mach-omap2/am33xx/chilisom.c index a594f6cf37..3942305108 100644 --- a/arch/arm/mach-omap2/am33xx/chilisom.c +++ b/arch/arm/mach-omap2/am33xx/chilisom.c @@ -1,8 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (C) 2011, Texas Instruments, Incorporated - http://www.ti.com/ * Copyright (C) 2017, Grinn - http://grinn-global.com/ - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/arch/arm/mach-omap2/am33xx/clk_synthesizer.c b/arch/arm/mach-omap2/am33xx/clk_synthesizer.c index 316e677c65..0e7ad1d3af 100644 --- a/arch/arm/mach-omap2/am33xx/clk_synthesizer.c +++ b/arch/arm/mach-omap2/am33xx/clk_synthesizer.c @@ -1,11 +1,10 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * clk-synthesizer.c * * Clock synthesizer apis * * Copyright (C) 2016, Texas Instruments, Incorporated - http://www.ti.com/ - * - * SPDX-License-Identifier: GPL-2.0+ */ diff --git a/arch/arm/mach-omap2/am33xx/clock.c b/arch/arm/mach-omap2/am33xx/clock.c index ad28d205ee..7c666be758 100644 --- a/arch/arm/mach-omap2/am33xx/clock.c +++ b/arch/arm/mach-omap2/am33xx/clock.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * clock.c * @@ -5,8 +6,6 @@ * Derived from OMAP4 boards * * Copyright (C) 2013, Texas Instruments, Incorporated - http://www.ti.com/ - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> #include <asm/arch/cpu.h> diff --git a/arch/arm/mach-omap2/am33xx/clock_am33xx.c b/arch/arm/mach-omap2/am33xx/clock_am33xx.c index dc61131c1e..32cdf63e3d 100644 --- a/arch/arm/mach-omap2/am33xx/clock_am33xx.c +++ b/arch/arm/mach-omap2/am33xx/clock_am33xx.c @@ -1,11 +1,10 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * clock_am33xx.c * * clocks for AM33XX based boards * * Copyright (C) 2013, Texas Instruments, Incorporated - http://www.ti.com/ - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/arch/arm/mach-omap2/am33xx/clock_am43xx.c b/arch/arm/mach-omap2/am33xx/clock_am43xx.c index 117a63e7ad..b98bb9989c 100644 --- a/arch/arm/mach-omap2/am33xx/clock_am43xx.c +++ b/arch/arm/mach-omap2/am33xx/clock_am43xx.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * clock_am43xx.c * @@ -5,8 +6,6 @@ * Derived from AM33XX based boards * * Copyright (C) 2013, Texas Instruments, Incorporated - http://www.ti.com/ - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/arch/arm/mach-omap2/am33xx/clock_ti814x.c b/arch/arm/mach-omap2/am33xx/clock_ti814x.c index 50bd631cf6..aef090b4f8 100644 --- a/arch/arm/mach-omap2/am33xx/clock_ti814x.c +++ b/arch/arm/mach-omap2/am33xx/clock_ti814x.c @@ -1,11 +1,10 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * clock_ti814x.c * * Clocks for TI814X based boards * * Copyright (C) 2013, Texas Instruments, Incorporated - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/arch/arm/mach-omap2/am33xx/ddr.c b/arch/arm/mach-omap2/am33xx/ddr.c index 7bf19ed966..be6f4d72cc 100644 --- a/arch/arm/mach-omap2/am33xx/ddr.c +++ b/arch/arm/mach-omap2/am33xx/ddr.c @@ -1,9 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * DDR Configuration for AM33xx devices. * * Copyright (C) 2011 Texas Instruments Incorporated - http://www.ti.com/ - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <asm/arch/cpu.h> diff --git a/arch/arm/mach-omap2/am33xx/emif4.c b/arch/arm/mach-omap2/am33xx/emif4.c index 9b429c9262..a5fdb0433d 100644 --- a/arch/arm/mach-omap2/am33xx/emif4.c +++ b/arch/arm/mach-omap2/am33xx/emif4.c @@ -1,11 +1,10 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * emif4.c * * AM33XX emif4 configuration file * * Copyright (C) 2011, Texas Instruments, Incorporated - http://www.ti.com/ - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/arch/arm/mach-omap2/am33xx/fdt.c b/arch/arm/mach-omap2/am33xx/fdt.c index fa99dc76d3..1005a5be96 100644 --- a/arch/arm/mach-omap2/am33xx/fdt.c +++ b/arch/arm/mach-omap2/am33xx/fdt.c @@ -1,7 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright 2017 Texas Instruments, Inc. - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/arch/arm/mach-omap2/am33xx/hw_data.c b/arch/arm/mach-omap2/am33xx/hw_data.c index 63e55cff77..e9e5415bea 100644 --- a/arch/arm/mach-omap2/am33xx/hw_data.c +++ b/arch/arm/mach-omap2/am33xx/hw_data.c @@ -1,10 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * HW data initialization for AM33xx. * * (C) Copyright 2017 Linaro Ltd. * Sam Protsenko <semen.protsenko@linaro.org> - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <asm/arch/omap.h> diff --git a/arch/arm/mach-omap2/am33xx/prcm-regs.c b/arch/arm/mach-omap2/am33xx/prcm-regs.c index c9a3af6584..d4c661e5a8 100644 --- a/arch/arm/mach-omap2/am33xx/prcm-regs.c +++ b/arch/arm/mach-omap2/am33xx/prcm-regs.c @@ -1,10 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * HW regs data for AM33xx. * * (C) Copyright 2017 Linaro Ltd. * Sam Protsenko <semen.protsenko@linaro.org> - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <asm/arch/hardware.h> diff --git a/arch/arm/mach-omap2/am33xx/sys_info.c b/arch/arm/mach-omap2/am33xx/sys_info.c index 0181a8cb0c..17b46619b5 100644 --- a/arch/arm/mach-omap2/am33xx/sys_info.c +++ b/arch/arm/mach-omap2/am33xx/sys_info.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * sys_info.c * @@ -8,8 +9,6 @@ * Derived from Beagle Board and 3430 SDP code by * Richard Woodruff <r-woodruff2@ti.com> * Syed Mohammed Khasim <khasim@ti.com> - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/arch/arm/mach-omap2/am33xx/ti816x_emif4.c b/arch/arm/mach-omap2/am33xx/ti816x_emif4.c index 2e7ea90da9..9f59489958 100644 --- a/arch/arm/mach-omap2/am33xx/ti816x_emif4.c +++ b/arch/arm/mach-omap2/am33xx/ti816x_emif4.c @@ -1,11 +1,10 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * ti816x_emif4.c * * TI816x emif4 configuration file * * Copyright (C) 2017, Konsulko Group - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/arch/arm/mach-omap2/boot-common.c b/arch/arm/mach-omap2/boot-common.c index f9ab5da723..0e9fd03fef 100644 --- a/arch/arm/mach-omap2/boot-common.c +++ b/arch/arm/mach-omap2/boot-common.c @@ -1,11 +1,10 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * boot-common.c * * Common bootmode functions for omap based boards * * Copyright (C) 2011, Texas Instruments, Incorporated - http://www.ti.com/ - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/arch/arm/mach-omap2/clocks-common.c b/arch/arm/mach-omap2/clocks-common.c index 93c4c6fe33..790548ee79 100644 --- a/arch/arm/mach-omap2/clocks-common.c +++ b/arch/arm/mach-omap2/clocks-common.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * * Clock initialization for OMAP4 @@ -10,8 +11,6 @@ * Based on previous work by: * Santosh Shilimkar <santosh.shilimkar@ti.com> * Rajendra Nayak <rnayak@ti.com> - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> #include <i2c.h> diff --git a/arch/arm/mach-omap2/config_secure.mk b/arch/arm/mach-omap2/config_secure.mk index c12fbc6ad6..ebdc00fded 100644 --- a/arch/arm/mach-omap2/config_secure.mk +++ b/arch/arm/mach-omap2/config_secure.mk @@ -1,8 +1,6 @@ +# SPDX-License-Identifier: GPL-2.0+ # # Copyright (C) 2016, Texas Instruments, Incorporated - http://www.ti.com/ -# -# SPDX-License-Identifier: GPL-2.0+ -# quiet_cmd_mkomapsecimg = SECURE $@ ifneq ($(TI_SECURE_DEV_PKG),) ifneq ($(wildcard $(TI_SECURE_DEV_PKG)/scripts/create-boot-image.sh),) diff --git a/arch/arm/mach-omap2/emif-common.c b/arch/arm/mach-omap2/emif-common.c index d6c56b0ae8..b384343a3f 100644 --- a/arch/arm/mach-omap2/emif-common.c +++ b/arch/arm/mach-omap2/emif-common.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * EMIF programming * @@ -5,8 +6,6 @@ * Texas Instruments, <www.ti.com> * * Aneesh V <aneesh@ti.com> - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/arch/arm/mach-omap2/fdt-common.c b/arch/arm/mach-omap2/fdt-common.c index 3c368ba93b..3f420186ad 100644 --- a/arch/arm/mach-omap2/fdt-common.c +++ b/arch/arm/mach-omap2/fdt-common.c @@ -1,7 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright 2016-2017 Texas Instruments, Inc. - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/arch/arm/mach-omap2/hwinit-common.c b/arch/arm/mach-omap2/hwinit-common.c index 4f491e60f2..1a24acb748 100644 --- a/arch/arm/mach-omap2/hwinit-common.c +++ b/arch/arm/mach-omap2/hwinit-common.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * * Common functions for OMAP4/5 based boards @@ -8,8 +9,6 @@ * Author : * Aneesh V <aneesh@ti.com> * Steve Sakoman <steve@sakoman.com> - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> #include <debug_uart.h> diff --git a/arch/arm/mach-omap2/lowlevel_init.S b/arch/arm/mach-omap2/lowlevel_init.S index 8ce12c8e9a..1a55295f9d 100644 --- a/arch/arm/mach-omap2/lowlevel_init.S +++ b/arch/arm/mach-omap2/lowlevel_init.S @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * Board specific setup info * @@ -6,8 +7,6 @@ * * Author : * Aneesh V <aneesh@ti.com> - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <config.h> diff --git a/arch/arm/mach-omap2/mem-common.c b/arch/arm/mach-omap2/mem-common.c index d72e82e028..ff1e3125a0 100644 --- a/arch/arm/mach-omap2/mem-common.c +++ b/arch/arm/mach-omap2/mem-common.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * (C) Copyright 2010 * Texas Instruments, <www.ti.com> @@ -9,8 +10,6 @@ * Manikandan Pillai <mani.pillai@ti.com> * Richard Woodruff <r-woodruff2@ti.com> * Syed Mohammed Khasim <khasim@ti.com> - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/arch/arm/mach-omap2/omap-cache.c b/arch/arm/mach-omap2/omap-cache.c index 975ee1b020..d58a0a15ff 100644 --- a/arch/arm/mach-omap2/omap-cache.c +++ b/arch/arm/mach-omap2/omap-cache.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * * Common functions for OMAP4/5 based boards @@ -8,8 +9,6 @@ * Author : * Aneesh V <aneesh@ti.com> * Steve Sakoman <steve@sakoman.com> - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/arch/arm/mach-omap2/omap3/Makefile b/arch/arm/mach-omap2/omap3/Makefile index 61a76b6f66..91ed8ebc9f 100644 --- a/arch/arm/mach-omap2/omap3/Makefile +++ b/arch/arm/mach-omap2/omap3/Makefile @@ -1,9 +1,7 @@ +# SPDX-License-Identifier: GPL-2.0+ # # (C) Copyright 2000-2003 # Wolfgang Denk, DENX Software Engineering, wd@denx.de. -# -# SPDX-License-Identifier: GPL-2.0+ -# # If clock.c is compiled for Thumb2, then it fails on OMAP3530 CFLAGS_clock.o += -marm diff --git a/arch/arm/mach-omap2/omap3/am35x_musb.c b/arch/arm/mach-omap2/omap3/am35x_musb.c index d542699ab0..5af6d28e74 100644 --- a/arch/arm/mach-omap2/omap3/am35x_musb.c +++ b/arch/arm/mach-omap2/omap3/am35x_musb.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * This file configures the internal USB PHY in AM35X. * @@ -5,8 +6,6 @@ * * Based on omap_phy_internal.c code from Linux by * Hema HK <hemahk@ti.com> - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/arch/arm/mach-omap2/omap3/board.c b/arch/arm/mach-omap2/omap3/board.c index b4c9af1290..2d25fc60a0 100644 --- a/arch/arm/mach-omap2/omap3/board.c +++ b/arch/arm/mach-omap2/omap3/board.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * * Common board functions for OMAP3 based boards. @@ -13,8 +14,6 @@ * Richard Woodruff <r-woodruff2@ti.com> * Syed Mohammed Khasim <khasim@ti.com> * - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> #include <dm.h> diff --git a/arch/arm/mach-omap2/omap3/boot.c b/arch/arm/mach-omap2/omap3/boot.c index 64b242b752..ea26115b71 100644 --- a/arch/arm/mach-omap2/omap3/boot.c +++ b/arch/arm/mach-omap2/omap3/boot.c @@ -1,9 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * OMAP3 boot * * Copyright (C) 2015 Paul Kocialkowski <contact@paulk.fr> - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/arch/arm/mach-omap2/omap3/clock.c b/arch/arm/mach-omap2/omap3/clock.c index 3daae61e1d..b9d92c62b1 100644 --- a/arch/arm/mach-omap2/omap3/clock.c +++ b/arch/arm/mach-omap2/omap3/clock.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * (C) Copyright 2008 * Texas Instruments, <www.ti.com> @@ -8,8 +9,6 @@ * Derived from Beagle Board and OMAP3 SDP code by * Richard Woodruff <r-woodruff2@ti.com> * Syed Mohammed Khasim <khasim@ti.com> - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/arch/arm/mach-omap2/omap3/emac.c b/arch/arm/mach-omap2/omap3/emac.c index 37f4b8b490..c79e870183 100644 --- a/arch/arm/mach-omap2/omap3/emac.c +++ b/arch/arm/mach-omap2/omap3/emac.c @@ -1,10 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * * DaVinci EMAC initialization. * * (C) Copyright 2011, Ilya Yanok, Emcraft Systems - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/arch/arm/mach-omap2/omap3/emif4.c b/arch/arm/mach-omap2/omap3/emif4.c index 8197e7b032..a8bd428e0c 100644 --- a/arch/arm/mach-omap2/omap3/emif4.c +++ b/arch/arm/mach-omap2/omap3/emif4.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Author : * Vaibhav Hiremath <hvaibhav@ti.com> @@ -6,8 +7,6 @@ * * Copyright (C) 2010 * Texas Instruments Incorporated - http://www.ti.com/ - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/arch/arm/mach-omap2/omap3/hw_data.c b/arch/arm/mach-omap2/omap3/hw_data.c index 53b220aec3..1d21fcc597 100644 --- a/arch/arm/mach-omap2/omap3/hw_data.c +++ b/arch/arm/mach-omap2/omap3/hw_data.c @@ -1,10 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * HW data initialization for OMAP3. * * (C) Copyright 2017 Linaro Ltd. * Sam Protsenko <semen.protsenko@linaro.org> - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <asm/arch/omap.h> diff --git a/arch/arm/mach-omap2/omap3/lowlevel_init.S b/arch/arm/mach-omap2/omap3/lowlevel_init.S index 1e587723ce..e6e907d11f 100644 --- a/arch/arm/mach-omap2/omap3/lowlevel_init.S +++ b/arch/arm/mach-omap2/omap3/lowlevel_init.S @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * Board specific setup info * @@ -7,8 +8,6 @@ * Initial Code by: * Richard Woodruff <r-woodruff2@ti.com> * Syed Mohammed Khasim <khasim@ti.com> - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <config.h> diff --git a/arch/arm/mach-omap2/omap3/prcm-regs.c b/arch/arm/mach-omap2/omap3/prcm-regs.c index ca29ce9bda..e704c8eef1 100644 --- a/arch/arm/mach-omap2/omap3/prcm-regs.c +++ b/arch/arm/mach-omap2/omap3/prcm-regs.c @@ -1,10 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * HW regs data for OMAP3. * * (C) Copyright 2017 Linaro Ltd. * Sam Protsenko <semen.protsenko@linaro.org> - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <asm/arch/omap.h> diff --git a/arch/arm/mach-omap2/omap3/sdrc.c b/arch/arm/mach-omap2/omap3/sdrc.c index f64cd912ff..861d01d6df 100644 --- a/arch/arm/mach-omap2/omap3/sdrc.c +++ b/arch/arm/mach-omap2/omap3/sdrc.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Functions related to OMAP3 SDRC. * @@ -18,8 +19,6 @@ * Sunil Kumar <sunilsaini05@gmail.com> * Shashi Ranjan <shashiranjanmca05@gmail.com> * Manikandan Pillai <mani.pillai@ti.com> - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/arch/arm/mach-omap2/omap3/spl_id_nand.c b/arch/arm/mach-omap2/omap3/spl_id_nand.c index 5c9549c743..84a0b0ade9 100644 --- a/arch/arm/mach-omap2/omap3/spl_id_nand.c +++ b/arch/arm/mach-omap2/omap3/spl_id_nand.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * (C) Copyright 2011 * Texas Instruments, <www.ti.com> @@ -8,8 +9,6 @@ * Initial Code from: * Richard Woodruff <r-woodruff2@ti.com> * Jian Zhang <jzhang@ti.com> - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/arch/arm/mach-omap2/omap3/sys_info.c b/arch/arm/mach-omap2/omap3/sys_info.c index 155f5b245d..ac72633c20 100644 --- a/arch/arm/mach-omap2/omap3/sys_info.c +++ b/arch/arm/mach-omap2/omap3/sys_info.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * (C) Copyright 2008 * Texas Instruments, <www.ti.com> @@ -8,8 +9,6 @@ * Derived from Beagle Board and 3430 SDP code by * Richard Woodruff <r-woodruff2@ti.com> * Syed Mohammed Khasim <khasim@ti.com> - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/arch/arm/mach-omap2/omap4/Makefile b/arch/arm/mach-omap2/omap4/Makefile index 564f1f632f..0ed3fc768d 100644 --- a/arch/arm/mach-omap2/omap4/Makefile +++ b/arch/arm/mach-omap2/omap4/Makefile @@ -1,9 +1,7 @@ +# SPDX-License-Identifier: GPL-2.0+ # # (C) Copyright 2000-2010 # Wolfgang Denk, DENX Software Engineering, wd@denx.de. -# -# SPDX-License-Identifier: GPL-2.0+ -# obj-y += boot.o obj-y += sdram_elpida.o diff --git a/arch/arm/mach-omap2/omap4/boot.c b/arch/arm/mach-omap2/omap4/boot.c index 7f5791e9ed..90b5380ae3 100644 --- a/arch/arm/mach-omap2/omap4/boot.c +++ b/arch/arm/mach-omap2/omap4/boot.c @@ -1,9 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * OMAP4 boot * * Copyright (C) 2015 Paul Kocialkowski <contact@paulk.fr> - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/arch/arm/mach-omap2/omap4/emif.c b/arch/arm/mach-omap2/omap4/emif.c index 8f20b1c184..35a51645be 100644 --- a/arch/arm/mach-omap2/omap4/emif.c +++ b/arch/arm/mach-omap2/omap4/emif.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * EMIF programming * @@ -5,8 +6,6 @@ * Texas Instruments, <www.ti.com> * * Aneesh V <aneesh@ti.com> - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/arch/arm/mach-omap2/omap4/hw_data.c b/arch/arm/mach-omap2/omap4/hw_data.c index 471f1c4834..d587a4d4de 100644 --- a/arch/arm/mach-omap2/omap4/hw_data.c +++ b/arch/arm/mach-omap2/omap4/hw_data.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * * HW data initialization for OMAP4 @@ -6,8 +7,6 @@ * Texas Instruments, <www.ti.com> * * Sricharan R <r.sricharan@ti.com> - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> #include <asm/arch/omap.h> diff --git a/arch/arm/mach-omap2/omap4/hwinit.c b/arch/arm/mach-omap2/omap4/hwinit.c index 4bda162903..27dfa9142d 100644 --- a/arch/arm/mach-omap2/omap4/hwinit.c +++ b/arch/arm/mach-omap2/omap4/hwinit.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * * Common functions for OMAP4 based boards @@ -8,8 +9,6 @@ * Author : * Aneesh V <aneesh@ti.com> * Steve Sakoman <steve@sakoman.com> - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> #include <palmas.h> diff --git a/arch/arm/mach-omap2/omap4/prcm-regs.c b/arch/arm/mach-omap2/omap4/prcm-regs.c index 2f0e1e851a..eaf98b3891 100644 --- a/arch/arm/mach-omap2/omap4/prcm-regs.c +++ b/arch/arm/mach-omap2/omap4/prcm-regs.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * * HW regs data for OMAP4 @@ -6,8 +7,6 @@ * Texas Instruments, <www.ti.com> * * Sricharan R <r.sricharan@ti.com> - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <asm/omap_common.h> diff --git a/arch/arm/mach-omap2/omap4/sdram_elpida.c b/arch/arm/mach-omap2/omap4/sdram_elpida.c index 78b4f09ce2..a29a264016 100644 --- a/arch/arm/mach-omap2/omap4/sdram_elpida.c +++ b/arch/arm/mach-omap2/omap4/sdram_elpida.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Timing and Organization details of the Elpida parts used in OMAP4 * SDPs and Panda @@ -6,8 +7,6 @@ * Texas Instruments, <www.ti.com> * * Aneesh V <aneesh@ti.com> - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <asm/emif.h> diff --git a/arch/arm/mach-omap2/omap5/Makefile b/arch/arm/mach-omap2/omap5/Makefile index a6a5d17ff6..592e026ed2 100644 --- a/arch/arm/mach-omap2/omap5/Makefile +++ b/arch/arm/mach-omap2/omap5/Makefile @@ -1,9 +1,7 @@ +# SPDX-License-Identifier: GPL-2.0+ # # (C) Copyright 2000-2010 # Wolfgang Denk, DENX Software Engineering, wd@denx.de. -# -# SPDX-License-Identifier: GPL-2.0+ -# obj-y += boot.o obj-y += hwinit.o diff --git a/arch/arm/mach-omap2/omap5/abb.c b/arch/arm/mach-omap2/omap5/abb.c index 1882c49e7d..446f99f634 100644 --- a/arch/arm/mach-omap2/omap5/abb.c +++ b/arch/arm/mach-omap2/omap5/abb.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Adaptive Body Bias programming sequence for OMAP5 family * @@ -5,8 +6,6 @@ * Texas Instruments, <www.ti.com> * * Andrii Tseglytskyi <andrii.tseglytskyi@ti.com> - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/arch/arm/mach-omap2/omap5/boot.c b/arch/arm/mach-omap2/omap5/boot.c index 18750b810a..15d6836c6e 100644 --- a/arch/arm/mach-omap2/omap5/boot.c +++ b/arch/arm/mach-omap2/omap5/boot.c @@ -1,9 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * OMAP5 boot * * Copyright (C) 2015 Paul Kocialkowski <contact@paulk.fr> - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/arch/arm/mach-omap2/omap5/dra7xx_iodelay.c b/arch/arm/mach-omap2/omap5/dra7xx_iodelay.c index a9a9f75e6e..e2abb7d058 100644 --- a/arch/arm/mach-omap2/omap5/dra7xx_iodelay.c +++ b/arch/arm/mach-omap2/omap5/dra7xx_iodelay.c @@ -1,10 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * (C) Copyright 2015 * Texas Instruments Incorporated, <www.ti.com> * * Lokesh Vutla <lokeshvutla@ti.com> - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/arch/arm/mach-omap2/omap5/emif.c b/arch/arm/mach-omap2/omap5/emif.c index b1203a37af..f3661a0e74 100644 --- a/arch/arm/mach-omap2/omap5/emif.c +++ b/arch/arm/mach-omap2/omap5/emif.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * EMIF programming * @@ -5,8 +6,6 @@ * Texas Instruments, <www.ti.com> * * Aneesh V <aneesh@ti.com> for OMAP4 - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/arch/arm/mach-omap2/omap5/fdt.c b/arch/arm/mach-omap2/omap5/fdt.c index 3aae94d560..3626d79199 100644 --- a/arch/arm/mach-omap2/omap5/fdt.c +++ b/arch/arm/mach-omap2/omap5/fdt.c @@ -1,7 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright 2016 Texas Instruments, Inc. - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/arch/arm/mach-omap2/omap5/hw_data.c b/arch/arm/mach-omap2/omap5/hw_data.c index 7fc38368c9..c4a41db92a 100644 --- a/arch/arm/mach-omap2/omap5/hw_data.c +++ b/arch/arm/mach-omap2/omap5/hw_data.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * * HW data initialization for OMAP5 @@ -6,8 +7,6 @@ * Texas Instruments, <www.ti.com> * * Sricharan R <r.sricharan@ti.com> - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> #include <palmas.h> diff --git a/arch/arm/mach-omap2/omap5/hwinit.c b/arch/arm/mach-omap2/omap5/hwinit.c index e7a3f57b67..eba21647d9 100644 --- a/arch/arm/mach-omap2/omap5/hwinit.c +++ b/arch/arm/mach-omap2/omap5/hwinit.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * * Functions for omap5 based boards. @@ -9,8 +10,6 @@ * Aneesh V <aneesh@ti.com> * Steve Sakoman <steve@sakoman.com> * Sricharan <r.sricharan@ti.com> - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> #include <palmas.h> diff --git a/arch/arm/mach-omap2/omap5/prcm-regs.c b/arch/arm/mach-omap2/omap5/prcm-regs.c index b5f1d700fd..b5baebc069 100644 --- a/arch/arm/mach-omap2/omap5/prcm-regs.c +++ b/arch/arm/mach-omap2/omap5/prcm-regs.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * * HW regs data for OMAP5 Soc @@ -6,8 +7,6 @@ * Texas Instruments, <www.ti.com> * * Sricharan R <r.sricharan@ti.com> - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <asm/omap_common.h> diff --git a/arch/arm/mach-omap2/omap5/sdram.c b/arch/arm/mach-omap2/omap5/sdram.c index c0e0e0888c..6bf4cf4a75 100644 --- a/arch/arm/mach-omap2/omap5/sdram.c +++ b/arch/arm/mach-omap2/omap5/sdram.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Timing and Organization details of the ddr device parts used in OMAP5 * EVM @@ -7,8 +8,6 @@ * * Aneesh V <aneesh@ti.com> * Sricharan R <r.sricharan@ti.com> - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <asm/emif.h> diff --git a/arch/arm/mach-omap2/omap5/sec_entry_cpu1.S b/arch/arm/mach-omap2/omap5/sec_entry_cpu1.S index c2a35eeccb..6dc92a6bfa 100644 --- a/arch/arm/mach-omap2/omap5/sec_entry_cpu1.S +++ b/arch/arm/mach-omap2/omap5/sec_entry_cpu1.S @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * Secure entry function for CPU Core #1 * @@ -6,8 +7,6 @@ * * Author : * Harinarayan Bhatta <harinarayan@ti.com> - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <config.h> diff --git a/arch/arm/mach-omap2/pipe3-phy.c b/arch/arm/mach-omap2/pipe3-phy.c index e02e3ec23e..8808e353a9 100644 --- a/arch/arm/mach-omap2/pipe3-phy.c +++ b/arch/arm/mach-omap2/pipe3-phy.c @@ -1,10 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * TI PIPE3 PHY * * (C) Copyright 2013 * Texas Instruments, <www.ti.com> - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/arch/arm/mach-omap2/pipe3-phy.h b/arch/arm/mach-omap2/pipe3-phy.h index 441f49a3f9..182bdcd4c8 100644 --- a/arch/arm/mach-omap2/pipe3-phy.h +++ b/arch/arm/mach-omap2/pipe3-phy.h @@ -1,10 +1,9 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * TI PIPE3 PHY * * (C) Copyright 2013 * Texas Instruments, <www.ti.com> - * - * SPDX-License-Identifier: GPL-2.0+ */ #ifndef __OMAP_PIPE3_PHY_H diff --git a/arch/arm/mach-omap2/reset.c b/arch/arm/mach-omap2/reset.c index 91ad031ddd..ea27248e85 100644 --- a/arch/arm/mach-omap2/reset.c +++ b/arch/arm/mach-omap2/reset.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * * Common layer for reset related functionality of OMAP based socs. @@ -6,8 +7,6 @@ * Texas Instruments, <www.ti.com> * * Sricharan R <r.sricharan@ti.com> - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <config.h> #include <asm/io.h> diff --git a/arch/arm/mach-omap2/sata.c b/arch/arm/mach-omap2/sata.c index dc68896d1b..4672dc534c 100644 --- a/arch/arm/mach-omap2/sata.c +++ b/arch/arm/mach-omap2/sata.c @@ -1,10 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * TI SATA platform driver * * (C) Copyright 2013 * Texas Instruments, <www.ti.com> - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/arch/arm/mach-omap2/sec-common.c b/arch/arm/mach-omap2/sec-common.c index bd003cb5ee..600a31280c 100644 --- a/arch/arm/mach-omap2/sec-common.c +++ b/arch/arm/mach-omap2/sec-common.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * * Common security related functions for OMAP devices @@ -9,8 +10,6 @@ * Andreas Dannenberg <dannenberg@ti.com> * Harinarayan Bhatta <harinarayan@ti.com> * Andrew F. Davis <afd@ti.com> - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/arch/arm/mach-omap2/sysinfo-common.c b/arch/arm/mach-omap2/sysinfo-common.c index 4dab12a8d7..49bc3a634f 100644 --- a/arch/arm/mach-omap2/sysinfo-common.c +++ b/arch/arm/mach-omap2/sysinfo-common.c @@ -1,10 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * System information routines for all OMAP based boards. * * (C) Copyright 2017 Linaro Ltd. * Sam Protsenko <semen.protsenko@linaro.org> - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <asm/arch/omap.h> diff --git a/arch/arm/mach-omap2/timer.c b/arch/arm/mach-omap2/timer.c index 49e3a971d9..847f33d47d 100644 --- a/arch/arm/mach-omap2/timer.c +++ b/arch/arm/mach-omap2/timer.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * (C) Copyright 2008 * Texas Instruments @@ -12,8 +13,6 @@ * * (C) Copyright 2002 * Gary Jennejohn, DENX Software Engineering, <garyj@denx.de> - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/arch/arm/mach-omap2/u-boot-spl.lds b/arch/arm/mach-omap2/u-boot-spl.lds index e9da2a9dd1..a1289f6a74 100644 --- a/arch/arm/mach-omap2/u-boot-spl.lds +++ b/arch/arm/mach-omap2/u-boot-spl.lds @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * (C) Copyright 2002 * Gary Jennejohn, DENX Software Engineering, <garyj@denx.de> @@ -5,8 +6,6 @@ * (C) Copyright 2010 * Texas Instruments, <www.ti.com> * Aneesh V <aneesh@ti.com> - * - * SPDX-License-Identifier: GPL-2.0+ */ MEMORY { .sram : ORIGIN = CONFIG_SPL_TEXT_BASE,\ diff --git a/arch/arm/mach-omap2/utils.c b/arch/arm/mach-omap2/utils.c index 1d3962500d..92a6f799d4 100644 --- a/arch/arm/mach-omap2/utils.c +++ b/arch/arm/mach-omap2/utils.c @@ -1,8 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright 2011 Linaro Limited * Aneesh V <aneesh@ti.com> - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> #include <environment.h> |