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/st/stih410-b2260/Makefile | 4 +--- board/st/stih410-b2260/board.c | 3 +-- board/st/stm32f429-discovery/Makefile | 4 +--- board/st/stm32f429-discovery/led.c | 3 +-- board/st/stm32f429-discovery/stm32f429-discovery.c | 3 +-- board/st/stm32f429-evaluation/Makefile | 4 +--- board/st/stm32f429-evaluation/stm32f429-evaluation.c | 3 +-- board/st/stm32f469-discovery/Makefile | 4 +--- board/st/stm32f469-discovery/stm32f469-discovery.c | 3 +-- board/st/stm32f746-disco/Makefile | 4 +--- board/st/stm32f746-disco/stm32f746-disco.c | 3 +-- board/st/stm32h743-disco/Makefile | 4 +--- board/st/stm32h743-disco/stm32h743-disco.c | 3 +-- board/st/stm32h743-eval/Makefile | 4 +--- board/st/stm32h743-eval/stm32h743-eval.c | 3 +-- board/st/stv0991/Makefile | 4 +--- board/st/stv0991/stv0991.c | 3 +-- 17 files changed, 17 insertions(+), 42 deletions(-) (limited to 'board/st') diff --git a/board/st/stih410-b2260/Makefile b/board/st/stih410-b2260/Makefile index 8293ae914d..dc3e1d3959 100644 --- a/board/st/stih410-b2260/Makefile +++ b/board/st/stih410-b2260/Makefile @@ -1,8 +1,6 @@ +# SPDX-License-Identifier: GPL-2.0+ # # Copyright (C) 2017, STMicroelectronics - All Rights Reserved # Author(s): Patrice CHOTARD, for STMicroelectronics. -# -# SPDX-License-Identifier: GPL-2.0+ -# obj-y = board.o diff --git a/board/st/stih410-b2260/board.c b/board/st/stih410-b2260/board.c index fe639dcc2e..b4fc8f3ce1 100644 --- a/board/st/stih410-b2260/board.c +++ b/board/st/stih410-b2260/board.c @@ -1,8 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (C) 2017, STMicroelectronics - All Rights Reserved * Author(s): Patrice Chotard, for STMicroelectronics. - * - * SPDX-License-Identifier: GPL-2.0+ */ #include diff --git a/board/st/stm32f429-discovery/Makefile b/board/st/stm32f429-discovery/Makefile index d94059d0ae..6b02c0fdde 100644 --- a/board/st/stm32f429-discovery/Makefile +++ b/board/st/stm32f429-discovery/Makefile @@ -1,12 +1,10 @@ +# SPDX-License-Identifier: GPL-2.0+ # # (C) Copyright 2000-2004 # Wolfgang Denk, DENX Software Engineering, wd@denx.de. # # (C) Copyright 2015 # Kamil Lulko, -# -# SPDX-License-Identifier: GPL-2.0+ -# obj-y := stm32f429-discovery.o obj-y += led.o diff --git a/board/st/stm32f429-discovery/led.c b/board/st/stm32f429-discovery/led.c index ee22009f31..8320ad4fac 100644 --- a/board/st/stm32f429-discovery/led.c +++ b/board/st/stm32f429-discovery/led.c @@ -1,8 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * (C) Copyright 2015 * Kamil Lulko, - * - * SPDX-License-Identifier: GPL-2.0+ */ #include diff --git a/board/st/stm32f429-discovery/stm32f429-discovery.c b/board/st/stm32f429-discovery/stm32f429-discovery.c index 3d90218faa..b7638c0f6a 100644 --- a/board/st/stm32f429-discovery/stm32f429-discovery.c +++ b/board/st/stm32f429-discovery/stm32f429-discovery.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * (C) Copyright 2011, 2012, 2013 * Yuri Tikhonov, Emcraft Systems, yur@emcraft.com @@ -7,8 +8,6 @@ * * (C) Copyright 2015 * Kamil Lulko, - * - * SPDX-License-Identifier: GPL-2.0+ */ #include diff --git a/board/st/stm32f429-evaluation/Makefile b/board/st/stm32f429-evaluation/Makefile index 3efba3af41..8bf9e1f6d8 100644 --- a/board/st/stm32f429-evaluation/Makefile +++ b/board/st/stm32f429-evaluation/Makefile @@ -1,8 +1,6 @@ +# SPDX-License-Identifier: GPL-2.0+ # # Copyright (C) 2018, STMicroelectronics - All Rights Reserved # Author(s): Patrice CHOTARD, for STMicroelectronics. -# -# SPDX-License-Identifier: GPL-2.0+ -# obj-y := stm32f429-evaluation.o diff --git a/board/st/stm32f429-evaluation/stm32f429-evaluation.c b/board/st/stm32f429-evaluation/stm32f429-evaluation.c index 25e020784d..2e638c6059 100644 --- a/board/st/stm32f429-evaluation/stm32f429-evaluation.c +++ b/board/st/stm32f429-evaluation/stm32f429-evaluation.c @@ -1,8 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (C) 2018, STMicroelectronics - All Rights Reserved * Author(s): Patrice Chotard, for STMicroelectronics. - * - * SPDX-License-Identifier: GPL-2.0+ */ #include diff --git a/board/st/stm32f469-discovery/Makefile b/board/st/stm32f469-discovery/Makefile index 9ecd61e773..249835b122 100644 --- a/board/st/stm32f469-discovery/Makefile +++ b/board/st/stm32f469-discovery/Makefile @@ -1,8 +1,6 @@ +# SPDX-License-Identifier: GPL-2.0+ # # Copyright (C) STMicroelectronics SA 2017 # Author(s): Patrice CHOTARD, for STMicroelectronics. -# -# SPDX-License-Identifier: GPL-2.0+ -# obj-y := stm32f469-discovery.o diff --git a/board/st/stm32f469-discovery/stm32f469-discovery.c b/board/st/stm32f469-discovery/stm32f469-discovery.c index 36f7b2e8e1..90d7045e9a 100644 --- a/board/st/stm32f469-discovery/stm32f469-discovery.c +++ b/board/st/stm32f469-discovery/stm32f469-discovery.c @@ -1,8 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (C) STMicroelectronics SA 2017 * Author(s): Patrice CHOTARD, for STMicroelectronics. - * - * SPDX-License-Identifier: GPL-2.0+ */ #include diff --git a/board/st/stm32f746-disco/Makefile b/board/st/stm32f746-disco/Makefile index 00b072b5ee..369f17a2db 100644 --- a/board/st/stm32f746-disco/Makefile +++ b/board/st/stm32f746-disco/Makefile @@ -1,8 +1,6 @@ +# SPDX-License-Identifier: GPL-2.0+ # # Copyright (C) 2016, STMicroelectronics - All Rights Reserved # Author(s): Vikas Manocha, for STMicroelectronics. -# -# SPDX-License-Identifier: GPL-2.0+ -# obj-y := stm32f746-disco.o diff --git a/board/st/stm32f746-disco/stm32f746-disco.c b/board/st/stm32f746-disco/stm32f746-disco.c index c4f263332c..e21cfc6e49 100644 --- a/board/st/stm32f746-disco/stm32f746-disco.c +++ b/board/st/stm32f746-disco/stm32f746-disco.c @@ -1,8 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (C) 2016, STMicroelectronics - All Rights Reserved * Author(s): Vikas Manocha, for STMicroelectronics. - * - * SPDX-License-Identifier: GPL-2.0+ */ #include diff --git a/board/st/stm32h743-disco/Makefile b/board/st/stm32h743-disco/Makefile index 8c313b2685..8fe7a2d6ff 100644 --- a/board/st/stm32h743-disco/Makefile +++ b/board/st/stm32h743-disco/Makefile @@ -1,8 +1,6 @@ +# SPDX-License-Identifier: GPL-2.0+ # # Copyright (C) 2017, STMicroelectronics - All Rights Reserved # Author(s): Patrice CHOTARD, for STMicroelectronics. -# -# SPDX-License-Identifier: GPL-2.0+ -# obj-y := stm32h743-disco.o diff --git a/board/st/stm32h743-disco/stm32h743-disco.c b/board/st/stm32h743-disco/stm32h743-disco.c index 226b7045d2..fa007c7986 100644 --- a/board/st/stm32h743-disco/stm32h743-disco.c +++ b/board/st/stm32h743-disco/stm32h743-disco.c @@ -1,8 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (C) 2017, STMicroelectronics - All Rights Reserved * Author(s): Patrice Chotard, for STMicroelectronics. - * - * SPDX-License-Identifier: GPL-2.0+ */ #include diff --git a/board/st/stm32h743-eval/Makefile b/board/st/stm32h743-eval/Makefile index 5482e9dc19..88b59fda0d 100644 --- a/board/st/stm32h743-eval/Makefile +++ b/board/st/stm32h743-eval/Makefile @@ -1,8 +1,6 @@ +# SPDX-License-Identifier: GPL-2.0+ # # Copyright (C) 2017, STMicroelectronics - All Rights Reserved # Author(s): Patrice CHOTARD, for STMicroelectronics. -# -# SPDX-License-Identifier: GPL-2.0+ -# obj-y := stm32h743-eval.o diff --git a/board/st/stm32h743-eval/stm32h743-eval.c b/board/st/stm32h743-eval/stm32h743-eval.c index 226b7045d2..fa007c7986 100644 --- a/board/st/stm32h743-eval/stm32h743-eval.c +++ b/board/st/stm32h743-eval/stm32h743-eval.c @@ -1,8 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (C) 2017, STMicroelectronics - All Rights Reserved * Author(s): Patrice Chotard, for STMicroelectronics. - * - * SPDX-License-Identifier: GPL-2.0+ */ #include diff --git a/board/st/stv0991/Makefile b/board/st/stv0991/Makefile index 6fb4135f5d..7f6d719c32 100644 --- a/board/st/stv0991/Makefile +++ b/board/st/stv0991/Makefile @@ -1,8 +1,6 @@ +# SPDX-License-Identifier: GPL-2.0+ # # Copyright (C) 2014, STMicroelectronics - All Rights Reserved # Author(s): Vikas Manocha, for STMicroelectronics. -# -# SPDX-License-Identifier: GPL-2.0+ -# obj-y := stv0991.o diff --git a/board/st/stv0991/stv0991.c b/board/st/stv0991/stv0991.c index 670d59c926..33b29e647e 100644 --- a/board/st/stv0991/stv0991.c +++ b/board/st/stv0991/stv0991.c @@ -1,8 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (C) 2014, STMicroelectronics - All Rights Reserved * Author(s): Vikas Manocha, for STMicroelectronics. - * - * SPDX-License-Identifier: GPL-2.0+ */ #include -- cgit