From 83d290c56fab2d38cd1ab4c4cc7099559c1d5046 Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Sun, 6 May 2018 17:58:06 -0400 Subject: 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 --- board/quipos/cairo/Makefile | 4 +--- board/quipos/cairo/cairo.c | 3 +-- board/quipos/cairo/cairo.h | 3 +-- 3 files changed, 3 insertions(+), 7 deletions(-) (limited to 'board/quipos') diff --git a/board/quipos/cairo/Makefile b/board/quipos/cairo/Makefile index 445088f27bd..ec2c83cc890 100644 --- a/board/quipos/cairo/Makefile +++ b/board/quipos/cairo/Makefile @@ -1,8 +1,6 @@ +# SPDX-License-Identifier: GPL-2.0+ # # (C) Copyright 2014 DENX Software Engineering # Written-By: Albert ARIBAUD -# -# SPDX-License-Identifier: GPL-2.0+ -# obj-y := cairo.o diff --git a/board/quipos/cairo/cairo.c b/board/quipos/cairo/cairo.c index 6cf54095f54..8999542a7dd 100644 --- a/board/quipos/cairo/cairo.c +++ b/board/quipos/cairo/cairo.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (c) 2014 DENX * Written-by: Albert ARIBAUD @@ -7,8 +8,6 @@ * Itself derived from Beagle Board and 3430 SDP code by * Richard Woodruff * Syed Mohammed Khasim - * - * SPDX-License-Identifier: GPL-2.0+ */ #include #include diff --git a/board/quipos/cairo/cairo.h b/board/quipos/cairo/cairo.h index 50734d01041..f57a6081d82 100644 --- a/board/quipos/cairo/cairo.h +++ b/board/quipos/cairo/cairo.h @@ -1,11 +1,10 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * Copyright (C) DENX * Written-by: Albert ARIBAUD * * Original code (C) Copyright 2010 * Robert Aigner (ra@spiid.net) - * - * SPDX-License-Identifier: GPL-2.0+ */ #ifndef _EVM_H_ #define _EVM_H_ -- cgit v1.2.3