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/net | |
| parent | 7ce85318cfff5fd82a059131761559cba7fef309 (diff) | |
| download | u-boot-83d290c56fab2d38cd1ab4c4cc7099559c1d5046.tar.gz u-boot-83d290c56fab2d38cd1ab4c4cc7099559c1d5046.tar.bz2 u-boot-83d290c56fab2d38cd1ab4c4cc7099559c1d5046.zip | |
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/net')
153 files changed, 153 insertions, 309 deletions
diff --git a/drivers/net/Makefile b/drivers/net/Makefile index 2687fbbdb2..851f82fb01 100644 --- a/drivers/net/Makefile +++ b/drivers/net/Makefile @@ -1,9 +1,7 @@ +# SPDX-License-Identifier: GPL-2.0+ # # (C) Copyright 2006 # Wolfgang Denk, DENX Software Engineering, wd@denx.de. -# -# SPDX-License-Identifier: GPL-2.0+ -# obj-$(CONFIG_ALTERA_TSE) += altera_tse.o obj-$(CONFIG_AG7XXX) += ag7xxx.o diff --git a/drivers/net/ag7xxx.c b/drivers/net/ag7xxx.c index f28187058e..8146c3170e 100644 --- a/drivers/net/ag7xxx.c +++ b/drivers/net/ag7xxx.c @@ -1,9 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Atheros AR71xx / AR9xxx GMAC driver * * Copyright (C) 2016 Marek Vasut <marex@denx.de> - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/drivers/net/armada100_fec.c b/drivers/net/armada100_fec.c index caca8fde9f..da6662c7ee 100644 --- a/drivers/net/armada100_fec.c +++ b/drivers/net/armada100_fec.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * (C) Copyright 2011 * eInfochips Ltd. <www.einfochips.com> @@ -6,8 +7,6 @@ * (C) Copyright 2010 * Marvell Semiconductor <www.marvell.com> * Contributor: Mahavir Jain <mjain@marvell.com> - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/drivers/net/armada100_fec.h b/drivers/net/armada100_fec.h index 826048ea1c..e6f286cfd3 100644 --- a/drivers/net/armada100_fec.h +++ b/drivers/net/armada100_fec.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * (C) Copyright 2011 * eInfochips Ltd. <www.einfochips.com> @@ -6,8 +7,6 @@ * (C) Copyright 2010 * Marvell Semiconductor <www.marvell.com> * Contributor: Mahavir Jain <mjain@marvell.com> - * - * SPDX-License-Identifier: GPL-2.0+ */ #ifndef __ARMADA100_FEC_H__ diff --git a/drivers/net/at91_emac.c b/drivers/net/at91_emac.c index eb8d2b31ec..3233478571 100644 --- a/drivers/net/at91_emac.c +++ b/drivers/net/at91_emac.c @@ -1,11 +1,10 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (C) 2009 BuS Elektronik GmbH & Co. KG * Jens Scharsig (esw@bus-elektronik.de) * * (C) Copyright 2003 * Author : Hamid Ikdoumi (Atmel) - - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/drivers/net/ax88796.c b/drivers/net/ax88796.c index c45f646182..01c1ae2729 100644 --- a/drivers/net/ax88796.c +++ b/drivers/net/ax88796.c @@ -1,7 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * (c) 2007 Nobuhiro Iwamatsu <iwamatsu@nigauri.org> - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> #include "ax88796.h" diff --git a/drivers/net/ax88796.h b/drivers/net/ax88796.h index 2b4e05af3b..5106066106 100644 --- a/drivers/net/ax88796.h +++ b/drivers/net/ax88796.h @@ -1,9 +1,8 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * AX88796L(NE2000) support * * (c) 2007 Nobuhiro Iwamatsu <iwamatsu@nigauri.org> - * - * SPDX-License-Identifier: GPL-2.0+ */ #ifndef __DRIVERS_AX88796L_H__ diff --git a/drivers/net/bcm-sf2-eth-gmac.c b/drivers/net/bcm-sf2-eth-gmac.c index a2b594ed73..db3e79ade3 100644 --- a/drivers/net/bcm-sf2-eth-gmac.c +++ b/drivers/net/bcm-sf2-eth-gmac.c @@ -1,7 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright 2014-2017 Broadcom. - * - * SPDX-License-Identifier: GPL-2.0+ */ #ifdef BCM_GMAC_DEBUG diff --git a/drivers/net/bcm-sf2-eth-gmac.h b/drivers/net/bcm-sf2-eth-gmac.h index 810a617269..477667f4ea 100644 --- a/drivers/net/bcm-sf2-eth-gmac.h +++ b/drivers/net/bcm-sf2-eth-gmac.h @@ -1,7 +1,6 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * Copyright 2014 Broadcom Corporation. - * - * SPDX-License-Identifier: GPL-2.0+ */ #ifndef _BCM_SF2_ETH_GMAC_H_ diff --git a/drivers/net/bcm-sf2-eth.c b/drivers/net/bcm-sf2-eth.c index 9056f71b9a..615037f1a3 100644 --- a/drivers/net/bcm-sf2-eth.c +++ b/drivers/net/bcm-sf2-eth.c @@ -1,7 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright 2014 Broadcom Corporation. - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/drivers/net/bcm-sf2-eth.h b/drivers/net/bcm-sf2-eth.h index efeff15a01..f4dbb4e195 100644 --- a/drivers/net/bcm-sf2-eth.h +++ b/drivers/net/bcm-sf2-eth.h @@ -1,7 +1,6 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * Copyright 2014-2017 Broadcom. - * - * SPDX-License-Identifier: GPL-2.0+ */ #ifndef _BCM_SF2_ETH_H_ diff --git a/drivers/net/calxedaxgmac.c b/drivers/net/calxedaxgmac.c index c02b397fa1..1b7c94f654 100644 --- a/drivers/net/calxedaxgmac.c +++ b/drivers/net/calxedaxgmac.c @@ -1,7 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright 2010-2011 Calxeda, Inc. - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/drivers/net/cpsw-common.c b/drivers/net/cpsw-common.c index 7bd312a6c0..6c8ddbd936 100644 --- a/drivers/net/cpsw-common.c +++ b/drivers/net/cpsw-common.c @@ -1,9 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * CPSW common - libs used across TI ethernet devices. * * Copyright (C) 2016, Texas Instruments, Incorporated - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/drivers/net/cs8900.c b/drivers/net/cs8900.c index 0713464c77..9331cdf938 100644 --- a/drivers/net/cs8900.c +++ b/drivers/net/cs8900.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Cirrus Logic CS8900A Ethernet * @@ -20,8 +21,6 @@ * target board. Anything with a CL-PS7111 or EP7211 should be able to run * this code in bootstrap mode. All the board specifics can be handled on * the host. - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/drivers/net/cs8900.h b/drivers/net/cs8900.h index 79877dd572..1a566ff7b2 100644 --- a/drivers/net/cs8900.h +++ b/drivers/net/cs8900.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ #ifndef CS8900_H #define CS8900_H /* @@ -18,8 +19,6 @@ * target board. Anything with a CL-PS7111 or EP7211 should be able to run * this code in bootstrap mode. All the board specifics can be handled on * the host. - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <asm/types.h> diff --git a/drivers/net/davinci_emac.c b/drivers/net/davinci_emac.c index d1024879a0..bb879d8d4f 100644 --- a/drivers/net/davinci_emac.c +++ b/drivers/net/davinci_emac.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Ethernet driver for TI TMS320DM644x (DaVinci) chips. * @@ -16,8 +17,6 @@ * * ---------------------------------------------------------------------------- * - * SPDX-License-Identifier: GPL-2.0+ - * * Modifications: * ver. 1.0: Sep 2005, Anant Gole - Created EMAC version for uBoot. * ver 1.1: Nov 2005, Anant Gole - Extended the RX logic for multiple descriptors diff --git a/drivers/net/davinci_emac.h b/drivers/net/davinci_emac.h index e2ed54bac5..695855b4d5 100644 --- a/drivers/net/davinci_emac.h +++ b/drivers/net/davinci_emac.h @@ -1,10 +1,9 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * Copyright (C) 2011 Ilya Yanok, Emcraft Systems * * Based on: mach-davinci/emac_defs.h * Copyright (C) 2007 Sergey Kubushyn <ksi@koi8.net> - * - * SPDX-License-Identifier: GPL-2.0+ */ #ifndef _DAVINCI_EMAC_H_ diff --git a/drivers/net/dc2114x.c b/drivers/net/dc2114x.c index f38f36beb1..8d7c271038 100644 --- a/drivers/net/dc2114x.c +++ b/drivers/net/dc2114x.c @@ -1,6 +1,4 @@ -/* - * SPDX-License-Identifier: GPL-2.0+ - */ +// SPDX-License-Identifier: GPL-2.0+ #include <common.h> #include <malloc.h> diff --git a/drivers/net/designware.c b/drivers/net/designware.c index 765e356645..cf125210d8 100644 --- a/drivers/net/designware.c +++ b/drivers/net/designware.c @@ -1,8 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * (C) Copyright 2010 * Vipin Kumar, ST Micoelectronics, vipin.kumar@st.com. - * - * SPDX-License-Identifier: GPL-2.0+ */ /* diff --git a/drivers/net/designware.h b/drivers/net/designware.h index 252cd24f1a..dea12b7048 100644 --- a/drivers/net/designware.h +++ b/drivers/net/designware.h @@ -1,8 +1,7 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * (C) Copyright 2010 * Vipin Kumar, ST Micoelectronics, vipin.kumar@st.com. - * - * SPDX-License-Identifier: GPL-2.0+ */ #ifndef _DW_ETH_H diff --git a/drivers/net/dm9000x.c b/drivers/net/dm9000x.c index 93c6667bca..a6c0a2452f 100644 --- a/drivers/net/dm9000x.c +++ b/drivers/net/dm9000x.c @@ -1,11 +1,10 @@ +// SPDX-License-Identifier: GPL-2.0+ /* dm9000.c: Version 1.2 12/15/2003 A Davicom DM9000 ISA NIC fast Ethernet driver for Linux. Copyright (C) 1997 Sten Wang - * SPDX-License-Identifier: GPL-2.0+ - (C)Copyright 1997-1998 DAVICOM Semiconductor,Inc. All Rights Reserved. V0.11 06/20/2001 REG_0A bit3=1, default enable BP with DA match diff --git a/drivers/net/dwc_eth_qos.c b/drivers/net/dwc_eth_qos.c index 232e8034df..9f1c5af46e 100644 --- a/drivers/net/dwc_eth_qos.c +++ b/drivers/net/dwc_eth_qos.c @@ -1,8 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0 /* * Copyright (c) 2016, NVIDIA CORPORATION. * - * SPDX-License-Identifier: GPL-2.0 - * * Portions based on U-Boot's rtl8169.c. */ diff --git a/drivers/net/e1000.c b/drivers/net/e1000.c index 5cc54efe48..a34f697461 100644 --- a/drivers/net/e1000.c +++ b/drivers/net/e1000.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0+ /************************************************************************** Intel Pro 1000 for ppcboot/das-u-boot Drivers are port from Intel's Linux driver e1000-4.3.15 @@ -9,7 +10,6 @@ tested on both gig copper and gig fiber boards Copyright(c) 1999 - 2002 Intel Corporation. All rights reserved. - * SPDX-License-Identifier: GPL-2.0+ Contact Information: Linux NICS <linux.nics@intel.com> diff --git a/drivers/net/e1000.h b/drivers/net/e1000.h index 6376de15ad..2ae3085515 100644 --- a/drivers/net/e1000.h +++ b/drivers/net/e1000.h @@ -1,11 +1,10 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /******************************************************************************* Copyright(c) 1999 - 2002 Intel Corporation. All rights reserved. Copyright 2011 Freescale Semiconductor, Inc. - * SPDX-License-Identifier: GPL-2.0+ - Contact Information: Linux NICS <linux.nics@intel.com> Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497 diff --git a/drivers/net/eepro100.c b/drivers/net/eepro100.c index 33d9fd6a57..ae65b649bf 100644 --- a/drivers/net/eepro100.c +++ b/drivers/net/eepro100.c @@ -1,8 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * (C) Copyright 2002 * Wolfgang Denk, DENX Software Engineering, wd@denx.de. - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/drivers/net/ep93xx_eth.c b/drivers/net/ep93xx_eth.c index bc45706243..ecb34b2450 100644 --- a/drivers/net/ep93xx_eth.c +++ b/drivers/net/ep93xx_eth.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Cirrus Logic EP93xx ethernet MAC / MII driver. * @@ -13,8 +14,6 @@ * (C) Copyright 2002 2003 * Adam Bezanson, Network Audio Technologies, Inc. * <bezanson@netaudiotech.com> - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <command.h> diff --git a/drivers/net/ep93xx_eth.h b/drivers/net/ep93xx_eth.h index e6c949ffc3..074fe25f34 100644 --- a/drivers/net/ep93xx_eth.h +++ b/drivers/net/ep93xx_eth.h @@ -1,10 +1,9 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * Copyright (C) 2009 Matthias Kaehlcke <matthias@kaehlcke.net> * * Copyright (C) 2004, 2005 * Cory T. Tusar, Videon Central, Inc., <ctusar@videon-central.com> - * - * SPDX-License-Identifier: GPL-2.0+ */ #ifndef _EP93XX_ETH_H diff --git a/drivers/net/ethoc.c b/drivers/net/ethoc.c index 51a6c97550..3d43a58d4a 100644 --- a/drivers/net/ethoc.c +++ b/drivers/net/ethoc.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * Opencore 10/100 ethernet mac driver * @@ -6,8 +7,6 @@ * Thierry Reding <thierry.reding@avionic-design.de> * Copyright (C) 2010 Thomas Chou <thomas@wytron.com.tw> * Copyright (C) 2016 Cadence Design Systems Inc. - * - * SPDX-License-Identifier: GPL-2.0 */ #include <common.h> diff --git a/drivers/net/fec_mxc.c b/drivers/net/fec_mxc.c index 5740379841..694a0b2f7e 100644 --- a/drivers/net/fec_mxc.c +++ b/drivers/net/fec_mxc.c @@ -1,11 +1,10 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * (C) Copyright 2009 Ilya Yanok, Emcraft Systems Ltd <yanok@emcraft.com> * (C) Copyright 2008,2009 Eric Jarrige <eric.jarrige@armadeus.org> * (C) Copyright 2008 Armadeus Systems nc * (C) Copyright 2007 Pengutronix, Sascha Hauer <s.hauer@pengutronix.de> * (C) Copyright 2007 Pengutronix, Juergen Beisert <j.beisert@pengutronix.de> - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/drivers/net/fec_mxc.h b/drivers/net/fec_mxc.h index 43a7d7bed8..3b935afe2c 100644 --- a/drivers/net/fec_mxc.h +++ b/drivers/net/fec_mxc.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * (C) Copyright 2009 Ilya Yanok, Emcraft Systems Ltd <yanok@emcraft.com> * (C) Copyright 2008 Armadeus Systems, nc @@ -10,8 +11,6 @@ * * This file is based on mpc4200fec.h * (C) Copyright Motorola, Inc., 2000 - * - * SPDX-License-Identifier: GPL-2.0+ */ #ifndef __FEC_MXC_H diff --git a/drivers/net/fm/Makefile b/drivers/net/fm/Makefile index fc7a6da03b..e10db710e6 100644 --- a/drivers/net/fm/Makefile +++ b/drivers/net/fm/Makefile @@ -1,8 +1,6 @@ +# SPDX-License-Identifier: GPL-2.0+ # # Copyright 2009-2011 Freescale Semiconductor, Inc. -# -# SPDX-License-Identifier: GPL-2.0+ -# obj-y += dtsec.o obj-y += eth.o diff --git a/drivers/net/fm/b4860.c b/drivers/net/fm/b4860.c index 3245bee473..1e20685803 100644 --- a/drivers/net/fm/b4860.c +++ b/drivers/net/fm/b4860.c @@ -1,8 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright 2012 Freescale Semiconductor, Inc. * Roy Zang <tie-fei.zang@freescale.com> - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> #include <phy.h> diff --git a/drivers/net/fm/dtsec.c b/drivers/net/fm/dtsec.c index b339a84e59..4c78a4d63f 100644 --- a/drivers/net/fm/dtsec.c +++ b/drivers/net/fm/dtsec.c @@ -1,7 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright 2009-2011 Freescale Semiconductor, Inc. - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/drivers/net/fm/eth.c b/drivers/net/fm/eth.c index bf5f89b61a..88019c9a88 100644 --- a/drivers/net/fm/eth.c +++ b/drivers/net/fm/eth.c @@ -1,8 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright 2009-2012 Freescale Semiconductor, Inc. * Dave Liu <daveliu@freescale.com> - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> #include <asm/io.h> diff --git a/drivers/net/fm/fdt.c b/drivers/net/fm/fdt.c index 5920fecea1..6125797125 100644 --- a/drivers/net/fm/fdt.c +++ b/drivers/net/fm/fdt.c @@ -1,7 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright 2016 Freescale Semiconductor, Inc. - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <asm/io.h> #include <fsl_qe.h> /* For struct qe_firmware */ diff --git a/drivers/net/fm/fm.c b/drivers/net/fm/fm.c index 261f1b911b..3327073bf1 100644 --- a/drivers/net/fm/fm.c +++ b/drivers/net/fm/fm.c @@ -1,8 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright 2009-2011 Freescale Semiconductor, Inc. * Dave Liu <daveliu@freescale.com> - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> #include <malloc.h> diff --git a/drivers/net/fm/fm.h b/drivers/net/fm/fm.h index 64cc9718d0..e5deaf52c5 100644 --- a/drivers/net/fm/fm.h +++ b/drivers/net/fm/fm.h @@ -1,7 +1,6 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * Copyright 2009-2011 Freescale Semiconductor, Inc. - * - * SPDX-License-Identifier: GPL-2.0+ */ #ifndef __FM_H__ diff --git a/drivers/net/fm/init.c b/drivers/net/fm/init.c index 71c3abef22..147d0437c5 100644 --- a/drivers/net/fm/init.c +++ b/drivers/net/fm/init.c @@ -1,7 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright 2011-2015 Freescale Semiconductor, Inc. - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <errno.h> #include <common.h> diff --git a/drivers/net/fm/ls1043.c b/drivers/net/fm/ls1043.c index 6bb6a71470..cd510f2955 100644 --- a/drivers/net/fm/ls1043.c +++ b/drivers/net/fm/ls1043.c @@ -1,7 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright 2015 Freescale Semiconductor, Inc. - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> #include <phy.h> diff --git a/drivers/net/fm/ls1046.c b/drivers/net/fm/ls1046.c index 6c91fb97f4..3617ad93e4 100644 --- a/drivers/net/fm/ls1046.c +++ b/drivers/net/fm/ls1046.c @@ -1,7 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright 2016 Freescale Semiconductor, Inc. - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> #include <phy.h> diff --git a/drivers/net/fm/memac.c b/drivers/net/fm/memac.c index ea50ed38f4..2c499513f9 100644 --- a/drivers/net/fm/memac.c +++ b/drivers/net/fm/memac.c @@ -1,8 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright 2012 Freescale Semiconductor, Inc. * Roy Zang <tie-fei.zang@freescale.com> - * - * SPDX-License-Identifier: GPL-2.0+ */ /* MAXFRM - maximum frame length */ diff --git a/drivers/net/fm/memac_phy.c b/drivers/net/fm/memac_phy.c index 5079342682..c2ef1b4e73 100644 --- a/drivers/net/fm/memac_phy.c +++ b/drivers/net/fm/memac_phy.c @@ -1,9 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright 2012 Freescale Semiconductor, Inc. * Andy Fleming <afleming@gmail.com> * Roy Zang <tie-fei.zang@freescale.com> - * - * SPDX-License-Identifier: GPL-2.0+ * Some part is taken from tsec.c */ #include <common.h> diff --git a/drivers/net/fm/p1023.c b/drivers/net/fm/p1023.c index b25d10ae0f..d4167e4d69 100644 --- a/drivers/net/fm/p1023.c +++ b/drivers/net/fm/p1023.c @@ -1,7 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright 2011 Freescale Semiconductor, Inc. - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> #include <phy.h> diff --git a/drivers/net/fm/p4080.c b/drivers/net/fm/p4080.c index de71911355..b78b02d828 100644 --- a/drivers/net/fm/p4080.c +++ b/drivers/net/fm/p4080.c @@ -1,7 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright 2011 Freescale Semiconductor, Inc. - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> #include <phy.h> diff --git a/drivers/net/fm/p5020.c b/drivers/net/fm/p5020.c index 5c158cd5df..8189531215 100644 --- a/drivers/net/fm/p5020.c +++ b/drivers/net/fm/p5020.c @@ -1,7 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright 2011 Freescale Semiconductor, Inc. - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> #include <phy.h> diff --git a/drivers/net/fm/p5040.c b/drivers/net/fm/p5040.c index 403d7d7948..38744e7b7b 100644 --- a/drivers/net/fm/p5040.c +++ b/drivers/net/fm/p5040.c @@ -1,7 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright 2011 Freescale Semiconductor, Inc. - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> #include <phy.h> diff --git a/drivers/net/fm/t1024.c b/drivers/net/fm/t1024.c index 9b3117341e..6fc3b90337 100644 --- a/drivers/net/fm/t1024.c +++ b/drivers/net/fm/t1024.c @@ -1,8 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0+ /* Copyright 2014 Freescale Semiconductor, Inc. * * Shengzhou Liu <Shengzhou.Liu@freescale.com> - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/drivers/net/fm/t1040.c b/drivers/net/fm/t1040.c index 04583661ec..7ec7f99bd0 100644 --- a/drivers/net/fm/t1040.c +++ b/drivers/net/fm/t1040.c @@ -1,7 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright 2013 Freescale Semiconductor, Inc. - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> #include <phy.h> diff --git a/drivers/net/fm/t2080.c b/drivers/net/fm/t2080.c index 3b6212f858..f4d8d2d869 100644 --- a/drivers/net/fm/t2080.c +++ b/drivers/net/fm/t2080.c @@ -1,9 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright 2012 Freescale Semiconductor, Inc. * * Shengzhou Liu <Shengzhou.Liu@freescale.com> - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/drivers/net/fm/t4240.c b/drivers/net/fm/t4240.c index 70887fa45f..f8e63c3d71 100644 --- a/drivers/net/fm/t4240.c +++ b/drivers/net/fm/t4240.c @@ -1,8 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright 2012 Freescale Semiconductor, Inc. * Roy Zang <tie-fei.zang@freescale.com> - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> #include <phy.h> diff --git a/drivers/net/fm/tgec.c b/drivers/net/fm/tgec.c index 8d4622ff38..9f2f6f6d5b 100644 --- a/drivers/net/fm/tgec.c +++ b/drivers/net/fm/tgec.c @@ -1,8 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright 2009-2011 Freescale Semiconductor, Inc. * Dave Liu <daveliu@freescale.com> - * - * SPDX-License-Identifier: GPL-2.0+ */ /* MAXFRM - maximum frame length */ diff --git a/drivers/net/fm/tgec_phy.c b/drivers/net/fm/tgec_phy.c index f038541c8d..f6c98f2e29 100644 --- a/drivers/net/fm/tgec_phy.c +++ b/drivers/net/fm/tgec_phy.c @@ -1,8 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright 2009-2011 Freescale Semiconductor, Inc. * Andy Fleming <afleming@gmail.com> - * - * SPDX-License-Identifier: GPL-2.0+ * Some part is taken from tsec.c */ #include <common.h> diff --git a/drivers/net/fsl-mc/Makefile b/drivers/net/fsl-mc/Makefile index a492388821..1b1b4a77f8 100644 --- a/drivers/net/fsl-mc/Makefile +++ b/drivers/net/fsl-mc/Makefile @@ -1,8 +1,6 @@ +# SPDX-License-Identifier: GPL-2.0+ # # Copyright 2014 Freescale Semiconductor, Inc. -# -# SPDX-License-Identifier: GPL-2.0+ -# # Layerscape MC driver obj-y += mc.o \ diff --git a/drivers/net/fsl-mc/dpbp.c b/drivers/net/fsl-mc/dpbp.c index a0552f44dc..327bee935a 100644 --- a/drivers/net/fsl-mc/dpbp.c +++ b/drivers/net/fsl-mc/dpbp.c @@ -1,10 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Freescale Layerscape MC I/O wrapper * * Copyright (C) 2013-2016 Freescale Semiconductor, Inc. * Copyright 2017 NXP - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <fsl-mc/fsl_mc_sys.h> #include <fsl-mc/fsl_mc_cmd.h> diff --git a/drivers/net/fsl-mc/dpio/Makefile b/drivers/net/fsl-mc/dpio/Makefile index 1ccefc0db2..752226c733 100644 --- a/drivers/net/fsl-mc/dpio/Makefile +++ b/drivers/net/fsl-mc/dpio/Makefile @@ -1,8 +1,6 @@ +# SPDX-License-Identifier: GPL-2.0+ # # Copyright 2014 Freescale Semiconductor, Inc. -# -# SPDX-License-Identifier: GPL-2.0+ -# # Layerscape MC DPIO driver obj-y += dpio.o \ diff --git a/drivers/net/fsl-mc/dpio/dpio.c b/drivers/net/fsl-mc/dpio/dpio.c index ccac506e99..0bbb760728 100644 --- a/drivers/net/fsl-mc/dpio/dpio.c +++ b/drivers/net/fsl-mc/dpio/dpio.c @@ -1,8 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (C) 2013-2016 Freescale Semiconductor * Copyright 2017 NXP - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <fsl-mc/fsl_mc_sys.h> diff --git a/drivers/net/fsl-mc/dpio/qbman_portal.c b/drivers/net/fsl-mc/dpio/qbman_portal.c index 6e31244f20..c51354cfa1 100644 --- a/drivers/net/fsl-mc/dpio/qbman_portal.c +++ b/drivers/net/fsl-mc/dpio/qbman_portal.c @@ -1,7 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (C) 2014 Freescale Semiconductor - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <asm/arch/clock.h> diff --git a/drivers/net/fsl-mc/dpio/qbman_portal.h b/drivers/net/fsl-mc/dpio/qbman_portal.h index 97a47aa94e..8cbc771a12 100644 --- a/drivers/net/fsl-mc/dpio/qbman_portal.h +++ b/drivers/net/fsl-mc/dpio/qbman_portal.h @@ -1,7 +1,6 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * Copyright (C) 2014 Freescale Semiconductor - * - * SPDX-License-Identifier: GPL-2.0+ */ #include "qbman_private.h" diff --git a/drivers/net/fsl-mc/dpio/qbman_private.h b/drivers/net/fsl-mc/dpio/qbman_private.h index 873323be0f..ded11a643e 100644 --- a/drivers/net/fsl-mc/dpio/qbman_private.h +++ b/drivers/net/fsl-mc/dpio/qbman_private.h @@ -1,7 +1,6 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * Copyright (C) 2014 Freescale Semiconductor - * - * SPDX-License-Identifier: GPL-2.0+ */ /* Perform extra checking */ diff --git a/drivers/net/fsl-mc/dpio/qbman_sys.h b/drivers/net/fsl-mc/dpio/qbman_sys.h index 72d74c5c5a..cdced68110 100644 --- a/drivers/net/fsl-mc/dpio/qbman_sys.h +++ b/drivers/net/fsl-mc/dpio/qbman_sys.h @@ -1,7 +1,6 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * Copyright (C) 2014 Freescale Semiconductor - * - * SPDX-License-Identifier: GPL-2.0+ */ /* qbman_sys_decl.h and qbman_sys.h are the two platform-specific files in the diff --git a/drivers/net/fsl-mc/dpmac.c b/drivers/net/fsl-mc/dpmac.c index a719ac12d4..2aadd4ada2 100644 --- a/drivers/net/fsl-mc/dpmac.c +++ b/drivers/net/fsl-mc/dpmac.c @@ -1,11 +1,10 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Freescale Layerscape MC I/O wrapper * * Copyright (C) 2015-2016 Freescale Semiconductor, Inc. * Copyright 2017 NXP * Author: Prabhakar Kushwaha <prabhakar@freescale.com> - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <fsl-mc/fsl_mc_sys.h> diff --git a/drivers/net/fsl-mc/dpmng.c b/drivers/net/fsl-mc/dpmng.c index d96e26b757..8314243f35 100644 --- a/drivers/net/fsl-mc/dpmng.c +++ b/drivers/net/fsl-mc/dpmng.c @@ -1,6 +1,5 @@ +// SPDX-License-Identifier: GPL-2.0+ /* Copyright 2013-2015 Freescale Semiconductor Inc. - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <fsl-mc/fsl_mc_sys.h> #include <fsl-mc/fsl_mc_cmd.h> diff --git a/drivers/net/fsl-mc/dpni.c b/drivers/net/fsl-mc/dpni.c index 481f9d882b..5cf5eebea6 100644 --- a/drivers/net/fsl-mc/dpni.c +++ b/drivers/net/fsl-mc/dpni.c @@ -1,8 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (C) 2013-2016 Freescale Semiconductor * Copyright 2017 NXP - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <fsl-mc/fsl_mc_sys.h> diff --git a/drivers/net/fsl-mc/dprc.c b/drivers/net/fsl-mc/dprc.c index be02057b46..38d19a4063 100644 --- a/drivers/net/fsl-mc/dprc.c +++ b/drivers/net/fsl-mc/dprc.c @@ -1,10 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Freescale Layerscape MC I/O wrapper * * Copyright (C) 2013-2016 Freescale Semiconductor, Inc. * Copyright 2017 NXP - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <fsl-mc/fsl_mc_sys.h> diff --git a/drivers/net/fsl-mc/fsl_dpmng_cmd.h b/drivers/net/fsl-mc/fsl_dpmng_cmd.h index a91da2b52d..9e6f27afdc 100644 --- a/drivers/net/fsl-mc/fsl_dpmng_cmd.h +++ b/drivers/net/fsl-mc/fsl_dpmng_cmd.h @@ -1,7 +1,6 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* Copyright 2013-2016 Freescale Semiconductor Inc. * Copyright 2017 NXP - * - * SPDX-License-Identifier: GPL-2.0+ */ #ifndef __FSL_DPMNG_CMD_H #define __FSL_DPMNG_CMD_H diff --git a/drivers/net/fsl-mc/mc.c b/drivers/net/fsl-mc/mc.c index ea9ae5b609..58612cfca3 100644 --- a/drivers/net/fsl-mc/mc.c +++ b/drivers/net/fsl-mc/mc.c @@ -1,8 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (C) 2017 NXP Semiconductors * Copyright (C) 2014 Freescale Semiconductor - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> #include <errno.h> diff --git a/drivers/net/fsl-mc/mc_sys.c b/drivers/net/fsl-mc/mc_sys.c index 71e145649f..fddf5cb023 100644 --- a/drivers/net/fsl-mc/mc_sys.c +++ b/drivers/net/fsl-mc/mc_sys.c @@ -1,10 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Freescale Layerscape MC I/O wrapper * * Copyright (C) 2013-2015 Freescale Semiconductor, Inc. * Author: German Rivera <German.Rivera@freescale.com> - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <fsl-mc/fsl_mc_sys.h> diff --git a/drivers/net/fsl_mcdmafec.c b/drivers/net/fsl_mcdmafec.c index ad7e051722..88309b186c 100644 --- a/drivers/net/fsl_mcdmafec.c +++ b/drivers/net/fsl_mcdmafec.c @@ -1,11 +1,10 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * (C) Copyright 2000-2004 * Wolfgang Denk, DENX Software Engineering, wd@denx.de. * * (C) Copyright 2007 Freescale Semiconductor, Inc. * TsiChung Liew (Tsi-Chung.Liew@freescale.com) - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/drivers/net/fsl_mdio.c b/drivers/net/fsl_mdio.c index bd56166d7b..894b52ee66 100644 --- a/drivers/net/fsl_mdio.c +++ b/drivers/net/fsl_mdio.c @@ -1,9 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright 2009-2010, 2013 Freescale Semiconductor, Inc. * Jun-jie Zhang <b18070@freescale.com> * Mingkai Hu <Mingkai.hu@freescale.com> - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/drivers/net/ftgmac100.c b/drivers/net/ftgmac100.c index d0939e93dc..c996f5f4a1 100644 --- a/drivers/net/ftgmac100.c +++ b/drivers/net/ftgmac100.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Faraday FTGMAC100 Ethernet * @@ -6,8 +7,6 @@ * * (C) Copyright 2010 Andes Technology * Macpaul Lin <macpaul@andestech.com> - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <config.h> diff --git a/drivers/net/ftgmac100.h b/drivers/net/ftgmac100.h index 71121ba9d4..ffbe1f3e3f 100644 --- a/drivers/net/ftgmac100.h +++ b/drivers/net/ftgmac100.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * Faraday FTGMAC100 Ethernet * @@ -6,8 +7,6 @@ * * (C) Copyright 2010 Andes Technology * Macpaul Lin <macpaul@andestech.com> - * - * SPDX-License-Identifier: GPL-2.0+ */ #ifndef __FTGMAC100_H diff --git a/drivers/net/ftmac100.c b/drivers/net/ftmac100.c index e64bf3d651..6c8474893d 100644 --- a/drivers/net/ftmac100.c +++ b/drivers/net/ftmac100.c @@ -1,10 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Faraday FTMAC100 Ethernet * * (C) Copyright 2009 Faraday Technology * Po-Yu Chuang <ratbert@faraday-tech.com> - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <config.h> diff --git a/drivers/net/ftmac100.h b/drivers/net/ftmac100.h index b674d0291c..75a49f628a 100644 --- a/drivers/net/ftmac100.h +++ b/drivers/net/ftmac100.h @@ -1,10 +1,9 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * Faraday FTMAC100 Ethernet * * (C) Copyright 2009 Faraday Technology * Po-Yu Chuang <ratbert@faraday-tech.com> - * - * SPDX-License-Identifier: GPL-2.0+ */ #ifndef __FTMAC100_H diff --git a/drivers/net/ftmac110.c b/drivers/net/ftmac110.c index bbe56f1ffb..1fa93d4d58 100644 --- a/drivers/net/ftmac110.c +++ b/drivers/net/ftmac110.c @@ -1,10 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Faraday 10/100Mbps Ethernet Controller * * (C) Copyright 2013 Faraday Technology * Dante Su <dantesu@faraday-tech.com> - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/drivers/net/ftmac110.h b/drivers/net/ftmac110.h index 2772ae7b70..a792b515b4 100644 --- a/drivers/net/ftmac110.h +++ b/drivers/net/ftmac110.h @@ -1,10 +1,9 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * Faraday 10/100Mbps Ethernet Controller * * (C) Copyright 2013 Faraday Technology * Dante Su <dantesu@faraday-tech.com> - * - * SPDX-License-Identifier: GPL-2.0+ */ #ifndef _FTMAC110_H diff --git a/drivers/net/gmac_rockchip.c b/drivers/net/gmac_rockchip.c index 5ed3049fa6..30a24d1947 100644 --- a/drivers/net/gmac_rockchip.c +++ b/drivers/net/gmac_rockchip.c @@ -1,8 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * (C) Copyright 2015 Sjoerd Simons <sjoerd.simons@collabora.co.uk> * - * SPDX-License-Identifier: GPL-2.0+ - * * Rockchip GMAC ethernet IP driver for U-Boot */ diff --git a/drivers/net/keystone_net.c b/drivers/net/keystone_net.c index 21ccab47ae..d4d909b983 100644 --- a/drivers/net/keystone_net.c +++ b/drivers/net/keystone_net.c @@ -1,10 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Ethernet driver for TI K2HK EVM. * * (C) Copyright 2012-2014 * Texas Instruments Incorporated, <www.ti.com> - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> #include <command.h> diff --git a/drivers/net/ks8851_mll.c b/drivers/net/ks8851_mll.c index 5b4c5b0df6..718a7dd019 100644 --- a/drivers/net/ks8851_mll.c +++ b/drivers/net/ks8851_mll.c @@ -1,8 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Micrel KS8851_MLL 16bit Network driver * Copyright (c) 2011 Roberto Cerati <roberto.cerati@bticino.it> - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <asm/io.h> diff --git a/drivers/net/lan91c96.c b/drivers/net/lan91c96.c index a9fc74bdee..f2489aaf82 100644 --- a/drivers/net/lan91c96.c +++ b/drivers/net/lan91c96.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0+ /*------------------------------------------------------------------------ * lan91c96.c * This is a driver for SMSC's LAN91C96 single-chip Ethernet device, based @@ -11,8 +12,6 @@ * Developed by Simple Network Magic Corporation (SNMC) * Copyright (C) 1996 by Erik Stahlman (ES) * - * SPDX-License-Identifier: GPL-2.0+ - * * Information contained in this file was obtained from the LAN91C96 * manual from SMC. To get a copy, if you really want one, you can find * information under www.smsc.com. diff --git a/drivers/net/lan91c96.h b/drivers/net/lan91c96.h index 3e914ce5ad..c76348084a 100644 --- a/drivers/net/lan91c96.h +++ b/drivers/net/lan91c96.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /*------------------------------------------------------------------------ * lan91c96.h * @@ -8,8 +9,6 @@ * Developed by Simple Network Magic Corporation (SNMC) * Copyright (C) 1996 by Erik Stahlman (ES) * - * SPDX-License-Identifier: GPL-2.0+ - * * This file contains register information and access macros for * the LAN91C96 single chip ethernet controller. It is a modified * version of the smc9111.h file. diff --git a/drivers/net/ldpaa_eth/Makefile b/drivers/net/ldpaa_eth/Makefile index 13ecd381ea..477ee4faed 100644 --- a/drivers/net/ldpaa_eth/Makefile +++ b/drivers/net/ldpaa_eth/Makefile @@ -1,8 +1,6 @@ +# SPDX-License-Identifier: GPL-2.0+ # # Copyright 2014 Freescale Semiconductor, Inc. -# -# SPDX-License-Identifier: GPL-2.0+ -# obj-y += ldpaa_wriop.o obj-y += ldpaa_eth.o diff --git a/drivers/net/ldpaa_eth/ldpaa_eth.c b/drivers/net/ldpaa_eth/ldpaa_eth.c index 109aba2f96..8688dd4419 100644 --- a/drivers/net/ldpaa_eth/ldpaa_eth.c +++ b/drivers/net/ldpaa_eth/ldpaa_eth.c @@ -1,8 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (C) 2014-2016 Freescale Semiconductor * Copyright 2017 NXP - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/drivers/net/ldpaa_eth/ldpaa_eth.h b/drivers/net/ldpaa_eth/ldpaa_eth.h index 1e26630043..54cb633e01 100644 --- a/drivers/net/ldpaa_eth/ldpaa_eth.h +++ b/drivers/net/ldpaa_eth/ldpaa_eth.h @@ -1,8 +1,7 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * Copyright (C) 2014-2016 Freescale Semiconductor * Copyright 2017 NXP - * - * SPDX-License-Identifier: GPL-2.0+ */ #ifndef __LDPAA_ETH_H diff --git a/drivers/net/ldpaa_eth/ldpaa_wriop.c b/drivers/net/ldpaa_eth/ldpaa_wriop.c index 831a330070..0731a795c8 100644 --- a/drivers/net/ldpaa_eth/ldpaa_wriop.c +++ b/drivers/net/ldpaa_eth/ldpaa_wriop.c @@ -1,7 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (C) 2015 Freescale Semiconductor - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/drivers/net/ldpaa_eth/ls1088a.c b/drivers/net/ldpaa_eth/ls1088a.c index 780a23998a..43210532ba 100644 --- a/drivers/net/ldpaa_eth/ls1088a.c +++ b/drivers/net/ldpaa_eth/ls1088a.c @@ -1,7 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright 2017 NXP - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> #include <phy.h> diff --git a/drivers/net/ldpaa_eth/ls2080a.c b/drivers/net/ldpaa_eth/ls2080a.c index 673e428a40..49eee044f3 100644 --- a/drivers/net/ldpaa_eth/ls2080a.c +++ b/drivers/net/ldpaa_eth/ls2080a.c @@ -1,7 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright 2015 Freescale Semiconductor, Inc. - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> #include <phy.h> diff --git a/drivers/net/lpc32xx_eth.c b/drivers/net/lpc32xx_eth.c index 1efe625c5f..2d15fc8db2 100644 --- a/drivers/net/lpc32xx_eth.c +++ b/drivers/net/lpc32xx_eth.c @@ -1,10 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * LPC32xx Ethernet MAC interface driver * * (C) Copyright 2014 DENX Software Engineering GmbH * Written-by: Albert ARIBAUD - 3ADEV <albert.aribaud@3adev.fr> - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/drivers/net/macb.c b/drivers/net/macb.c index fe370bf728..94c89c762b 100644 --- a/drivers/net/macb.c +++ b/drivers/net/macb.c @@ -1,7 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (C) 2005-2006 Atmel Corporation - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> #include <clk.h> diff --git a/drivers/net/macb.h b/drivers/net/macb.h index c39554df5f..3cc27f8560 100644 --- a/drivers/net/macb.h +++ b/drivers/net/macb.h @@ -1,7 +1,6 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * Copyright (C) 2005-2006 Atmel Corporation - * - * SPDX-License-Identifier: GPL-2.0+ */ #ifndef __DRIVERS_MACB_H__ #define __DRIVERS_MACB_H__ diff --git a/drivers/net/mcffec.c b/drivers/net/mcffec.c index 82838c62f2..2b54e3a549 100644 --- a/drivers/net/mcffec.c +++ b/drivers/net/mcffec.c @@ -1,11 +1,10 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * (C) Copyright 2000-2004 * Wolfgang Denk, DENX Software Engineering, wd@denx.de. * * (C) Copyright 2007 Freescale Semiconductor, Inc. * TsiChung Liew (Tsi-Chung.Liew@freescale.com) - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/drivers/net/mcfmii.c b/drivers/net/mcfmii.c index 103e365122..961618b410 100644 --- a/drivers/net/mcfmii.c +++ b/drivers/net/mcfmii.c @@ -1,8 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (C) 2004-2008 Freescale Semiconductor, Inc. * TsiChung Liew (Tsi-Chung.Liew@freescale.com) - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/drivers/net/mpc8xx_fec.c b/drivers/net/mpc8xx_fec.c index 1dd41df18b..f45f1e4677 100644 --- a/drivers/net/mpc8xx_fec.c +++ b/drivers/net/mpc8xx_fec.c @@ -1,8 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * (C) Copyright 2000 * Wolfgang Denk, DENX Software Engineering, wd@denx.de. - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/drivers/net/mvgbe.c b/drivers/net/mvgbe.c index f833efbe67..98b9a9a4f9 100644 --- a/drivers/net/mvgbe.c +++ b/drivers/net/mvgbe.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * (C) Copyright 2009 * Marvell Semiconductor <www.marvell.com> @@ -8,8 +9,6 @@ * * based on - Driver for MV64360X ethernet ports * Copyright (C) 2002 rabeeh@galileo.co.il - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/drivers/net/mvgbe.h b/drivers/net/mvgbe.h index 27a3f41e80..8a466658e3 100644 --- a/drivers/net/mvgbe.h +++ b/drivers/net/mvgbe.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * (C) Copyright 2009 * Marvell Semiconductor <www.marvell.com> @@ -5,8 +6,6 @@ * * based on - Driver for MV64360X ethernet ports * Copyright (C) 2002 rabeeh@galileo.co.il - * - * SPDX-License-Identifier: GPL-2.0+ */ #ifndef __MVGBE_H__ diff --git a/drivers/net/mvneta.c b/drivers/net/mvneta.c index f2e9acfd1f..6eacd6116a 100644 --- a/drivers/net/mvneta.c +++ b/drivers/net/mvneta.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * Driver for Marvell NETA network card for Armada XP and Armada 370 SoCs. * @@ -9,8 +10,6 @@ * * Rami Rosen <rosenr@marvell.com> * Thomas Petazzoni <thomas.petazzoni@free-electrons.com> - * - * SPDX-License-Identifier: GPL-2.0 */ #include <common.h> diff --git a/drivers/net/netconsole.c b/drivers/net/netconsole.c index 11dbf5375b..ce5a15ef57 100644 --- a/drivers/net/netconsole.c +++ b/drivers/net/netconsole.c @@ -1,8 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * (C) Copyright 2004 * Wolfgang Denk, DENX Software Engineering, wd@denx.de. - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/drivers/net/pch_gbe.c b/drivers/net/pch_gbe.c index 8866f6632f..d31c45f3b6 100644 --- a/drivers/net/pch_gbe.c +++ b/drivers/net/pch_gbe.c @@ -1,9 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (C) 2015, Bin Meng <bmeng.cn@gmail.com> * * Intel Platform Controller Hub EG20T (codename Topcliff) GMAC Driver - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/drivers/net/pch_gbe.h b/drivers/net/pch_gbe.h index 0ea0c73a4f..7e0fdbfd5a 100644 --- a/drivers/net/pch_gbe.h +++ b/drivers/net/pch_gbe.h @@ -1,10 +1,9 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * Copyright (C) 2015, Bin Meng <bmeng.cn@gmail.com> * * Intel Platform Controller Hub EG20T (codename Topcliff) GMAC Driver * Adapted from linux drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe.h - * - * SPDX-License-Identifier: GPL-2.0+ */ #ifndef _PCH_GBE_H_ diff --git a/drivers/net/pcnet.c b/drivers/net/pcnet.c index 1da9996986..eda6743ec3 100644 --- a/drivers/net/pcnet.c +++ b/drivers/net/pcnet.c @@ -1,10 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * (C) Copyright 2002 Wolfgang Grandegger, wg@denx.de. * * This driver for AMD PCnet network controllers is derived from the * Linux driver pcnet32.c written 1996-1999 by Thomas Bogendoerfer. - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/drivers/net/pfe_eth/pfe_cmd.c b/drivers/net/pfe_eth/pfe_cmd.c index 822dc0f141..dd8c68d57d 100644 --- a/drivers/net/pfe_eth/pfe_cmd.c +++ b/drivers/net/pfe_eth/pfe_cmd.c @@ -1,8 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright 2015-2016 Freescale Semiconductor, Inc. * Copyright 2017 NXP - * - * SPDX-License-Identifier: GPL-2.0+ */ /* diff --git a/drivers/net/pfe_eth/pfe_driver.c b/drivers/net/pfe_eth/pfe_driver.c index a9991f5c2b..14a8c68276 100644 --- a/drivers/net/pfe_eth/pfe_driver.c +++ b/drivers/net/pfe_eth/pfe_driver.c @@ -1,8 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright 2015-2016 Freescale Semiconductor, Inc. * Copyright 2017 NXP - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <net/pfe_eth/pfe_eth.h> diff --git a/drivers/net/pfe_eth/pfe_eth.c b/drivers/net/pfe_eth/pfe_eth.c index e6c6c8c9ab..c525674fb8 100644 --- a/drivers/net/pfe_eth/pfe_eth.c +++ b/drivers/net/pfe_eth/pfe_eth.c @@ -1,8 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright 2015-2016 Freescale Semiconductor, Inc. * Copyright 2017 NXP - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/drivers/net/pfe_eth/pfe_firmware.c b/drivers/net/pfe_eth/pfe_firmware.c index 9dc063dc75..f06ed37292 100644 --- a/drivers/net/pfe_eth/pfe_firmware.c +++ b/drivers/net/pfe_eth/pfe_firmware.c @@ -1,8 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright 2015-2016 Freescale Semiconductor, Inc. * Copyright 2017 NXP - * - * SPDX-License-Identifier: GPL-2.0+ */ /* diff --git a/drivers/net/pfe_eth/pfe_hw.c b/drivers/net/pfe_eth/pfe_hw.c index 12bb0da9b9..7137ac154a 100644 --- a/drivers/net/pfe_eth/pfe_hw.c +++ b/drivers/net/pfe_eth/pfe_hw.c @@ -1,8 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright 2015-2016 Freescale Semiconductor, Inc. * Copyright 2017 NXP - * - * SPDX-License-Identifier:GPL-2.0+ */ #include <net/pfe_eth/pfe_eth.h> #include <net/pfe_eth/pfe/pfe_hw.h> diff --git a/drivers/net/pfe_eth/pfe_mdio.c b/drivers/net/pfe_eth/pfe_mdio.c index a78a4d63f3..b53edb741f 100644 --- a/drivers/net/pfe_eth/pfe_mdio.c +++ b/drivers/net/pfe_eth/pfe_mdio.c @@ -1,8 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright 2015-2016 Freescale Semiconductor, Inc. * Copyright 2017 NXP - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> #include <dm.h> diff --git a/drivers/net/phy/Makefile b/drivers/net/phy/Makefile index f1980371c3..555da83630 100644 --- a/drivers/net/phy/Makefile +++ b/drivers/net/phy/Makefile @@ -1,9 +1,7 @@ +# SPDX-License-Identifier: GPL-2.0+ # # (C) Copyright 2008 # Wolfgang Denk, DENX Software Engineering, wd@denx.de. -# -# SPDX-License-Identifier: GPL-2.0+ -# obj-$(CONFIG_BITBANGMII) += miiphybb.o obj-$(CONFIG_B53_SWITCH) += b53.o diff --git a/drivers/net/phy/aquantia.c b/drivers/net/phy/aquantia.c index 6678147545..fe81217432 100644 --- a/drivers/net/phy/aquantia.c +++ b/drivers/net/phy/aquantia.c @@ -1,8 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Aquantia PHY drivers * - * SPDX-License-Identifier: GPL-2.0+ - * * Copyright 2014 Freescale Semiconductor, Inc. */ #include <config.h> diff --git a/drivers/net/phy/atheros.c b/drivers/net/phy/atheros.c index d7e76deeb7..79f68af14c 100644 --- a/drivers/net/phy/atheros.c +++ b/drivers/net/phy/atheros.c @@ -1,8 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Atheros PHY drivers * - * SPDX-License-Identifier: GPL-2.0+ - * * Copyright 2011, 2013 Freescale Semiconductor, Inc. * author Andy Fleming */ diff --git a/drivers/net/phy/b53.c b/drivers/net/phy/b53.c index f7f2d9f1ee..30c4812d82 100644 --- a/drivers/net/phy/b53.c +++ b/drivers/net/phy/b53.c @@ -1,9 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (C) 2017 * Broadcom * Florian Fainelli <f.fainelli@gmail.com> - * - * SPDX-License-Identifier: GPL-2.0+ */ /* diff --git a/drivers/net/phy/broadcom.c b/drivers/net/phy/broadcom.c index e4afa90dca..202e3dd487 100644 --- a/drivers/net/phy/broadcom.c +++ b/drivers/net/phy/broadcom.c @@ -1,8 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Broadcom PHY drivers * - * SPDX-License-Identifier: GPL-2.0+ - * * Copyright 2010-2011 Freescale Semiconductor, Inc. * author Andy Fleming */ diff --git a/drivers/net/phy/cortina.c b/drivers/net/phy/cortina.c index 9cb3a52c20..9b60d1aac5 100644 --- a/drivers/net/phy/cortina.c +++ b/drivers/net/phy/cortina.c @@ -1,8 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Cortina CS4315/CS4340 10G PHY drivers * - * SPDX-License-Identifier: GPL-2.0+ - * * Copyright 2014 Freescale Semiconductor, Inc. * Copyright 2018 NXP * diff --git a/drivers/net/phy/davicom.c b/drivers/net/phy/davicom.c index 0a6e4107ba..27c7788493 100644 --- a/drivers/net/phy/davicom.c +++ b/drivers/net/phy/davicom.c @@ -1,8 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Davicom PHY drivers * - * SPDX-License-Identifier: GPL-2.0+ - * * Copyright 2010-2011 Freescale Semiconductor, Inc. * author Andy Fleming */ diff --git a/drivers/net/phy/et1011c.c b/drivers/net/phy/et1011c.c index 2fe01327fa..c243c5b72f 100644 --- a/drivers/net/phy/et1011c.c +++ b/drivers/net/phy/et1011c.c @@ -1,10 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * ET1011C PHY driver * * Derived from Linux kernel driver by Chaithrika U S * Copyright (C) 2013, Texas Instruments, Incorporated - http://www.ti.com/ - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <config.h> #include <phy.h> diff --git a/drivers/net/phy/fixed.c b/drivers/net/phy/fixed.c index e8e9099cb5..0ae0edd0e1 100644 --- a/drivers/net/phy/fixed.c +++ b/drivers/net/phy/fixed.c @@ -1,9 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Fixed-Link phy * * Copyright 2017 Bernecker & Rainer Industrieelektronik GmbH - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <config.h> diff --git a/drivers/net/phy/generic_10g.c b/drivers/net/phy/generic_10g.c index ed3dcd91da..1024d7db7b 100644 --- a/drivers/net/phy/generic_10g.c +++ b/drivers/net/phy/generic_10g.c @@ -1,8 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Generic PHY Management code * - * SPDX-License-Identifier: GPL-2.0+ - * * Copyright 2011 Freescale Semiconductor, Inc. * author Andy Fleming * diff --git a/drivers/net/phy/lxt.c b/drivers/net/phy/lxt.c index 9abc2a84f9..5942664f1c 100644 --- a/drivers/net/phy/lxt.c +++ b/drivers/net/phy/lxt.c @@ -1,8 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * LXT PHY drivers * - * SPDX-License-Identifier: GPL-2.0+ - * * Copyright 2010-2011 Freescale Semiconductor, Inc. * author Andy Fleming */ diff --git a/drivers/net/phy/marvell.c b/drivers/net/phy/marvell.c index 2932340455..436ff572fe 100644 --- a/drivers/net/phy/marvell.c +++ b/drivers/net/phy/marvell.c @@ -1,8 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Marvell PHY drivers * - * SPDX-License-Identifier: GPL-2.0+ - * * Copyright 2010-2011 Freescale Semiconductor, Inc. * author Andy Fleming */ diff --git a/drivers/net/phy/meson-gxl.c b/drivers/net/phy/meson-gxl.c index 5f4ecb14dc..ffb1a61402 100644 --- a/drivers/net/phy/meson-gxl.c +++ b/drivers/net/phy/meson-gxl.c @@ -1,11 +1,10 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Meson GXL Internal PHY Driver * * Copyright (C) 2015 Amlogic, Inc. All rights reserved. * Copyright (C) 2016 BayLibre, SAS. All rights reserved. * Author: Neil Armstrong <narmstrong@baylibre.com> - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <config.h> #include <common.h> diff --git a/drivers/net/phy/micrel_ksz8xxx.c b/drivers/net/phy/micrel_ksz8xxx.c index 62a4431175..c70c0364b8 100644 --- a/drivers/net/phy/micrel_ksz8xxx.c +++ b/drivers/net/phy/micrel_ksz8xxx.c @@ -1,8 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Micrel PHY drivers * - * SPDX-License-Identifier: GPL-2.0+ - * * Copyright 2010-2011 Freescale Semiconductor, Inc. * author Andy Fleming * (C) 2012 NetModule AG, David Andrey, added KSZ9031 diff --git a/drivers/net/phy/micrel_ksz90x1.c b/drivers/net/phy/micrel_ksz90x1.c index eb83cebbac..5462532be6 100644 --- a/drivers/net/phy/micrel_ksz90x1.c +++ b/drivers/net/phy/micrel_ksz90x1.c @@ -1,8 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Micrel PHY drivers * - * SPDX-License-Identifier: GPL-2.0+ - * * Copyright 2010-2011 Freescale Semiconductor, Inc. * author Andy Fleming * (C) 2012 NetModule AG, David Andrey, added KSZ9031 diff --git a/drivers/net/phy/miiphybb.c b/drivers/net/phy/miiphybb.c index d61722490e..ba97a54c06 100644 --- a/drivers/net/phy/miiphybb.c +++ b/drivers/net/phy/miiphybb.c @@ -1,11 +1,10 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * (C) Copyright 2009 Industrie Dial Face S.p.A. * Luigi 'Comio' Mantellini <luigi.mantellini@idf-hit.com> * * (C) Copyright 2001 * Gerald Van Baren, Custom IDEAS, vanbaren@cideas.com. - * - * SPDX-License-Identifier: GPL-2.0+ */ /* diff --git a/drivers/net/phy/mscc.c b/drivers/net/phy/mscc.c index 439f5e3c5c..6f102f134e 100644 --- a/drivers/net/phy/mscc.c +++ b/drivers/net/phy/mscc.c @@ -1,7 +1,7 @@ +// SPDX-License-Identifier: MIT /* * Microsemi PHY drivers * - * SPDX-License-Identifier: The MIT License (MIT) * * Copyright (c) 2016 Microsemi Corporation * diff --git a/drivers/net/phy/mv88e61xx.c b/drivers/net/phy/mv88e61xx.c index 3d2f6b98ad..17040bd6cc 100644 --- a/drivers/net/phy/mv88e61xx.c +++ b/drivers/net/phy/mv88e61xx.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * (C) Copyright 2015 * Elecsys Corporation <www.elecsyscorp.com> @@ -7,8 +8,6 @@ * (C) Copyright 2009 * Marvell Semiconductor <www.marvell.com> * Prafulla Wadaskar <prafulla@marvell.com> - * - * SPDX-License-Identifier: GPL-2.0+ */ /* diff --git a/drivers/net/phy/mv88e6352.c b/drivers/net/phy/mv88e6352.c index d2b3ce617e..6fe08b80c1 100644 --- a/drivers/net/phy/mv88e6352.c +++ b/drivers/net/phy/mv88e6352.c @@ -1,8 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * (C) Copyright 2012 * Valentin Lontgchamp, Keymile AG, valentin.longchamp@keymile.com - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/drivers/net/phy/natsemi.c b/drivers/net/phy/natsemi.c index 1592e9b7b9..05c7e7c089 100644 --- a/drivers/net/phy/natsemi.c +++ b/drivers/net/phy/natsemi.c @@ -1,8 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * National Semiconductor PHY drivers * - * SPDX-License-Identifier: GPL-2.0+ - * * Copyright 2010-2011 Freescale Semiconductor, Inc. * author Andy Fleming */ diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c index 1d8e81be2d..4e610bf054 100644 --- a/drivers/net/phy/phy.c +++ b/drivers/net/phy/phy.c @@ -1,8 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Generic PHY Management code * - * SPDX-License-Identifier: GPL-2.0+ - * * Copyright 2011 Freescale Semiconductor, Inc. * author Andy Fleming * diff --git a/drivers/net/phy/realtek.c b/drivers/net/phy/realtek.c index d5c2a46c67..b0867af220 100644 --- a/drivers/net/phy/realtek.c +++ b/drivers/net/phy/realtek.c @@ -1,8 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * RealTek PHY drivers * - * SPDX-License-Identifier: GPL-2.0+ - * * Copyright 2010-2011, 2015 Freescale Semiconductor, Inc. * author Andy Fleming * Copyright 2016 Karsten Merker <merker@debian.org> diff --git a/drivers/net/phy/smsc.c b/drivers/net/phy/smsc.c index 73ed144061..2f92957a5a 100644 --- a/drivers/net/phy/smsc.c +++ b/drivers/net/phy/smsc.c @@ -1,8 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * SMSC PHY drivers * - * SPDX-License-Identifier: GPL-2.0+ - * * Base code from drivers/net/phy/davicom.c * Copyright 2010-2011 Freescale Semiconductor, Inc. * author Andy Fleming diff --git a/drivers/net/phy/teranetics.c b/drivers/net/phy/teranetics.c index 93d5ac3d1a..d674e8f857 100644 --- a/drivers/net/phy/teranetics.c +++ b/drivers/net/phy/teranetics.c @@ -1,8 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Teranetics PHY drivers * - * SPDX-License-Identifier: GPL-2.0+ - * * Copyright 2010-2011 Freescale Semiconductor, Inc. * author Andy Fleming */ diff --git a/drivers/net/phy/ti.c b/drivers/net/phy/ti.c index 6ad31a0465..8f3ed8a983 100644 --- a/drivers/net/phy/ti.c +++ b/drivers/net/phy/ti.c @@ -1,8 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0 /* * TI PHY drivers * - * SPDX-License-Identifier: GPL-2.0 - * */ #include <common.h> #include <phy.h> diff --git a/drivers/net/phy/vitesse.c b/drivers/net/phy/vitesse.c index e5e9922b30..9df4a3fae5 100644 --- a/drivers/net/phy/vitesse.c +++ b/drivers/net/phy/vitesse.c @@ -1,10 +1,10 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Vitesse PHY drivers * * Copyright 2010-2014 Freescale Semiconductor, Inc. * Original Author: Andy Fleming * Add vsc8662 phy support - Priyanka Jain - * SPDX-License-Identifier: GPL-2.0+ */ #include <miiphy.h> diff --git a/drivers/net/phy/xilinx_phy.c b/drivers/net/phy/xilinx_phy.c index 7142a99ce5..004cfcf647 100644 --- a/drivers/net/phy/xilinx_phy.c +++ b/drivers/net/phy/xilinx_phy.c @@ -1,9 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Xilinx PCS/PMA Core phy driver * * Copyright (C) 2015 - 2016 Xilinx, Inc. - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <config.h> diff --git a/drivers/net/pic32_eth.c b/drivers/net/pic32_eth.c index 7129372790..5c706c04c5 100644 --- a/drivers/net/pic32_eth.c +++ b/drivers/net/pic32_eth.c @@ -1,8 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * (c) 2015 Purna Chandra Mandal <purna.mandal@microchip.com> * - * SPDX-License-Identifier: GPL-2.0+ - * */ #include <common.h> #include <errno.h> diff --git a/drivers/net/pic32_eth.h b/drivers/net/pic32_eth.h index be2a1872d8..823c565a9b 100644 --- a/drivers/net/pic32_eth.h +++ b/drivers/net/pic32_eth.h @@ -1,8 +1,7 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * (c) 2015 Purna Chandra Mandal <purna.mandal@microchip.com> * - * SPDX-License-Identifier: GPL-2.0+ - * */ #ifndef __MICROCHIP_PIC32_ETH_H_ diff --git a/drivers/net/pic32_mdio.c b/drivers/net/pic32_mdio.c index 6ae5c40fa3..1aa5b1d8da 100644 --- a/drivers/net/pic32_mdio.c +++ b/drivers/net/pic32_mdio.c @@ -1,10 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * pic32_mdio.c: PIC32 MDIO/MII driver, part of pic32_eth.c. * * Copyright 2015 Microchip Inc. * Purna Chandra Mandal <purna.mandal@microchip.com> - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> #include <phy.h> diff --git a/drivers/net/ravb.c b/drivers/net/ravb.c index ae120e59ba..3392e5854d 100644 --- a/drivers/net/ravb.c +++ b/drivers/net/ravb.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * drivers/net/ravb.c * This file is driver for Renesas Ethernet AVB. @@ -5,8 +6,6 @@ * Copyright (C) 2015-2017 Renesas Electronics Corporation * * Based on the SuperH Ethernet driver. - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/drivers/net/rtl8169.c b/drivers/net/rtl8169.c index 5297e300a7..e0e3a6d570 100644 --- a/drivers/net/rtl8169.c +++ b/drivers/net/rtl8169.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * rtl8169.c : U-Boot driver for the RealTek RTL8169 * @@ -11,8 +12,6 @@ * r8169.c: Etherboot device driver for the RealTek RTL-8169 Gigabit * Written 2003 by Timothy Legge <tlegge@rogers.com> * - * SPDX-License-Identifier: GPL-2.0+ -* * Portions of this code based on: * r8169.c: A RealTek RTL-8169 Gigabit Ethernet driver * for Linux kernel 2.4.x. diff --git a/drivers/net/sandbox-raw.c b/drivers/net/sandbox-raw.c index 590ae0c0fc..3f8020f629 100644 --- a/drivers/net/sandbox-raw.c +++ b/drivers/net/sandbox-raw.c @@ -1,10 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0 /* * Copyright (c) 2015 National Instruments * * (C) Copyright 2015 * Joe Hershberger <joe.hershberger@ni.com> - * - * SPDX-License-Identifier: GPL-2.0 */ #include <asm/eth-raw-os.h> diff --git a/drivers/net/sandbox.c b/drivers/net/sandbox.c index 59c57d1c6d..b34712bd06 100644 --- a/drivers/net/sandbox.c +++ b/drivers/net/sandbox.c @@ -1,10 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0 /* * Copyright (c) 2015 National Instruments * * (C) Copyright 2015 * Joe Hershberger <joe.hershberger@ni.com> - * - * SPDX-License-Identifier: GPL-2.0 */ #include <common.h> diff --git a/drivers/net/sh_eth.c b/drivers/net/sh_eth.c index cb3970e051..645cde8e4a 100644 --- a/drivers/net/sh_eth.c +++ b/drivers/net/sh_eth.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * sh_eth.c - Driver for Renesas ethernet controller. * @@ -5,8 +6,6 @@ * Copyright (c) 2008, 2011, 2014 2014 Nobuhiro Iwamatsu * Copyright (c) 2007 Carlos Munoz <carlos@kenati.com> * Copyright (C) 2013, 2014 Renesas Electronics Corporation - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <config.h> diff --git a/drivers/net/sh_eth.h b/drivers/net/sh_eth.h index ea4aa105bc..cd8190062a 100644 --- a/drivers/net/sh_eth.h +++ b/drivers/net/sh_eth.h @@ -1,11 +1,10 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * sh_eth.h - Driver for Renesas SuperH ethernet controller. * * Copyright (C) 2008 - 2012 Renesas Solutions Corp. * Copyright (c) 2008 - 2012 Nobuhiro Iwamatsu * Copyright (c) 2007 Carlos Munoz <carlos@kenati.com> - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <netdev.h> diff --git a/drivers/net/smc91111.c b/drivers/net/smc91111.c index f31216ffa6..5754c3106c 100644 --- a/drivers/net/smc91111.c +++ b/drivers/net/smc91111.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0+ /*------------------------------------------------------------------------ . smc91111.c . This is a driver for SMSC's 91C111 single-chip Ethernet device. @@ -10,7 +11,6 @@ . Developed by Simple Network Magic Corporation (SNMC) . Copyright (C) 1996 by Erik Stahlman (ES) . - * SPDX-License-Identifier: GPL-2.0+ . . Information contained in this file was obtained from the LAN91C111 . manual from SMC. To get a copy, if you really want one, you can find diff --git a/drivers/net/smc91111.h b/drivers/net/smc91111.h index a31f6f6db0..013542770d 100644 --- a/drivers/net/smc91111.h +++ b/drivers/net/smc91111.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /*------------------------------------------------------------------------ . smc91111.h - macros for the LAN91C111 Ethernet Driver . @@ -8,8 +9,6 @@ . Developed by Simple Network Magic Corporation (SNMC) . Copyright (C) 1996 by Erik Stahlman (ES) . - * SPDX-License-Identifier: GPL-2.0+ - . . This file contains register information and access macros for . the LAN91C111 single chip ethernet controller. It is a modified . version of the smc9194.h file. diff --git a/drivers/net/smc911x.c b/drivers/net/smc911x.c index feae8c09cf..257b0385c2 100644 --- a/drivers/net/smc911x.c +++ b/drivers/net/smc911x.c @@ -1,9 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * SMSC LAN9[12]1[567] Network driver * * (c) 2007 Pengutronix, Sascha Hauer <s.hauer@pengutronix.de> - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/drivers/net/smc911x.h b/drivers/net/smc911x.h index acae0cfb88..3145fbde2b 100644 --- a/drivers/net/smc911x.h +++ b/drivers/net/smc911x.h @@ -1,9 +1,8 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * SMSC LAN9[12]1[567] Network driver * * (c) 2007 Pengutronix, Sascha Hauer <s.hauer@pengutronix.de> - * - * SPDX-License-Identifier: GPL-2.0+ */ #ifndef _SMC911X_H_ diff --git a/drivers/net/sun8i_emac.c b/drivers/net/sun8i_emac.c index b6e5dafe83..1f5c630e02 100644 --- a/drivers/net/sun8i_emac.c +++ b/drivers/net/sun8i_emac.c @@ -1,9 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * (C) Copyright 2016 * Author: Amit Singh Tomar, amittomer25@gmail.com * - * SPDX-License-Identifier: GPL-2.0+ - * * Ethernet driver for H3/A64/A83T based SoC's * * It is derived from the work done by diff --git a/drivers/net/sunxi_emac.c b/drivers/net/sunxi_emac.c index 37685f30f3..d20b808c12 100644 --- a/drivers/net/sunxi_emac.c +++ b/drivers/net/sunxi_emac.c @@ -1,9 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * sunxi_emac.c -- Allwinner A10 ethernet driver * * (C) Copyright 2012, Stefan Roese <sr@denx.de> - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/drivers/net/tsec.c b/drivers/net/tsec.c index 6829e32dae..37840420fa 100644 --- a/drivers/net/tsec.c +++ b/drivers/net/tsec.c @@ -1,11 +1,10 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Freescale Three Speed Ethernet Controller driver * * Copyright 2004-2011, 2013 Freescale Semiconductor, Inc. * (C) Copyright 2003, Motorola, Inc. * author Andy Fleming - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <config.h> diff --git a/drivers/net/tsi108_eth.c b/drivers/net/tsi108_eth.c index 9da59a018a..108cf61647 100644 --- a/drivers/net/tsi108_eth.c +++ b/drivers/net/tsi108_eth.c @@ -1,9 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0+ /*********************************************************************** * * Copyright (c) 2005 Freescale Semiconductor, Inc. * - * SPDX-License-Identifier: GPL-2.0+ - * * Description: * Ethernet interface for Tundra TSI108 bridge chip * diff --git a/drivers/net/uli526x.c b/drivers/net/uli526x.c index d05ae9ea0c..c56836641b 100644 --- a/drivers/net/uli526x.c +++ b/drivers/net/uli526x.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright 2007, 2010 Freescale Semiconductor, Inc. * @@ -6,8 +7,6 @@ * Description: * ULI 526x Ethernet port driver. * Based on the Linux driver: drivers/net/tulip/uli526x.c - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/drivers/net/xilinx_axi_emac.c b/drivers/net/xilinx_axi_emac.c index 80ed06ac66..26c21c6d70 100644 --- a/drivers/net/xilinx_axi_emac.c +++ b/drivers/net/xilinx_axi_emac.c @@ -1,9 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (C) 2011 Michal Simek <monstr@monstr.eu> * Copyright (C) 2011 PetaLogix * Copyright (C) 2010 Xilinx, Inc. All rights reserved. - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <config.h> diff --git a/drivers/net/xilinx_emaclite.c b/drivers/net/xilinx_emaclite.c index e3e58aeb83..4b49290f0e 100644 --- a/drivers/net/xilinx_emaclite.c +++ b/drivers/net/xilinx_emaclite.c @@ -1,10 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * (C) Copyright 2007-2009 Michal Simek * (C) Copyright 2003 Xilinx Inc. * * Michal SIMEK <monstr@monstr.eu> - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/drivers/net/zynq_gem.c b/drivers/net/zynq_gem.c index dd36a8c22a..a218c92314 100644 --- a/drivers/net/zynq_gem.c +++ b/drivers/net/zynq_gem.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * (C) Copyright 2011 Michal Simek * @@ -5,8 +6,6 @@ * * Based on Xilinx gmac driver: * (C) Copyright 2011 Xilinx - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <clk.h> |