summaryrefslogtreecommitdiff
path: root/drivers/net/fm
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2018-05-06 17:58:06 -0400
committerTom Rini <trini@konsulko.com>2018-05-07 09:34:12 -0400
commit83d290c56fab2d38cd1ab4c4cc7099559c1d5046 (patch)
tree5e5d1b40b52aaf96b707e0da2474573306d22f7b /drivers/net/fm
parent7ce85318cfff5fd82a059131761559cba7fef309 (diff)
downloadu-boot-83d290c56fab2d38cd1ab4c4cc7099559c1d5046.tar.gz
SPDX: Convert all of our single license tags to Linux Kernel style
When U-Boot started using SPDX tags we were among the early adopters and there weren't a lot of other examples to borrow from. So we picked the area of the file that usually had a full license text and replaced it with an appropriate SPDX-License-Identifier: entry. Since then, the Linux Kernel has adopted SPDX tags and they place it as the very first line in a file (except where shebangs are used, then it's second line) and with slightly different comment styles than us. In part due to community overlap, in part due to better tag visibility and in part for other minor reasons, switch over to that style. This commit changes all instances where we have a single declared license in the tag as both the before and after are identical in tag contents. There's also a few places where I found we did not have a tag and have introduced one. Signed-off-by: Tom Rini <trini@konsulko.com>
Diffstat (limited to 'drivers/net/fm')
-rw-r--r--drivers/net/fm/Makefile4
-rw-r--r--drivers/net/fm/b4860.c3
-rw-r--r--drivers/net/fm/dtsec.c3
-rw-r--r--drivers/net/fm/eth.c3
-rw-r--r--drivers/net/fm/fdt.c3
-rw-r--r--drivers/net/fm/fm.c3
-rw-r--r--drivers/net/fm/fm.h3
-rw-r--r--drivers/net/fm/init.c3
-rw-r--r--drivers/net/fm/ls1043.c3
-rw-r--r--drivers/net/fm/ls1046.c3
-rw-r--r--drivers/net/fm/memac.c3
-rw-r--r--drivers/net/fm/memac_phy.c3
-rw-r--r--drivers/net/fm/p1023.c3
-rw-r--r--drivers/net/fm/p4080.c3
-rw-r--r--drivers/net/fm/p5020.c3
-rw-r--r--drivers/net/fm/p5040.c3
-rw-r--r--drivers/net/fm/t1024.c3
-rw-r--r--drivers/net/fm/t1040.c3
-rw-r--r--drivers/net/fm/t2080.c3
-rw-r--r--drivers/net/fm/t4240.c3
-rw-r--r--drivers/net/fm/tgec.c3
-rw-r--r--drivers/net/fm/tgec_phy.c3
22 files changed, 22 insertions, 45 deletions
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>
View Lorry Controller Status