summaryrefslogtreecommitdiff
path: root/board/google
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 /board/google
parent7ce85318cfff5fd82a059131761559cba7fef309 (diff)
SPDX: Convert all of our single license tags to Linux Kernel style
When U-Boot started using SPDX tags we were among the early adopters and there weren't a lot of other examples to borrow from. So we picked the area of the file that usually had a full license text and replaced it with an appropriate SPDX-License-Identifier: entry. Since then, the Linux Kernel has adopted SPDX tags and they place it as the very first line in a file (except where shebangs are used, then it's second line) and with slightly different comment styles than us. In part due to community overlap, in part due to better tag visibility and in part for other minor reasons, switch over to that style. This commit changes all instances where we have a single declared license in the tag as both the before and after are identical in tag contents. There's also a few places where I found we did not have a tag and have introduced one. Signed-off-by: Tom Rini <trini@konsulko.com>
Diffstat (limited to 'board/google')
-rw-r--r--board/google/Kconfig4
-rw-r--r--board/google/chromebook_link/Makefile4
-rw-r--r--board/google/chromebook_link/link.c3
-rw-r--r--board/google/chromebook_samus/Makefile4
-rw-r--r--board/google/chromebook_samus/samus.c3
-rw-r--r--board/google/chromebox_panther/Makefile4
-rw-r--r--board/google/chromebox_panther/panther.c3
-rw-r--r--board/google/common/Makefile4
-rw-r--r--board/google/common/early_init.S3
-rw-r--r--board/google/veyron/veyron.c3
10 files changed, 10 insertions, 25 deletions
diff --git a/board/google/Kconfig b/board/google/Kconfig
index 766db1b449..d98a5e818f 100644
--- a/board/google/Kconfig
+++ b/board/google/Kconfig
@@ -1,8 +1,6 @@
+# SPDX-License-Identifier: GPL-2.0+
#
# Copyright (C) 2015, Bin Meng <bmeng.cn@gmail.com>
-#
-# SPDX-License-Identifier: GPL-2.0+
-#
if VENDOR_GOOGLE
diff --git a/board/google/chromebook_link/Makefile b/board/google/chromebook_link/Makefile
index a133c2e894..d84a84899d 100644
--- a/board/google/chromebook_link/Makefile
+++ b/board/google/chromebook_link/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0+
#
# Copyright (c) 2011 The Chromium OS Authors.
# (C) Copyright 2008
@@ -8,8 +9,5 @@
#
# (C) Copyright 2002
# Daniel Engström, Omicron Ceti AB, daniel@omicron.se.
-#
-# SPDX-License-Identifier: GPL-2.0+
-#
obj-y += link.o
diff --git a/board/google/chromebook_link/link.c b/board/google/chromebook_link/link.c
index dc22592095..e357e6218e 100644
--- a/board/google/chromebook_link/link.c
+++ b/board/google/chromebook_link/link.c
@@ -1,7 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0+
/*
* Copyright (C) 2014 Google, Inc
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#include <common.h>
diff --git a/board/google/chromebook_samus/Makefile b/board/google/chromebook_samus/Makefile
index 152228678b..68c9e4993d 100644
--- a/board/google/chromebook_samus/Makefile
+++ b/board/google/chromebook_samus/Makefile
@@ -1,7 +1,5 @@
+# SPDX-License-Identifier: GPL-2.0+
#
# Copyright (c) 2016 Google, Inc
-#
-# SPDX-License-Identifier: GPL-2.0+
-#
obj-y += samus.o
diff --git a/board/google/chromebook_samus/samus.c b/board/google/chromebook_samus/samus.c
index 5b5eb19ee8..83edf89106 100644
--- a/board/google/chromebook_samus/samus.c
+++ b/board/google/chromebook_samus/samus.c
@@ -1,7 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0+
/*
* Copyright (C) 2016 Google, Inc
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#include <common.h>
diff --git a/board/google/chromebox_panther/Makefile b/board/google/chromebox_panther/Makefile
index ce8820f73f..1a5518f134 100644
--- a/board/google/chromebox_panther/Makefile
+++ b/board/google/chromebox_panther/Makefile
@@ -1,7 +1,5 @@
+# SPDX-License-Identifier: GPL-2.0+
#
# Copyright (c) 2015 Google, Inc
-#
-# SPDX-License-Identifier: GPL-2.0+
-#
obj-y += panther.o
diff --git a/board/google/chromebox_panther/panther.c b/board/google/chromebox_panther/panther.c
index 2adc202be0..da3445bb1d 100644
--- a/board/google/chromebox_panther/panther.c
+++ b/board/google/chromebox_panther/panther.c
@@ -1,7 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0+
/*
* Copyright (C) 2015 Google, Inc
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#include <common.h>
diff --git a/board/google/common/Makefile b/board/google/common/Makefile
index 2de2799fbb..d1f45c677a 100644
--- a/board/google/common/Makefile
+++ b/board/google/common/Makefile
@@ -1,7 +1,5 @@
+# SPDX-License-Identifier: GPL-2.0+
#
# Copyright (c) 2014 Google, Inc
-#
-# SPDX-License-Identifier: GPL-2.0+
-#
obj-$(CONFIG_X86) += early_init.o
diff --git a/board/google/common/early_init.S b/board/google/common/early_init.S
index 7017185d06..6ac64b3388 100644
--- a/board/google/common/early_init.S
+++ b/board/google/common/early_init.S
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (c) 2014 Google, Inc
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
.globl early_board_init
diff --git a/board/google/veyron/veyron.c b/board/google/veyron/veyron.c
index 20297e1c0f..19edb18a66 100644
--- a/board/google/veyron/veyron.c
+++ b/board/google/veyron/veyron.c
@@ -1,7 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0+
/*
* (C) Copyright 2015 Google, Inc
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#include <common.h>