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 /board/armadeus | |
parent | 7ce85318cfff5fd82a059131761559cba7fef309 (diff) | |
download | u-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 'board/armadeus')
-rw-r--r-- | board/armadeus/apf27/apf27.c | 3 | ||||
-rw-r--r-- | board/armadeus/apf27/apf27.h | 3 | ||||
-rw-r--r-- | board/armadeus/apf27/fpga.c | 3 | ||||
-rw-r--r-- | board/armadeus/apf27/fpga.h | 3 | ||||
-rw-r--r-- | board/armadeus/apf27/lowlevel_init.S | 3 | ||||
-rw-r--r-- | board/armadeus/opos6uldev/Makefile | 4 | ||||
-rw-r--r-- | board/armadeus/opos6uldev/board.c | 3 |
7 files changed, 7 insertions, 15 deletions
diff --git a/board/armadeus/apf27/apf27.c b/board/armadeus/apf27/apf27.c index 1abfe88949..0f0c8a4a97 100644 --- a/board/armadeus/apf27/apf27.c +++ b/board/armadeus/apf27/apf27.c @@ -1,10 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (C) 2008-2013 Eric Jarrige <eric.jarrige@armadeus.org> * * based on the files by * Sascha Hauer, Pengutronix - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/board/armadeus/apf27/apf27.h b/board/armadeus/apf27/apf27.h index 64e7e4dfbb..9c3cfd3cf4 100644 --- a/board/armadeus/apf27/apf27.h +++ b/board/armadeus/apf27/apf27.h @@ -1,7 +1,6 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * Copyright (C) 2008-2013 Eric Jarrige <eric.jarrige@armadeus.org> - * - * SPDX-License-Identifier: GPL-2.0+ */ #ifndef __APF27_H diff --git a/board/armadeus/apf27/fpga.c b/board/armadeus/apf27/fpga.c index 65a4812c35..e9af8ddd01 100644 --- a/board/armadeus/apf27/fpga.c +++ b/board/armadeus/apf27/fpga.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * (C) Copyright 2002-2013 * Eric Jarrige <eric.jarrige@armadeus.org> @@ -6,8 +7,6 @@ * Rich Ireland, Enterasys Networks, rireland@enterasys.com * and * Keith Outwater, keith_outwater@mvis.com - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/board/armadeus/apf27/fpga.h b/board/armadeus/apf27/fpga.h index 84a5244a6d..d6394e976a 100644 --- a/board/armadeus/apf27/fpga.h +++ b/board/armadeus/apf27/fpga.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * (C) Copyright 2002-2013 * Eric Jarrige <eric.jarrige@armadeus.org> @@ -6,8 +7,6 @@ * Rich Ireland, Enterasys Networks, rireland@enterasys.com * and * Keith Outwater, keith_outwater@mvis.com - * - * SPDX-License-Identifier: GPL-2.0+ */ extern void APF27_init_fpga(void); diff --git a/board/armadeus/apf27/lowlevel_init.S b/board/armadeus/apf27/lowlevel_init.S index 2f795e460a..0991b7ddf4 100644 --- a/board/armadeus/apf27/lowlevel_init.S +++ b/board/armadeus/apf27/lowlevel_init.S @@ -1,7 +1,6 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * (C) Copyright 2013 Philippe Reynes <tremyfr@yahoo.fr> - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <config.h> diff --git a/board/armadeus/opos6uldev/Makefile b/board/armadeus/opos6uldev/Makefile index fd14fd75a6..cff8eb267c 100644 --- a/board/armadeus/opos6uldev/Makefile +++ b/board/armadeus/opos6uldev/Makefile @@ -1,6 +1,4 @@ +# SPDX-License-Identifier: GPL-2.0+ # (C) Copyright 2017 Armadeus Systems -# -# SPDX-License-Identifier: GPL-2.0+ -# obj-y := board.o diff --git a/board/armadeus/opos6uldev/board.c b/board/armadeus/opos6uldev/board.c index 0679acd832..4faa997126 100644 --- a/board/armadeus/opos6uldev/board.c +++ b/board/armadeus/opos6uldev/board.c @@ -1,7 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (C) 2018 Armadeus Systems - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <asm/arch/clock.h> |