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-bcm283x | |
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-bcm283x')
-rw-r--r-- | arch/arm/mach-bcm283x/Makefile | 4 | ||||
-rw-r--r-- | arch/arm/mach-bcm283x/include/mach/gpio.h | 3 | ||||
-rw-r--r-- | arch/arm/mach-bcm283x/include/mach/mbox.h | 3 | ||||
-rw-r--r-- | arch/arm/mach-bcm283x/include/mach/msg.h | 3 | ||||
-rw-r--r-- | arch/arm/mach-bcm283x/include/mach/sdhci.h | 3 | ||||
-rw-r--r-- | arch/arm/mach-bcm283x/include/mach/timer.h | 3 | ||||
-rw-r--r-- | arch/arm/mach-bcm283x/include/mach/wdog.h | 3 | ||||
-rw-r--r-- | arch/arm/mach-bcm283x/init.c | 3 | ||||
-rw-r--r-- | arch/arm/mach-bcm283x/lowlevel_init.S | 3 | ||||
-rw-r--r-- | arch/arm/mach-bcm283x/mbox.c | 3 | ||||
-rw-r--r-- | arch/arm/mach-bcm283x/msg.c | 3 | ||||
-rw-r--r-- | arch/arm/mach-bcm283x/phys2bus.c | 3 | ||||
-rw-r--r-- | arch/arm/mach-bcm283x/reset.c | 3 |
13 files changed, 13 insertions, 27 deletions
diff --git a/arch/arm/mach-bcm283x/Makefile b/arch/arm/mach-bcm283x/Makefile index b5f606ef0b..7cd068832f 100644 --- a/arch/arm/mach-bcm283x/Makefile +++ b/arch/arm/mach-bcm283x/Makefile @@ -1,8 +1,6 @@ +# SPDX-License-Identifier: GPL-2.0 # # (C) Copyright 2012 Stephen Warren -# -# SPDX-License-Identifier: GPL-2.0 -# obj-$(CONFIG_BCM2835) += lowlevel_init.o obj-y += init.o reset.o mbox.o msg.o phys2bus.o diff --git a/arch/arm/mach-bcm283x/include/mach/gpio.h b/arch/arm/mach-bcm283x/include/mach/gpio.h index 7b4ddc9246..3263de9a35 100644 --- a/arch/arm/mach-bcm283x/include/mach/gpio.h +++ b/arch/arm/mach-bcm283x/include/mach/gpio.h @@ -1,9 +1,8 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * Copyright (C) 2012 Vikram Narayananan * <vikram186@gmail.com> * (C) Copyright 2012,2015 Stephen Warren - * - * SPDX-License-Identifier: GPL-2.0+ */ #ifndef _BCM2835_GPIO_H_ diff --git a/arch/arm/mach-bcm283x/include/mach/mbox.h b/arch/arm/mach-bcm283x/include/mach/mbox.h index 627acb85dc..2776a396c7 100644 --- a/arch/arm/mach-bcm283x/include/mach/mbox.h +++ b/arch/arm/mach-bcm283x/include/mach/mbox.h @@ -1,7 +1,6 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * (C) Copyright 2012,2015 Stephen Warren - * - * SPDX-License-Identifier: GPL-2.0+ */ #ifndef _BCM2835_MBOX_H diff --git a/arch/arm/mach-bcm283x/include/mach/msg.h b/arch/arm/mach-bcm283x/include/mach/msg.h index d055480ba1..4afb08631b 100644 --- a/arch/arm/mach-bcm283x/include/mach/msg.h +++ b/arch/arm/mach-bcm283x/include/mach/msg.h @@ -1,7 +1,6 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * (C) Copyright 2012,2015 Stephen Warren - * - * SPDX-License-Identifier: GPL-2.0+ */ #ifndef _BCM2835_MSG_H diff --git a/arch/arm/mach-bcm283x/include/mach/sdhci.h b/arch/arm/mach-bcm283x/include/mach/sdhci.h index 64e582c114..5cb6ec3340 100644 --- a/arch/arm/mach-bcm283x/include/mach/sdhci.h +++ b/arch/arm/mach-bcm283x/include/mach/sdhci.h @@ -1,7 +1,6 @@ +/* SPDX-License-Identifier: GPL-2.0 */ /* * (C) Copyright 2012,2015 Stephen Warren - * - * SPDX-License-Identifier: GPL-2.0 */ #ifndef _BCM2835_SDHCI_H_ diff --git a/arch/arm/mach-bcm283x/include/mach/timer.h b/arch/arm/mach-bcm283x/include/mach/timer.h index 2a85f230e8..56b0c356bb 100644 --- a/arch/arm/mach-bcm283x/include/mach/timer.h +++ b/arch/arm/mach-bcm283x/include/mach/timer.h @@ -1,7 +1,6 @@ +/* SPDX-License-Identifier: GPL-2.0 */ /* * (C) Copyright 2012,2015 Stephen Warren - * - * SPDX-License-Identifier: GPL-2.0 */ #ifndef _BCM2835_TIMER_H diff --git a/arch/arm/mach-bcm283x/include/mach/wdog.h b/arch/arm/mach-bcm283x/include/mach/wdog.h index b4caca16a8..99c88e5df7 100644 --- a/arch/arm/mach-bcm283x/include/mach/wdog.h +++ b/arch/arm/mach-bcm283x/include/mach/wdog.h @@ -1,7 +1,6 @@ +/* SPDX-License-Identifier: GPL-2.0 */ /* * (C) Copyright 2012,2015 Stephen Warren - * - * SPDX-License-Identifier: GPL-2.0 */ #ifndef _BCM2835_WDOG_H diff --git a/arch/arm/mach-bcm283x/init.c b/arch/arm/mach-bcm283x/init.c index 4fa94dbeeb..97414415a6 100644 --- a/arch/arm/mach-bcm283x/init.c +++ b/arch/arm/mach-bcm283x/init.c @@ -1,10 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0 /* * (C) Copyright 2012 Stephen Warren * * See file CREDITS for list of people who contributed to this * project. - * - * SPDX-License-Identifier: GPL-2.0 */ #include <common.h> diff --git a/arch/arm/mach-bcm283x/lowlevel_init.S b/arch/arm/mach-bcm283x/lowlevel_init.S index 965de1dc7c..d29ff137ef 100644 --- a/arch/arm/mach-bcm283x/lowlevel_init.S +++ b/arch/arm/mach-bcm283x/lowlevel_init.S @@ -1,10 +1,9 @@ +/* SPDX-License-Identifier: GPL-2.0 */ /* * (C) Copyright 2012 Stephen Warren * * See file CREDITS for list of people who contributed to this * project. - * - * SPDX-License-Identifier: GPL-2.0 */ .globl lowlevel_init diff --git a/arch/arm/mach-bcm283x/mbox.c b/arch/arm/mach-bcm283x/mbox.c index ec3f417f40..1642ebd103 100644 --- a/arch/arm/mach-bcm283x/mbox.c +++ b/arch/arm/mach-bcm283x/mbox.c @@ -1,7 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * (C) Copyright 2012 Stephen Warren - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/arch/arm/mach-bcm283x/msg.c b/arch/arm/mach-bcm283x/msg.c index ad29f3be09..94b75283f8 100644 --- a/arch/arm/mach-bcm283x/msg.c +++ b/arch/arm/mach-bcm283x/msg.c @@ -1,7 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * (C) Copyright 2012 Stephen Warren - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/arch/arm/mach-bcm283x/phys2bus.c b/arch/arm/mach-bcm283x/phys2bus.c index 8e9f49240f..8e4318bf5f 100644 --- a/arch/arm/mach-bcm283x/phys2bus.c +++ b/arch/arm/mach-bcm283x/phys2bus.c @@ -1,7 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright 2015 Stephen Warren - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <config.h> diff --git a/arch/arm/mach-bcm283x/reset.c b/arch/arm/mach-bcm283x/reset.c index aa02d3f9f6..f8a17755e3 100644 --- a/arch/arm/mach-bcm283x/reset.c +++ b/arch/arm/mach-bcm283x/reset.c @@ -1,10 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0 /* * (C) Copyright 2012 Stephen Warren * * See file CREDITS for list of people who contributed to this * project. - * - * SPDX-License-Identifier: GPL-2.0 */ #include <common.h> |