diff options
| author | Tom Rini | 2018-05-06 17:58:06 -0400 |
|---|---|---|
| committer | Tom Rini | 2018-05-07 09:34:12 -0400 |
| commit | 83d290c56fab2d38cd1ab4c4cc7099559c1d5046 (patch) | |
| tree | 5e5d1b40b52aaf96b707e0da2474573306d22f7b /board/intel | |
| 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 'board/intel')
28 files changed, 28 insertions, 63 deletions
diff --git a/board/intel/Kconfig b/board/intel/Kconfig index 4ebf80813fb..5131836cb06 100644 --- a/board/intel/Kconfig +++ b/board/intel/Kconfig @@ -1,8 +1,6 @@ +# SPDX-License-Identifier: GPL-2.0+ # # Copyright (C) 2015, Bin Meng <bmeng.cn@gmail.com> -# -# SPDX-License-Identifier: GPL-2.0+ -# if VENDOR_INTEL diff --git a/board/intel/bayleybay/Makefile b/board/intel/bayleybay/Makefile index 52dda7ddab3..e0553f14624 100644 --- a/board/intel/bayleybay/Makefile +++ b/board/intel/bayleybay/Makefile @@ -1,8 +1,6 @@ +# SPDX-License-Identifier: GPL-2.0+ # # Copyright (C) 2015, Bin Meng <bmeng.cn@gmail.com> -# -# SPDX-License-Identifier: GPL-2.0+ -# obj-y += bayleybay.o start.o obj-$(CONFIG_GENERATE_ACPI_TABLE) += dsdt.o diff --git a/board/intel/bayleybay/acpi/mainboard.asl b/board/intel/bayleybay/acpi/mainboard.asl index 8b7ee3fba22..2ab938a8d8d 100644 --- a/board/intel/bayleybay/acpi/mainboard.asl +++ b/board/intel/bayleybay/acpi/mainboard.asl @@ -1,7 +1,6 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * Copyright (C) 2016, Bin Meng <bmeng.cn@gmail.com> - * - * SPDX-License-Identifier: GPL-2.0+ */ /* Power Button */ diff --git a/board/intel/bayleybay/bayleybay.c b/board/intel/bayleybay/bayleybay.c index 846b2f72718..4f63c23a1b4 100644 --- a/board/intel/bayleybay/bayleybay.c +++ b/board/intel/bayleybay/bayleybay.c @@ -1,7 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (C) 2015, Bin Meng <bmeng.cn@gmail.com> - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/board/intel/bayleybay/dsdt.asl b/board/intel/bayleybay/dsdt.asl index 6042011acf3..d2297ef595f 100644 --- a/board/intel/bayleybay/dsdt.asl +++ b/board/intel/bayleybay/dsdt.asl @@ -1,7 +1,6 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * Copyright (C) 2016, Bin Meng <bmeng.cn@gmail.com> - * - * SPDX-License-Identifier: GPL-2.0+ */ DefinitionBlock("dsdt.aml", "DSDT", 2, "U-BOOT", "U-BOOTBL", 0x00010000) diff --git a/board/intel/bayleybay/start.S b/board/intel/bayleybay/start.S index a71db69be9c..e4bde561b20 100644 --- a/board/intel/bayleybay/start.S +++ b/board/intel/bayleybay/start.S @@ -1,7 +1,6 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * Copyright (C) 2015, Bin Meng <bmeng.cn@gmail.com> - * - * SPDX-License-Identifier: GPL-2.0+ */ .globl early_board_init diff --git a/board/intel/cherryhill/Makefile b/board/intel/cherryhill/Makefile index 0dbb055f970..b09581a9195 100644 --- a/board/intel/cherryhill/Makefile +++ b/board/intel/cherryhill/Makefile @@ -1,7 +1,5 @@ +# SPDX-License-Identifier: GPL-2.0+ # # Copyright (C) 2017, Bin Meng <bmeng.cn@gmail.com> -# -# SPDX-License-Identifier: GPL-2.0+ -# obj-y += cherryhill.o start.o diff --git a/board/intel/cherryhill/cherryhill.c b/board/intel/cherryhill/cherryhill.c index d86dc97692c..695af6bb7ec 100644 --- a/board/intel/cherryhill/cherryhill.c +++ b/board/intel/cherryhill/cherryhill.c @@ -1,7 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (C) 2017, Bin Meng <bmeng.cn@gmail.com> - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/board/intel/cherryhill/start.S b/board/intel/cherryhill/start.S index 11af9de1a6a..2e3e7f84094 100644 --- a/board/intel/cherryhill/start.S +++ b/board/intel/cherryhill/start.S @@ -1,7 +1,6 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * Copyright (C) 2017, Bin Meng <bmeng.cn@gmail.com> - * - * SPDX-License-Identifier: GPL-2.0+ */ .globl early_board_init diff --git a/board/intel/cougarcanyon2/Makefile b/board/intel/cougarcanyon2/Makefile index abd924c6b32..75cc508f4ec 100644 --- a/board/intel/cougarcanyon2/Makefile +++ b/board/intel/cougarcanyon2/Makefile @@ -1,7 +1,5 @@ +# SPDX-License-Identifier: GPL-2.0+ # # Copyright (C) 2016, Bin Meng <bmeng.cn@gmail.com> -# -# SPDX-License-Identifier: GPL-2.0+ -# obj-y += cougarcanyon2.o start.o diff --git a/board/intel/cougarcanyon2/cougarcanyon2.c b/board/intel/cougarcanyon2/cougarcanyon2.c index c350237fcad..7aadd9e4772 100644 --- a/board/intel/cougarcanyon2/cougarcanyon2.c +++ b/board/intel/cougarcanyon2/cougarcanyon2.c @@ -1,7 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (C) 2016, Bin Meng <bmeng.cn@gmail.com> - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/board/intel/cougarcanyon2/start.S b/board/intel/cougarcanyon2/start.S index d8f227c706b..8521800921e 100644 --- a/board/intel/cougarcanyon2/start.S +++ b/board/intel/cougarcanyon2/start.S @@ -1,7 +1,6 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * Copyright (C) 2016, Bin Meng <bmeng.cn@gmail.com> - * - * SPDX-License-Identifier: GPL-2.0+ */ .globl early_board_init diff --git a/board/intel/crownbay/Makefile b/board/intel/crownbay/Makefile index aeb219b4e57..b52c69aeaa1 100644 --- a/board/intel/crownbay/Makefile +++ b/board/intel/crownbay/Makefile @@ -1,7 +1,5 @@ +# SPDX-License-Identifier: GPL-2.0+ # # Copyright (C) 2014, Bin Meng <bmeng.cn@gmail.com> -# -# SPDX-License-Identifier: GPL-2.0+ -# obj-y += crownbay.o start.o diff --git a/board/intel/crownbay/crownbay.c b/board/intel/crownbay/crownbay.c index 562d6d1b03f..57dce4185d6 100644 --- a/board/intel/crownbay/crownbay.c +++ b/board/intel/crownbay/crownbay.c @@ -1,7 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (C) 2014, Bin Meng <bmeng.cn@gmail.com> - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/board/intel/crownbay/start.S b/board/intel/crownbay/start.S index cf92b4c0b34..7faa7d05fae 100644 --- a/board/intel/crownbay/start.S +++ b/board/intel/crownbay/start.S @@ -1,7 +1,6 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * Copyright (C) 2014, Bin Meng <bmeng.cn@gmail.com> - * - * SPDX-License-Identifier: GPL-2.0+ */ .globl early_board_init diff --git a/board/intel/edison/dsdt.asl b/board/intel/edison/dsdt.asl index d2e04730c96..3b75c4e76b6 100644 --- a/board/intel/edison/dsdt.asl +++ b/board/intel/edison/dsdt.asl @@ -1,9 +1,8 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * Copyright (c) 2017 Intel Corporation * * Partially based on dsdt.asl for other x86 boards - * - * SPDX-License-Identifier: GPL-2.0+ */ DefinitionBlock("dsdt.aml", "DSDT", 2, "U-BOOT", "U-BOOTBL", 0x00010000) diff --git a/board/intel/edison/edison.c b/board/intel/edison/edison.c index e3334f84387..5faf3c57f2c 100644 --- a/board/intel/edison/edison.c +++ b/board/intel/edison/edison.c @@ -1,7 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (c) 2017 Intel Corporation - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> #include <dwc3-uboot.h> diff --git a/board/intel/edison/start.S b/board/intel/edison/start.S index 932fe6c24bf..aa702622d48 100644 --- a/board/intel/edison/start.S +++ b/board/intel/edison/start.S @@ -1,9 +1,8 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * Copyright (c) 2011 The Chromium OS Authors. * (C) Copyright 2008 * Graeme Russ, graeme.russ@gmail.com. - * - * SPDX-License-Identifier: GPL-2.0+ */ /* board early intialization */ diff --git a/board/intel/galileo/Makefile b/board/intel/galileo/Makefile index bbe2f8bf5b1..e8f58bff9ac 100644 --- a/board/intel/galileo/Makefile +++ b/board/intel/galileo/Makefile @@ -1,8 +1,6 @@ +# SPDX-License-Identifier: GPL-2.0+ # # Copyright (C) 2015, Bin Meng <bmeng.cn@gmail.com> -# -# SPDX-License-Identifier: GPL-2.0+ -# obj-y += galileo.o start.o obj-$(CONFIG_GENERATE_ACPI_TABLE) += dsdt.o diff --git a/board/intel/galileo/acpi/mainboard.asl b/board/intel/galileo/acpi/mainboard.asl index 21785ea73b1..beb9d93ec91 100644 --- a/board/intel/galileo/acpi/mainboard.asl +++ b/board/intel/galileo/acpi/mainboard.asl @@ -1,7 +1,6 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * Copyright (C) 2016, Bin Meng <bmeng.cn@gmail.com> - * - * SPDX-License-Identifier: GPL-2.0+ */ /* Power Button */ diff --git a/board/intel/galileo/dsdt.asl b/board/intel/galileo/dsdt.asl index 6042011acf3..d2297ef595f 100644 --- a/board/intel/galileo/dsdt.asl +++ b/board/intel/galileo/dsdt.asl @@ -1,7 +1,6 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * Copyright (C) 2016, Bin Meng <bmeng.cn@gmail.com> - * - * SPDX-License-Identifier: GPL-2.0+ */ DefinitionBlock("dsdt.aml", "DSDT", 2, "U-BOOT", "U-BOOTBL", 0x00010000) diff --git a/board/intel/galileo/galileo.c b/board/intel/galileo/galileo.c index 2fe1923a9fc..720350d0f7f 100644 --- a/board/intel/galileo/galileo.c +++ b/board/intel/galileo/galileo.c @@ -1,7 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (C) 2015, Bin Meng <bmeng.cn@gmail.com> - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/board/intel/galileo/start.S b/board/intel/galileo/start.S index a71db69be9c..e4bde561b20 100644 --- a/board/intel/galileo/start.S +++ b/board/intel/galileo/start.S @@ -1,7 +1,6 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * Copyright (C) 2015, Bin Meng <bmeng.cn@gmail.com> - * - * SPDX-License-Identifier: GPL-2.0+ */ .globl early_board_init diff --git a/board/intel/minnowmax/Makefile b/board/intel/minnowmax/Makefile index 73e5a8fd028..989344df1c9 100644 --- a/board/intel/minnowmax/Makefile +++ b/board/intel/minnowmax/Makefile @@ -1,8 +1,6 @@ +# SPDX-License-Identifier: GPL-2.0+ # # Copyright (C) 2015, Google, Inc -# -# SPDX-License-Identifier: GPL-2.0+ -# obj-y += minnowmax.o start.o obj-$(CONFIG_GENERATE_ACPI_TABLE) += dsdt.o diff --git a/board/intel/minnowmax/acpi/mainboard.asl b/board/intel/minnowmax/acpi/mainboard.asl index 21785ea73b1..beb9d93ec91 100644 --- a/board/intel/minnowmax/acpi/mainboard.asl +++ b/board/intel/minnowmax/acpi/mainboard.asl @@ -1,7 +1,6 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * Copyright (C) 2016, Bin Meng <bmeng.cn@gmail.com> - * - * SPDX-License-Identifier: GPL-2.0+ */ /* Power Button */ diff --git a/board/intel/minnowmax/dsdt.asl b/board/intel/minnowmax/dsdt.asl index 6042011acf3..d2297ef595f 100644 --- a/board/intel/minnowmax/dsdt.asl +++ b/board/intel/minnowmax/dsdt.asl @@ -1,7 +1,6 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * Copyright (C) 2016, Bin Meng <bmeng.cn@gmail.com> - * - * SPDX-License-Identifier: GPL-2.0+ */ DefinitionBlock("dsdt.aml", "DSDT", 2, "U-BOOT", "U-BOOTBL", 0x00010000) diff --git a/board/intel/minnowmax/minnowmax.c b/board/intel/minnowmax/minnowmax.c index 5bdb2fdbc7c..e5fc9397934 100644 --- a/board/intel/minnowmax/minnowmax.c +++ b/board/intel/minnowmax/minnowmax.c @@ -1,7 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (C) 2015, Google, Inc - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/board/intel/minnowmax/start.S b/board/intel/minnowmax/start.S index 2c941a4a510..65d1f7e9615 100644 --- a/board/intel/minnowmax/start.S +++ b/board/intel/minnowmax/start.S @@ -1,7 +1,6 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * Copyright (C) 2015, Google, Inc - * - * SPDX-License-Identifier: GPL-2.0+ */ .globl early_board_init |