diff options
| author | Tom Rini <trini@konsulko.com> | 2018-05-07 00:58:06 +0300 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2018-05-07 16:34:12 +0300 |
| commit | 83d290c56fab2d38cd1ab4c4cc7099559c1d5046 (patch) | |
| tree | 5e5d1b40b52aaf96b707e0da2474573306d22f7b /board/Marvell | |
| parent | 7ce85318cfff5fd82a059131761559cba7fef309 (diff) | |
| download | u-boot-83d290c56fab2d38cd1ab4c4cc7099559c1d5046.tar.xz | |
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/Marvell')
32 files changed, 32 insertions, 80 deletions
diff --git a/board/Marvell/aspenite/Makefile b/board/Marvell/aspenite/Makefile index 726d0e43d5..f67a978a12 100644 --- a/board/Marvell/aspenite/Makefile +++ b/board/Marvell/aspenite/Makefile @@ -1,10 +1,8 @@ +# SPDX-License-Identifier: GPL-2.0+ # # (C) Copyright 2010 # Marvell Semiconductor <www.marvell.com> # Written-by: Prafulla Wadaskar <prafulla@marvell.com> # Contributor: Mahavir Jain <mjain@marvell.com> -# -# SPDX-License-Identifier: GPL-2.0+ -# obj-y := aspenite.o diff --git a/board/Marvell/aspenite/aspenite.c b/board/Marvell/aspenite/aspenite.c index 0ef63b7b7c..c4e506ff3b 100644 --- a/board/Marvell/aspenite/aspenite.c +++ b/board/Marvell/aspenite/aspenite.c @@ -1,10 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * (C) Copyright 2010 * Marvell Semiconductor <www.marvell.com> * Written-by: Prafulla Wadaskar <prafulla@marvell.com> * Contributor: Mahavir Jain <mjain@marvell.com> - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/board/Marvell/db-88f6720/Makefile b/board/Marvell/db-88f6720/Makefile index 7a5b51260d..6c633132dd 100644 --- a/board/Marvell/db-88f6720/Makefile +++ b/board/Marvell/db-88f6720/Makefile @@ -1,7 +1,5 @@ +# SPDX-License-Identifier: GPL-2.0+ # # Copyright (C) 2016 Stefan Roese <sr@denx.de> -# -# SPDX-License-Identifier: GPL-2.0+ -# obj-y := db-88f6720.o diff --git a/board/Marvell/db-88f6720/db-88f6720.c b/board/Marvell/db-88f6720/db-88f6720.c index b6e00f35dd..94306b3d8e 100644 --- a/board/Marvell/db-88f6720/db-88f6720.c +++ b/board/Marvell/db-88f6720/db-88f6720.c @@ -1,7 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (C) 2016 Stefan Roese <sr@denx.de> - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/board/Marvell/db-88f6820-amc/Makefile b/board/Marvell/db-88f6820-amc/Makefile index 79e1a75f4c..99bdf1a2c7 100644 --- a/board/Marvell/db-88f6820-amc/Makefile +++ b/board/Marvell/db-88f6820-amc/Makefile @@ -1,7 +1,5 @@ +# SPDX-License-Identifier: GPL-2.0+ # # Copyright (C) 2015 Stefan Roese <sr@denx.de> -# -# SPDX-License-Identifier: GPL-2.0+ -# obj-y := db-88f6820-amc.o diff --git a/board/Marvell/db-88f6820-amc/db-88f6820-amc.c b/board/Marvell/db-88f6820-amc/db-88f6820-amc.c index 7db0095f75..ba9738c0f7 100644 --- a/board/Marvell/db-88f6820-amc/db-88f6820-amc.c +++ b/board/Marvell/db-88f6820-amc/db-88f6820-amc.c @@ -1,7 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (C) 2015 Stefan Roese <sr@denx.de> - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/board/Marvell/db-88f6820-gp/Makefile b/board/Marvell/db-88f6820-gp/Makefile index 58d40dd6cc..afc9648510 100644 --- a/board/Marvell/db-88f6820-gp/Makefile +++ b/board/Marvell/db-88f6820-gp/Makefile @@ -1,7 +1,5 @@ +# SPDX-License-Identifier: GPL-2.0+ # # Copyright (C) 2015 Stefan Roese <sr@denx.de> -# -# SPDX-License-Identifier: GPL-2.0+ -# obj-y := db-88f6820-gp.o diff --git a/board/Marvell/db-88f6820-gp/db-88f6820-gp.c b/board/Marvell/db-88f6820-gp/db-88f6820-gp.c index b95cd1d4aa..fc405b939b 100644 --- a/board/Marvell/db-88f6820-gp/db-88f6820-gp.c +++ b/board/Marvell/db-88f6820-gp/db-88f6820-gp.c @@ -1,7 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (C) 2015 Stefan Roese <sr@denx.de> - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/board/Marvell/db-mv784mp-gp/Makefile b/board/Marvell/db-mv784mp-gp/Makefile index 8f5a7fb6cb..1bd2388afb 100644 --- a/board/Marvell/db-mv784mp-gp/Makefile +++ b/board/Marvell/db-mv784mp-gp/Makefile @@ -1,7 +1,5 @@ +# SPDX-License-Identifier: GPL-2.0+ # # Copyright (C) 2014 Stefan Roese <sr@denx.de> -# -# SPDX-License-Identifier: GPL-2.0+ -# obj-y := db-mv784mp-gp.o diff --git a/board/Marvell/db-mv784mp-gp/db-mv784mp-gp.c b/board/Marvell/db-mv784mp-gp/db-mv784mp-gp.c index 9305284117..604e8c1670 100644 --- a/board/Marvell/db-mv784mp-gp/db-mv784mp-gp.c +++ b/board/Marvell/db-mv784mp-gp/db-mv784mp-gp.c @@ -1,7 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (C) 2014 Stefan Roese <sr@denx.de> - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/board/Marvell/dreamplug/Makefile b/board/Marvell/dreamplug/Makefile index 23e6c53184..e239d591b7 100644 --- a/board/Marvell/dreamplug/Makefile +++ b/board/Marvell/dreamplug/Makefile @@ -1,3 +1,4 @@ +# SPDX-License-Identifier: GPL-2.0+ # # (C) Copyright 2011 # Jason Cooper <u-boot@lakedaemon.net> @@ -5,8 +6,5 @@ # Based on work by: # Marvell Semiconductor <www.marvell.com> # Written-by: Siddarth Gore <gores@marvell.com> -# -# SPDX-License-Identifier: GPL-2.0+ -# obj-y := dreamplug.o diff --git a/board/Marvell/dreamplug/dreamplug.c b/board/Marvell/dreamplug/dreamplug.c index 0887d92c29..ede168c9ec 100644 --- a/board/Marvell/dreamplug/dreamplug.c +++ b/board/Marvell/dreamplug/dreamplug.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * (C) Copyright 2011 * Jason Cooper <u-boot@lakedaemon.net> @@ -5,8 +6,6 @@ * Based on work by: * Marvell Semiconductor <www.marvell.com> * Written-by: Siddarth Gore <gores@marvell.com> - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/board/Marvell/dreamplug/dreamplug.h b/board/Marvell/dreamplug/dreamplug.h index 18ea41cba7..6f62238985 100644 --- a/board/Marvell/dreamplug/dreamplug.h +++ b/board/Marvell/dreamplug/dreamplug.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * (C) Copyright 2011 * Jason Cooper <u-boot@lakedaemon.net> @@ -5,8 +6,6 @@ * Based on work by: * Marvell Semiconductor <www.marvell.com> * Written-by: Siddarth Gore <gores@marvell.com> - * - * SPDX-License-Identifier: GPL-2.0+ */ #ifndef __DREAMPLUG_H diff --git a/board/Marvell/dreamplug/kwbimage.cfg b/board/Marvell/dreamplug/kwbimage.cfg index 19d77e3a1f..f916208c19 100644 --- a/board/Marvell/dreamplug/kwbimage.cfg +++ b/board/Marvell/dreamplug/kwbimage.cfg @@ -1,3 +1,4 @@ +# SPDX-License-Identifier: GPL-2.0+ # # (C) Copyright 2011 # Jason Cooper <u-boot@lakedaemon.net> @@ -5,9 +6,6 @@ # Based on work by: # Marvell Semiconductor <www.marvell.com> # Written-by: Siddarth Gore <gores@marvell.com> -# -# SPDX-License-Identifier: GPL-2.0+ -# # Refer doc/README.kwbimage for more details about how-to configure # and create kirkwood boot image # diff --git a/board/Marvell/gplugd/Makefile b/board/Marvell/gplugd/Makefile index 8929da5be2..6161bf1c84 100644 --- a/board/Marvell/gplugd/Makefile +++ b/board/Marvell/gplugd/Makefile @@ -1,3 +1,4 @@ +# SPDX-License-Identifier: GPL-2.0+ # # (C) Copyright 2011 # eInfochips Ltd. <www.einfochips.com> @@ -8,8 +9,5 @@ # Marvell Semiconductor <www.marvell.com> # Written-by: Prafulla Wadaskar <prafulla@marvell.com> # Contributor: Mahavir Jain <mjain@marvell.com> -# -# SPDX-License-Identifier: GPL-2.0+ -# obj-y := gplugd.o diff --git a/board/Marvell/gplugd/gplugd.c b/board/Marvell/gplugd/gplugd.c index 05ce98bb61..fc2bc85f00 100644 --- a/board/Marvell/gplugd/gplugd.c +++ b/board/Marvell/gplugd/gplugd.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * (C) Copyright 2011 * eInfochips Ltd. <www.einfochips.com> @@ -8,8 +9,6 @@ * Marvell Semiconductor <www.marvell.com> * Written-by: Prafulla Wadaskar <prafulla@marvell.com> * Contributor: Mahavir Jain <mjain@marvell.com> - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/board/Marvell/guruplug/Makefile b/board/Marvell/guruplug/Makefile index 974497a334..b0dfc0cd6d 100644 --- a/board/Marvell/guruplug/Makefile +++ b/board/Marvell/guruplug/Makefile @@ -1,9 +1,7 @@ +# SPDX-License-Identifier: GPL-2.0+ # # (C) Copyright 2009 # Marvell Semiconductor <www.marvell.com> # Written-by: Siddarth Gore <gores@marvell.com> -# -# SPDX-License-Identifier: GPL-2.0+ -# obj-y := guruplug.o diff --git a/board/Marvell/guruplug/guruplug.c b/board/Marvell/guruplug/guruplug.c index af0c491632..466f85eb08 100644 --- a/board/Marvell/guruplug/guruplug.c +++ b/board/Marvell/guruplug/guruplug.c @@ -1,9 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * (C) Copyright 2009 * Marvell Semiconductor <www.marvell.com> * Written-by: Siddarth Gore <gores@marvell.com> - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/board/Marvell/guruplug/guruplug.h b/board/Marvell/guruplug/guruplug.h index 688d950202..a702366813 100644 --- a/board/Marvell/guruplug/guruplug.h +++ b/board/Marvell/guruplug/guruplug.h @@ -1,9 +1,8 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * (C) Copyright 2009 * Marvell Semiconductor <www.marvell.com> * Written-by: Siddarth Gore <gores@marvell.com> - * - * SPDX-License-Identifier: GPL-2.0+ */ #ifndef __GURUPLUG_H diff --git a/board/Marvell/guruplug/kwbimage.cfg b/board/Marvell/guruplug/kwbimage.cfg index 865942ac53..8a0d752c91 100644 --- a/board/Marvell/guruplug/kwbimage.cfg +++ b/board/Marvell/guruplug/kwbimage.cfg @@ -1,10 +1,8 @@ +# SPDX-License-Identifier: GPL-2.0+ # # (C) Copyright 2009 # Marvell Semiconductor <www.marvell.com> # Written-by: Siddarth Gore <gores@marvell.com> -# -# SPDX-License-Identifier: GPL-2.0+ -# # Refer doc/README.kwbimage for more details about how-to configure # and create kirkwood boot image # diff --git a/board/Marvell/mvebu_armada-37xx/Makefile b/board/Marvell/mvebu_armada-37xx/Makefile index ed39738816..27221557c7 100644 --- a/board/Marvell/mvebu_armada-37xx/Makefile +++ b/board/Marvell/mvebu_armada-37xx/Makefile @@ -1,7 +1,5 @@ +# SPDX-License-Identifier: GPL-2.0+ # # Copyright (C) 2016 Stefan Roese <sr@denx.de> -# -# SPDX-License-Identifier: GPL-2.0+ -# obj-y := board.o diff --git a/board/Marvell/mvebu_armada-37xx/board.c b/board/Marvell/mvebu_armada-37xx/board.c index e20539624b..bef4e1767c 100644 --- a/board/Marvell/mvebu_armada-37xx/board.c +++ b/board/Marvell/mvebu_armada-37xx/board.c @@ -1,7 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (C) 2016 Stefan Roese <sr@denx.de> - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/board/Marvell/mvebu_armada-8k/Makefile b/board/Marvell/mvebu_armada-8k/Makefile index ed39738816..27221557c7 100644 --- a/board/Marvell/mvebu_armada-8k/Makefile +++ b/board/Marvell/mvebu_armada-8k/Makefile @@ -1,7 +1,5 @@ +# SPDX-License-Identifier: GPL-2.0+ # # Copyright (C) 2016 Stefan Roese <sr@denx.de> -# -# SPDX-License-Identifier: GPL-2.0+ -# obj-y := board.o diff --git a/board/Marvell/mvebu_armada-8k/board.c b/board/Marvell/mvebu_armada-8k/board.c index f4eabfb14f..e927e338ea 100644 --- a/board/Marvell/mvebu_armada-8k/board.c +++ b/board/Marvell/mvebu_armada-8k/board.c @@ -1,7 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (C) 2016 Stefan Roese <sr@denx.de> - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/board/Marvell/openrd/Makefile b/board/Marvell/openrd/Makefile index 8f95b7922e..ecebb421f7 100644 --- a/board/Marvell/openrd/Makefile +++ b/board/Marvell/openrd/Makefile @@ -1,3 +1,4 @@ +# SPDX-License-Identifier: GPL-2.0+ # # (C) Copyright 2009 # Net Insight <www.netinsight.net> @@ -7,8 +8,5 @@ # (C) Copyright 2009 # Marvell Semiconductor <www.marvell.com> # Written-by: Prafulla Wadaskar <prafulla@marvell.com> -# -# SPDX-License-Identifier: GPL-2.0+ -# obj-y := openrd.o diff --git a/board/Marvell/openrd/kwbimage.cfg b/board/Marvell/openrd/kwbimage.cfg index 8e5993715e..356fd46f93 100644 --- a/board/Marvell/openrd/kwbimage.cfg +++ b/board/Marvell/openrd/kwbimage.cfg @@ -1,10 +1,8 @@ +# SPDX-License-Identifier: GPL-2.0+ # # (C) Copyright 2009 # Marvell Semiconductor <www.marvell.com> # Written-by: Prafulla Wadaskar <prafulla@marvell.com> -# -# SPDX-License-Identifier: GPL-2.0+ -# # Refer doc/README.kwbimage for more details about how-to configure # and create kirkwood boot image # diff --git a/board/Marvell/openrd/openrd.c b/board/Marvell/openrd/openrd.c index f6cffc8cbb..a4923ce971 100644 --- a/board/Marvell/openrd/openrd.c +++ b/board/Marvell/openrd/openrd.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * (C) Copyright 2009 * Net Insight <www.netinsight.net> @@ -7,8 +8,6 @@ * (C) Copyright 2009 * Marvell Semiconductor <www.marvell.com> * Written-by: Prafulla Wadaskar <prafulla@marvell.com> - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/board/Marvell/openrd/openrd.h b/board/Marvell/openrd/openrd.h index 56dfeea1a8..ade8d27392 100644 --- a/board/Marvell/openrd/openrd.h +++ b/board/Marvell/openrd/openrd.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * (C) Copyright 2009 * Net Insight <www.netinsight.net> @@ -7,8 +8,6 @@ * (C) Copyright 2009 * Marvell Semiconductor <www.marvell.com> * Written-by: Prafulla Wadaskar <prafulla@marvell.com> - * - * SPDX-License-Identifier: GPL-2.0+ */ #ifndef __OPENRD_BASE_H diff --git a/board/Marvell/sheevaplug/Makefile b/board/Marvell/sheevaplug/Makefile index e812545837..c39dd03e2d 100644 --- a/board/Marvell/sheevaplug/Makefile +++ b/board/Marvell/sheevaplug/Makefile @@ -1,9 +1,7 @@ +# SPDX-License-Identifier: GPL-2.0+ # # (C) Copyright 2009 # Marvell Semiconductor <www.marvell.com> # Written-by: Prafulla Wadaskar <prafulla@marvell.com> -# -# SPDX-License-Identifier: GPL-2.0+ -# obj-y := sheevaplug.o diff --git a/board/Marvell/sheevaplug/kwbimage.cfg b/board/Marvell/sheevaplug/kwbimage.cfg index 76b7528462..f5206451da 100644 --- a/board/Marvell/sheevaplug/kwbimage.cfg +++ b/board/Marvell/sheevaplug/kwbimage.cfg @@ -1,10 +1,8 @@ +# SPDX-License-Identifier: GPL-2.0+ # # (C) Copyright 2009 # Marvell Semiconductor <www.marvell.com> # Written-by: Prafulla Wadaskar <prafulla@marvell.com> -# -# SPDX-License-Identifier: GPL-2.0+ -# # Refer to doc/README.kwbimage for more details about how-to # configure and create kirkwood boot images. # diff --git a/board/Marvell/sheevaplug/sheevaplug.c b/board/Marvell/sheevaplug/sheevaplug.c index c7dfaa276c..79999c7d30 100644 --- a/board/Marvell/sheevaplug/sheevaplug.c +++ b/board/Marvell/sheevaplug/sheevaplug.c @@ -1,9 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * (C) Copyright 2009 * Marvell Semiconductor <www.marvell.com> * Written-by: Prafulla Wadaskar <prafulla@marvell.com> - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/board/Marvell/sheevaplug/sheevaplug.h b/board/Marvell/sheevaplug/sheevaplug.h index 8517b99eaf..e026c1b53b 100644 --- a/board/Marvell/sheevaplug/sheevaplug.h +++ b/board/Marvell/sheevaplug/sheevaplug.h @@ -1,9 +1,8 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * (C) Copyright 2009 * Marvell Semiconductor <www.marvell.com> * Written-by: Prafulla Wadaskar <prafulla@marvell.com> - * - * SPDX-License-Identifier: GPL-2.0+ */ #ifndef __SHEEVAPLUG_H |