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/work-microwave/work_92105/Makefile | 4 +--- board/work-microwave/work_92105/work_92105.c | 3 +-- board/work-microwave/work_92105/work_92105_display.c | 3 +-- board/work-microwave/work_92105/work_92105_display.h | 3 +-- board/work-microwave/work_92105/work_92105_spl.c | 3 +-- 5 files changed, 5 insertions(+), 11 deletions(-) (limited to 'board/work-microwave') diff --git a/board/work-microwave/work_92105/Makefile b/board/work-microwave/work_92105/Makefile index e26c6737ee..e3803bb043 100644 --- a/board/work-microwave/work_92105/Makefile +++ b/board/work-microwave/work_92105/Makefile @@ -1,9 +1,7 @@ +# SPDX-License-Identifier: GPL-2.0+ # # (C) Copyright 2014 DENX Software Engineering GmbH # Written-by: Albert ARIBAUD -# -# SPDX-License-Identifier: GPL-2.0+ -# ifdef CONFIG_SPL_BUILD obj-y += work_92105_spl.o diff --git a/board/work-microwave/work_92105/work_92105.c b/board/work-microwave/work_92105/work_92105.c index f782284d60..eb2e7d7eb8 100644 --- a/board/work-microwave/work_92105/work_92105.c +++ b/board/work-microwave/work_92105/work_92105.c @@ -1,10 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * WORK Microwave work_92105 board support * * (C) Copyright 2014 DENX Software Engineering GmbH * Written-by: Albert ARIBAUD - * - * SPDX-License-Identifier: GPL-2.0+ */ #include diff --git a/board/work-microwave/work_92105/work_92105_display.c b/board/work-microwave/work_92105/work_92105_display.c index c997cea6f0..ffa0fcfa87 100644 --- a/board/work-microwave/work_92105/work_92105_display.c +++ b/board/work-microwave/work_92105/work_92105_display.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * work_92105 display support * @@ -7,8 +8,6 @@ * The work_92105 display is a HD44780-compatible module * controlled through a MAX6957AAX SPI port expander, two * MAX518 I2C DACs and native LPC32xx GPO 15. - * - * SPDX-License-Identifier: GPL-2.0+ */ #include diff --git a/board/work-microwave/work_92105/work_92105_display.h b/board/work-microwave/work_92105/work_92105_display.h index dd6e768eaf..17a9aa04e0 100644 --- a/board/work-microwave/work_92105/work_92105_display.h +++ b/board/work-microwave/work_92105/work_92105_display.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * work_92105 display support interface * @@ -7,8 +8,6 @@ * The work_92105 display is a HD44780-compatible module * controlled through a MAX6957AAX SPI port expander, two * MAX518 I2C DACs and native LPC32xx GPO 15. - * - * SPDX-License-Identifier: GPL-2.0+ */ void work_92105_display_init(void); diff --git a/board/work-microwave/work_92105/work_92105_spl.c b/board/work-microwave/work_92105/work_92105_spl.c index 282a6dd3a7..a31553a2d2 100644 --- a/board/work-microwave/work_92105/work_92105_spl.c +++ b/board/work-microwave/work_92105/work_92105_spl.c @@ -1,10 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * WORK Microwave work_92105 board support * * (C) Copyright 2014 DENX Software Engineering GmbH * Written-by: Albert ARIBAUD - * - * SPDX-License-Identifier: GPL-2.0+ */ #include -- cgit v1.2.3