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 /drivers/pci | |
| 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 'drivers/pci')
31 files changed, 31 insertions, 63 deletions
diff --git a/drivers/pci/Makefile b/drivers/pci/Makefile index 40ebc06f6d..72c09f4af8 100644 --- a/drivers/pci/Makefile +++ b/drivers/pci/Makefile @@ -1,9 +1,7 @@ +# SPDX-License-Identifier: GPL-2.0+ # # (C) Copyright 2000-2007 # Wolfgang Denk, DENX Software Engineering, wd@denx.de. -# -# SPDX-License-Identifier: GPL-2.0+ -# ifneq ($(CONFIG_DM_PCI),) obj-y += pci_rom.o diff --git a/drivers/pci/fsl_pci_init.c b/drivers/pci/fsl_pci_init.c index 11104dcc69..375b8549c5 100644 --- a/drivers/pci/fsl_pci_init.c +++ b/drivers/pci/fsl_pci_init.c @@ -1,7 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright 2007-2012 Freescale Semiconductor, Inc. - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/drivers/pci/pci-emul-uclass.c b/drivers/pci/pci-emul-uclass.c index f89acd41dc..79e2c1420e 100644 --- a/drivers/pci/pci-emul-uclass.c +++ b/drivers/pci/pci-emul-uclass.c @@ -1,8 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (c) 2014 Google, Inc * Written by Simon Glass <sjg@chromium.org> - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/drivers/pci/pci-rcar-gen2.c b/drivers/pci/pci-rcar-gen2.c index 8293a6d334..cbaba1986a 100644 --- a/drivers/pci/pci-rcar-gen2.c +++ b/drivers/pci/pci-rcar-gen2.c @@ -1,9 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0 /* * Renesas RCar Gen2 PCIEC driver * * Copyright (C) 2018 Marek Vasut <marek.vasut@gmail.com> - * - * SPDX-License-Identifier: GPL-2.0 */ #include <common.h> diff --git a/drivers/pci/pci-uclass.c b/drivers/pci/pci-uclass.c index a2e829608a..49be1ebdd7 100644 --- a/drivers/pci/pci-uclass.c +++ b/drivers/pci/pci-uclass.c @@ -1,8 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (c) 2014 Google, Inc * Written by Simon Glass <sjg@chromium.org> - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c index bbc7dab366..221054593e 100644 --- a/drivers/pci/pci.c +++ b/drivers/pci/pci.c @@ -1,11 +1,10 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * (C) Copyright 2001 Sysgo Real-Time Solutions, GmbH <www.elinos.com> * Andreas Heppel <aheppel@sysgo.de> * * (C) Copyright 2002, 2003 * Wolfgang Denk, DENX Software Engineering, wd@denx.de. - * - * SPDX-License-Identifier: GPL-2.0+ */ /* diff --git a/drivers/pci/pci_auto.c b/drivers/pci/pci_auto.c index c2bc32678a..d1feb503a0 100644 --- a/drivers/pci/pci_auto.c +++ b/drivers/pci/pci_auto.c @@ -1,11 +1,10 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * PCI autoconfiguration library * * Author: Matt Porter <mporter@mvista.com> * * Copyright 2000 MontaVista Software Inc. - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/drivers/pci/pci_auto_common.c b/drivers/pci/pci_auto_common.c index 677f094b41..1d202ae2ef 100644 --- a/drivers/pci/pci_auto_common.c +++ b/drivers/pci/pci_auto_common.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * PCI auto-configuration library * @@ -8,8 +9,6 @@ * Modifications for driver model: * Copyright 2015 Google, Inc * Written by Simon Glass <sjg@chromium.org> - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/drivers/pci/pci_auto_old.c b/drivers/pci/pci_auto_old.c index edc9a7b3c1..bc119fba87 100644 --- a/drivers/pci/pci_auto_old.c +++ b/drivers/pci/pci_auto_old.c @@ -1,11 +1,10 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * PCI autoconfiguration library (legacy version, do not change) * * Author: Matt Porter <mporter@mvista.com> * * Copyright 2000 MontaVista Software Inc. - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/drivers/pci/pci_common.c b/drivers/pci/pci_common.c index faf25d96cb..9f2d2678e3 100644 --- a/drivers/pci/pci_common.c +++ b/drivers/pci/pci_common.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (c) 2014 Google, Inc * @@ -6,8 +7,6 @@ * * (C) Copyright 2002, 2003 * Wolfgang Denk, DENX Software Engineering, wd@denx.de. - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/drivers/pci/pci_compat.c b/drivers/pci/pci_compat.c index 25bc095dce..6c15bdfc03 100644 --- a/drivers/pci/pci_compat.c +++ b/drivers/pci/pci_compat.c @@ -1,9 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Compatibility functions for pre-driver-model code * * Copyright (C) 2014 Google, Inc - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> #include <dm.h> diff --git a/drivers/pci/pci_ftpci100.c b/drivers/pci/pci_ftpci100.c index 5ee8b6b4d6..736befdc3b 100644 --- a/drivers/pci/pci_ftpci100.c +++ b/drivers/pci/pci_ftpci100.c @@ -1,11 +1,10 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Faraday FTPCI100 PCI Bridge Controller Device Driver Implementation * * Copyright (C) 2011 Andes Technology Corporation * Gavin Guo, Andes Technology Corporation <gavinguo@andestech.com> * Macpaul Lin, Andes Technology Corporation <macpaul@andestech.com> - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> #include <malloc.h> diff --git a/drivers/pci/pci_gt64120.c b/drivers/pci/pci_gt64120.c index 4756f1424c..55f4800781 100644 --- a/drivers/pci/pci_gt64120.c +++ b/drivers/pci/pci_gt64120.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * Copyright (C) 2013 Gabor Juhos <juhosg@openwrt.org> * @@ -5,8 +6,6 @@ * Copyright (C) 1999, 2000, 2004 MIPS Technologies, Inc. * Authors: Carsten Langgaard <carstenl@mips.com> * Maciej W. Rozycki <macro@mips.com> - * - * SPDX-License-Identifier: GPL-2.0 */ #include <common.h> diff --git a/drivers/pci/pci_indirect.c b/drivers/pci/pci_indirect.c index 4a36749aa4..a24100e3a8 100644 --- a/drivers/pci/pci_indirect.c +++ b/drivers/pci/pci_indirect.c @@ -1,9 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Support for indirect PCI bridges. * * Copyright (C) 1998 Gabriel Paubert. - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/drivers/pci/pci_internal.h b/drivers/pci/pci_internal.h index 616b9c174c..8b842f6fb4 100644 --- a/drivers/pci/pci_internal.h +++ b/drivers/pci/pci_internal.h @@ -1,10 +1,9 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * Internal PCI functions, not exported outside drivers/pci * * Copyright (c) 2015 Google, Inc * Written by Simon Glass <sjg@chromium.org> - * - * SPDX-License-Identifier: GPL-2.0+ */ #ifndef __pci_internal_h diff --git a/drivers/pci/pci_msc01.c b/drivers/pci/pci_msc01.c index a1b9116e4d..504eb65c27 100644 --- a/drivers/pci/pci_msc01.c +++ b/drivers/pci/pci_msc01.c @@ -1,8 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (C) 2013 Imagination Technologies * Author: Paul Burton <paul.burton@mips.com> - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/drivers/pci/pci_mvebu.c b/drivers/pci/pci_mvebu.c index 076a63f210..affe9f98ad 100644 --- a/drivers/pci/pci_mvebu.c +++ b/drivers/pci/pci_mvebu.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * PCIe driver for Marvell MVEBU SoCs * @@ -6,8 +7,6 @@ * Ported to U-Boot by: * Anton Schubert <anton.schubert@gmx.de> * Stefan Roese <sr@denx.de> - * - * SPDX-License-Identifier: GPL-2.0 */ #include <common.h> diff --git a/drivers/pci/pci_rom.c b/drivers/pci/pci_rom.c index 7f461943f8..29113f7958 100644 --- a/drivers/pci/pci_rom.c +++ b/drivers/pci/pci_rom.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * Copyright (C) 2014 Google, Inc * @@ -19,8 +20,6 @@ * David Mosberger-Tang * * Copyright 1997 -- 1999 Martin Mares <mj@atrey.karlin.mff.cuni.cz> - - * SPDX-License-Identifier: GPL-2.0 */ #include <common.h> diff --git a/drivers/pci/pci_sandbox.c b/drivers/pci/pci_sandbox.c index cd7ed0069a..67cd733e61 100644 --- a/drivers/pci/pci_sandbox.c +++ b/drivers/pci/pci_sandbox.c @@ -1,8 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (c) 2014 Google, Inc * Written by Simon Glass <sjg@chromium.org> - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/drivers/pci/pci_sh4.c b/drivers/pci/pci_sh4.c index d7f43c2bdf..4500e8bb29 100644 --- a/drivers/pci/pci_sh4.c +++ b/drivers/pci/pci_sh4.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * SH4 PCI Controller (PCIC) for U-Boot. * (C) Dustin McIntire (dustin@sensoria.com) @@ -5,8 +6,6 @@ * (C) 2008 Yusuke Goda <goda.yusuke@renesas.com> * * u-boot/arch/sh/cpu/sh4/pci-sh4.c - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/drivers/pci/pci_sh7751.c b/drivers/pci/pci_sh7751.c index 8a504457d2..2f918f161a 100644 --- a/drivers/pci/pci_sh7751.c +++ b/drivers/pci/pci_sh7751.c @@ -1,9 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * SH7751 PCI Controller (PCIC) for U-Boot. * (C) Dustin McIntire (dustin@sensoria.com) * (C) 2007,2008 Nobuhiro Iwamatsu <iwamatsu@nigauri.org> - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/drivers/pci/pci_sh7780.c b/drivers/pci/pci_sh7780.c index 5c739edad4..722b5e7cf2 100644 --- a/drivers/pci/pci_sh7780.c +++ b/drivers/pci/pci_sh7780.c @@ -1,10 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * SH7780 PCI Controller (PCIC) for U-Boot. * (C) Dustin McIntire (dustin@sensoria.com) * (C) 2007,2008 Nobuhiro Iwamatsu <iwamatsu@nigauri.org> * (C) 2008 Yusuke Goda <goda.yusuke@renesas.com> - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/drivers/pci/pci_tegra.c b/drivers/pci/pci_tegra.c index 2829b963b0..b325914b15 100644 --- a/drivers/pci/pci_tegra.c +++ b/drivers/pci/pci_tegra.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * Copyright (c) 2010, CompuLab, Ltd. * Author: Mike Rapoport <mike@compulab.co.il> @@ -6,8 +7,6 @@ * Copyright (c) 2008-2009, NVIDIA Corporation. * * Copyright (c) 2013-2014, NVIDIA Corporation. - * - * SPDX-License-Identifier: GPL-2.0 */ #define pr_fmt(fmt) "tegra-pcie: " fmt diff --git a/drivers/pci/pci_x86.c b/drivers/pci/pci_x86.c index 89e8c119b7..520ea4649e 100644 --- a/drivers/pci/pci_x86.c +++ b/drivers/pci/pci_x86.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/drivers/pci/pcie_dw_mvebu.c b/drivers/pci/pcie_dw_mvebu.c index a0032b7b03..8081005c27 100644 --- a/drivers/pci/pcie_dw_mvebu.c +++ b/drivers/pci/pcie_dw_mvebu.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (C) 2015 Marvell International Ltd. * @@ -7,8 +8,6 @@ * - drivers/pci/pcie_imx.c * - drivers/pci/pci_mvebu.c * - drivers/pci/pcie_xilinx.c - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/drivers/pci/pcie_ecam_generic.c b/drivers/pci/pcie_ecam_generic.c index c7540ff80e..00644edd26 100644 --- a/drivers/pci/pcie_ecam_generic.c +++ b/drivers/pci/pcie_ecam_generic.c @@ -1,11 +1,10 @@ +// SPDX-License-Identifier: GPL-2.0 /* * Generic PCIE host provided by e.g. QEMU * * Heavily based on drivers/pci/pcie_xilinx.c * * Copyright (C) 2016 Imagination Technologies - * - * SPDX-License-Identifier: GPL-2.0 */ #include <common.h> diff --git a/drivers/pci/pcie_imx.c b/drivers/pci/pcie_imx.c index ef66a1d3f4..fcc4ab7139 100644 --- a/drivers/pci/pcie_imx.c +++ b/drivers/pci/pcie_imx.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * Freescale i.MX6 PCI Express Root-Complex driver * @@ -6,8 +7,6 @@ * Based on upstream Linux kernel driver: * pci-imx6.c: Sean Cross <xobs@kosagi.com> * pcie-designware.c: Jingoo Han <jg1.han@samsung.com> - * - * SPDX-License-Identifier: GPL-2.0 */ #include <common.h> diff --git a/drivers/pci/pcie_layerscape.c b/drivers/pci/pcie_layerscape.c index 503fd5e507..3b7377a6eb 100644 --- a/drivers/pci/pcie_layerscape.c +++ b/drivers/pci/pcie_layerscape.c @@ -1,9 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright 2017 NXP * Copyright 2014-2015 Freescale Semiconductor, Inc. * Layerscape PCIe driver - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/drivers/pci/pcie_layerscape.h b/drivers/pci/pcie_layerscape.h index 3a6cecb07d..8770b44a1f 100644 --- a/drivers/pci/pcie_layerscape.h +++ b/drivers/pci/pcie_layerscape.h @@ -1,9 +1,8 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * Copyright 2017 NXP * Copyright 2014-2015 Freescale Semiconductor, Inc. * Layerscape PCIe driver - * - * SPDX-License-Identifier: GPL-2.0+ */ #ifndef _PCIE_LAYERSCAPE_H_ diff --git a/drivers/pci/pcie_layerscape_fixup.c b/drivers/pci/pcie_layerscape_fixup.c index e2ea7c8750..1a17bd98aa 100644 --- a/drivers/pci/pcie_layerscape_fixup.c +++ b/drivers/pci/pcie_layerscape_fixup.c @@ -1,9 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright 2017 NXP * Copyright 2014-2015 Freescale Semiconductor, Inc. * Layerscape PCIe driver - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/drivers/pci/pcie_xilinx.c b/drivers/pci/pcie_xilinx.c index 57112f5333..44a5f1e1f4 100644 --- a/drivers/pci/pcie_xilinx.c +++ b/drivers/pci/pcie_xilinx.c @@ -1,9 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0 /* * Xilinx AXI Bridge for PCI Express Driver * * Copyright (C) 2016 Imagination Technologies - * - * SPDX-License-Identifier: GPL-2.0 */ #include <common.h> |