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>
diff --git a/drivers/net/phy/Makefile b/drivers/net/phy/Makefile
index f198037..555da83 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 6678147..fe81217 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 d7e76de..79f68af 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 f7f2d9f..30c4812 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 e4afa90..202e3dd 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 9cb3a52c..9b60d1a 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 0a6e410..27c7788 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 2fe0132..c243c5b 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 e8e9099..0ae0edd 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 ed3dcd9..1024d7d 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 9abc2a8..5942664 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 2932340..436ff57 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 5f4ecb1..ffb1a61 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 62a4431..c70c036 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 eb83ceb..5462532 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 d617224..ba97a54 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 439f5e3..6f102f1 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 3d2f6b9..17040bd 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 d2b3ce6..6fe08b8 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 1592e9b..05c7e7c 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 1d8e81b..4e610bf 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 d5c2a46..b0867af 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 73ed144..2f92957 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 93d5ac3..d674e8f 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 6ad31a0..8f3ed8a 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 e5e9922..9df4a3f 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 7142a99..004cfcf 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>