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/samsung | |
| parent | 7ce85318cfff5fd82a059131761559cba7fef309 (diff) | |
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/samsung')
41 files changed, 41 insertions, 95 deletions
diff --git a/board/samsung/arndale/Makefile b/board/samsung/arndale/Makefile index 01bbc0798ac..1fd6e180bef 100644 --- a/board/samsung/arndale/Makefile +++ b/board/samsung/arndale/Makefile @@ -1,8 +1,6 @@ +# SPDX-License-Identifier: GPL-2.0+ # # Copyright (C) 2013 Samsung Electronics -# -# SPDX-License-Identifier: GPL-2.0+ -# obj-y += arndale_spl.o obj-y += arndale.o diff --git a/board/samsung/arndale/arndale.c b/board/samsung/arndale/arndale.c index 49ed3248add..d06ab8f3c0c 100644 --- a/board/samsung/arndale/arndale.c +++ b/board/samsung/arndale/arndale.c @@ -1,7 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (C) 2013 Samsung Electronics - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/board/samsung/arndale/arndale_spl.c b/board/samsung/arndale/arndale_spl.c index 2949c0828d6..baa50483353 100644 --- a/board/samsung/arndale/arndale_spl.c +++ b/board/samsung/arndale/arndale_spl.c @@ -1,7 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (c) 2012 The Chromium OS Authors. - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/board/samsung/common/Makefile b/board/samsung/common/Makefile index fa85f7dcd2f..3593c77cbc2 100644 --- a/board/samsung/common/Makefile +++ b/board/samsung/common/Makefile @@ -1,9 +1,7 @@ +# SPDX-License-Identifier: GPL-2.0+ # # Copyright (C) 2012 Samsung Electronics # Lukasz Majewski <l.majewski@samsung.com> -# -# SPDX-License-Identifier: GPL-2.0+ -# obj-$(CONFIG_USB_GADGET_DOWNLOAD) += gadget.o obj-$(CONFIG_MISC_COMMON) += misc.o diff --git a/board/samsung/common/board.c b/board/samsung/common/board.c index 88299f17e37..c4b6baedf04 100644 --- a/board/samsung/common/board.c +++ b/board/samsung/common/board.c @@ -1,8 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * (C) Copyright 2013 SAMSUNG Electronics * Rajeshwari Shinde <rajeshwari.s@samsung.com> - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/board/samsung/common/exynos-uboot-spl.lds b/board/samsung/common/exynos-uboot-spl.lds index 8c497792ee9..0d4be426b69 100644 --- a/board/samsung/common/exynos-uboot-spl.lds +++ b/board/samsung/common/exynos-uboot-spl.lds @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * (C) Copyright 2002 * Gary Jennejohn, DENX Software Engineering, <garyj@denx.de> @@ -5,8 +6,6 @@ * Copyright (C) 2012 Samsung Electronics * * Based on arch/arm/cpu/armv7/omap-common/u-boot-spl.lds - * - * SPDX-License-Identifier: GPL-2.0+ */ MEMORY { .sram : ORIGIN = CONFIG_SPL_TEXT_BASE, \ diff --git a/board/samsung/common/exynos5-dt-types.c b/board/samsung/common/exynos5-dt-types.c index 03d3a3112a1..4473968db60 100644 --- a/board/samsung/common/exynos5-dt-types.c +++ b/board/samsung/common/exynos5-dt-types.c @@ -1,8 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (C) 2015 Samsung Electronics * Przemyslaw Marczak <p.marczak@samsung.com> - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/board/samsung/common/exynos5-dt.c b/board/samsung/common/exynos5-dt.c index 862644b00e4..9f6f6548300 100644 --- a/board/samsung/common/exynos5-dt.c +++ b/board/samsung/common/exynos5-dt.c @@ -1,7 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (C) 2012 Samsung Electronics - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/board/samsung/common/gadget.c b/board/samsung/common/gadget.c index ef732befc44..6d783e61e0d 100644 --- a/board/samsung/common/gadget.c +++ b/board/samsung/common/gadget.c @@ -1,8 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (C) 2013 Samsung Electronics * Lukasz Majewski <l.majewski@samsung.com> - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/board/samsung/common/misc.c b/board/samsung/common/misc.c index eba25b7b980..c9df7e69d9a 100644 --- a/board/samsung/common/misc.c +++ b/board/samsung/common/misc.c @@ -1,8 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (C) 2013 Samsung Electronics * Przemyslaw Marczak <p.marczak@samsung.com> - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/board/samsung/espresso7420/Makefile b/board/samsung/espresso7420/Makefile index 5248265b1f1..bb882eaa254 100644 --- a/board/samsung/espresso7420/Makefile +++ b/board/samsung/espresso7420/Makefile @@ -1,8 +1,6 @@ +# SPDX-License-Identifier: GPL-2.0+ # # Copyright (C) 2016 Samsung Electronics # Thomas Abraham <thomas.ab@samsung.com> -# -# SPDX-License-Identifier: GPL-2.0+ -# obj-y += espresso7420.o diff --git a/board/samsung/espresso7420/espresso7420.c b/board/samsung/espresso7420/espresso7420.c index 1ed86800100..9f6fa897477 100644 --- a/board/samsung/espresso7420/espresso7420.c +++ b/board/samsung/espresso7420/espresso7420.c @@ -1,9 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Espresso7420 board file * Copyright (C) 2016 Samsung Electronics * Thomas Abraham <thomas.ab@samsung.com> - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/board/samsung/goni/Makefile b/board/samsung/goni/Makefile index 2cdc21d8516..2bf41417082 100644 --- a/board/samsung/goni/Makefile +++ b/board/samsung/goni/Makefile @@ -1,12 +1,10 @@ +# SPDX-License-Identifier: GPL-2.0+ # # (C) Copyright 2000, 2001, 2002 # Wolfgang Denk, DENX Software Engineering, wd@denx.de. # # (C) Copyright 2008 # Guennadi Liakhovetki, DENX Software Engineering, <lg@denx.de> -# -# SPDX-License-Identifier: GPL-2.0+ -# obj-y := goni.o onenand.o obj-y += lowlevel_init.o diff --git a/board/samsung/goni/goni.c b/board/samsung/goni/goni.c index debc4c57ffa..623e4abc218 100644 --- a/board/samsung/goni/goni.c +++ b/board/samsung/goni/goni.c @@ -1,9 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (C) 2008-2009 Samsung Electronics * Minkyu Kang <mk7.kang@samsung.com> * Kyungmin Park <kyungmin.park@samsung.com> - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/board/samsung/goni/lowlevel_init.S b/board/samsung/goni/lowlevel_init.S index fdb83e457a9..d38412e2c6a 100644 --- a/board/samsung/goni/lowlevel_init.S +++ b/board/samsung/goni/lowlevel_init.S @@ -1,10 +1,9 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * Memory Setup stuff - taken from blob memsetup.S * * Copyright (C) 2009 Samsung Electronics * Kyungmin Park <kyungmin.park@samsung.com> - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <config.h> diff --git a/board/samsung/goni/onenand.c b/board/samsung/goni/onenand.c index cbe1d12fdaa..9f21795437a 100644 --- a/board/samsung/goni/onenand.c +++ b/board/samsung/goni/onenand.c @@ -1,8 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (C) 2008-2009 Samsung Electronics * Kyungmin Park <kyungmin.park@samsung.com> - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/board/samsung/odroid/Makefile b/board/samsung/odroid/Makefile index b98aaeb1019..5bf48313de3 100644 --- a/board/samsung/odroid/Makefile +++ b/board/samsung/odroid/Makefile @@ -1,8 +1,6 @@ +# SPDX-License-Identifier: GPL-2.0+ # # Copyright (c) 2014 Samsung Electronics Co., Ltd. All rights reserved. # Przemyslaw Marczak <p.marczak@samsung.com> -# -# SPDX-License-Identifier: GPL-2.0+ -# obj-y := odroid.o diff --git a/board/samsung/odroid/odroid.c b/board/samsung/odroid/odroid.c index 0df96c1a3da..1c2bd01da2a 100644 --- a/board/samsung/odroid/odroid.c +++ b/board/samsung/odroid/odroid.c @@ -1,8 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (C) 2014 Samsung Electronics * Przemyslaw Marczak <p.marczak@samsung.com> - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/board/samsung/odroid/setup.h b/board/samsung/odroid/setup.h index 3e48dada279..5ee97ee25d5 100644 --- a/board/samsung/odroid/setup.h +++ b/board/samsung/odroid/setup.h @@ -1,8 +1,7 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * Copyright (C) 2014 Samsung Electronics * Przemyslaw Marczak <p.marczak@samsung.com> - * - * SPDX-License-Identifier: GPL-2.0+ */ #ifndef __ODROIDU3_SETUP__ diff --git a/board/samsung/origen/Makefile b/board/samsung/origen/Makefile index 1add9fe626f..44691af09f4 100644 --- a/board/samsung/origen/Makefile +++ b/board/samsung/origen/Makefile @@ -1,8 +1,6 @@ +# SPDX-License-Identifier: GPL-2.0+ # # Copyright (C) 2011 Samsung Electronics -# -# SPDX-License-Identifier: GPL-2.0+ -# ifdef CONFIG_SPL_BUILD # necessary to create built-in.o diff --git a/board/samsung/origen/origen.c b/board/samsung/origen/origen.c index 3d27a9433bf..e17454ad77d 100644 --- a/board/samsung/origen/origen.c +++ b/board/samsung/origen/origen.c @@ -1,7 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (C) 2011 Samsung Electronics - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/board/samsung/origen/tools/mkorigenspl.c b/board/samsung/origen/tools/mkorigenspl.c index 7b5d93b9ef7..f4be8672450 100644 --- a/board/samsung/origen/tools/mkorigenspl.c +++ b/board/samsung/origen/tools/mkorigenspl.c @@ -1,7 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (C) 2011 Samsung Electronics - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <stdio.h> diff --git a/board/samsung/smdk5250/Makefile b/board/samsung/smdk5250/Makefile index 501cab69e1c..bab0277277f 100644 --- a/board/samsung/smdk5250/Makefile +++ b/board/samsung/smdk5250/Makefile @@ -1,7 +1,5 @@ +# SPDX-License-Identifier: GPL-2.0+ # # Copyright (C) 2012 Samsung Electronics -# -# SPDX-License-Identifier: GPL-2.0+ -# obj-y += smdk5250_spl.o diff --git a/board/samsung/smdk5250/smdk5250_spl.c b/board/samsung/smdk5250/smdk5250_spl.c index 7f3916a94a5..eb25dfc0a03 100644 --- a/board/samsung/smdk5250/smdk5250_spl.c +++ b/board/samsung/smdk5250/smdk5250_spl.c @@ -1,7 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (c) 2012 The Chromium OS Authors. - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/board/samsung/smdk5420/Makefile b/board/samsung/smdk5420/Makefile index 96a400aacbd..f2366340969 100644 --- a/board/samsung/smdk5420/Makefile +++ b/board/samsung/smdk5420/Makefile @@ -1,7 +1,5 @@ +# SPDX-License-Identifier: GPL-2.0+ # # Copyright (C) 2013 Samsung Electronics -# -# SPDX-License-Identifier: GPL-2.0+ -# obj-y += smdk5420_spl.o diff --git a/board/samsung/smdk5420/smdk5420_spl.c b/board/samsung/smdk5420/smdk5420_spl.c index 73359f784ce..72748ec0897 100644 --- a/board/samsung/smdk5420/smdk5420_spl.c +++ b/board/samsung/smdk5420/smdk5420_spl.c @@ -1,7 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (C) 2013 The Chromium OS Authors. - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/board/samsung/smdkc100/Makefile b/board/samsung/smdkc100/Makefile index 0bcf4e5de54..00535ee54e6 100644 --- a/board/samsung/smdkc100/Makefile +++ b/board/samsung/smdkc100/Makefile @@ -1,12 +1,10 @@ +# SPDX-License-Identifier: GPL-2.0+ # # (C) Copyright 2000, 2001, 2002 # Wolfgang Denk, DENX Software Engineering, wd@denx.de. # # (C) Copyright 2008 # Guennadi Liakhovetki, DENX Software Engineering, <lg@denx.de> -# -# SPDX-License-Identifier: GPL-2.0+ -# obj-y := smdkc100.o obj-$(CONFIG_SAMSUNG_ONENAND) += onenand.o diff --git a/board/samsung/smdkc100/lowlevel_init.S b/board/samsung/smdkc100/lowlevel_init.S index 91e5357691e..3fbe66e0776 100644 --- a/board/samsung/smdkc100/lowlevel_init.S +++ b/board/samsung/smdkc100/lowlevel_init.S @@ -1,9 +1,8 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * Copyright (C) 2009 Samsung Electronics * Kyungmin Park <kyungmin.park@samsung.com> * Minkyu Kang <mk7.kang@samsung.com> - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <config.h> diff --git a/board/samsung/smdkc100/onenand.c b/board/samsung/smdkc100/onenand.c index 994d91d999f..04dc04a1a4a 100644 --- a/board/samsung/smdkc100/onenand.c +++ b/board/samsung/smdkc100/onenand.c @@ -1,8 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (C) 2008-2009 Samsung Electronics * Kyungmin Park <kyungmin.park@samsung.com> - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/board/samsung/smdkc100/smdkc100.c b/board/samsung/smdkc100/smdkc100.c index 5d23844458a..13c057b426f 100644 --- a/board/samsung/smdkc100/smdkc100.c +++ b/board/samsung/smdkc100/smdkc100.c @@ -1,9 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (C) 2008-2009 Samsung Electronics * Minkyu Kang <mk7.kang@samsung.com> * Kyungmin Park <kyungmin.park@samsung.com> - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/board/samsung/smdkv310/Makefile b/board/samsung/smdkv310/Makefile index de0da167be1..fccd8ffd2c1 100644 --- a/board/samsung/smdkv310/Makefile +++ b/board/samsung/smdkv310/Makefile @@ -1,8 +1,6 @@ +# SPDX-License-Identifier: GPL-2.0+ # # Copyright (C) 2011 Samsung Electronics -# -# SPDX-License-Identifier: GPL-2.0+ -# ifdef CONFIG_SPL_BUILD # necessary to create built-in.o diff --git a/board/samsung/smdkv310/smdkv310.c b/board/samsung/smdkv310/smdkv310.c index 027755de848..0eba7b66ee9 100644 --- a/board/samsung/smdkv310/smdkv310.c +++ b/board/samsung/smdkv310/smdkv310.c @@ -1,7 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (C) 2011 Samsung Electronics - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/board/samsung/smdkv310/tools/mksmdkv310spl.c b/board/samsung/smdkv310/tools/mksmdkv310spl.c index ea61635db5e..378b85d7229 100644 --- a/board/samsung/smdkv310/tools/mksmdkv310spl.c +++ b/board/samsung/smdkv310/tools/mksmdkv310spl.c @@ -1,7 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (C) 2011 Samsung Electronics - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <stdio.h> diff --git a/board/samsung/trats/Makefile b/board/samsung/trats/Makefile index 5dc8a1f7d14..cb9ee5b5960 100644 --- a/board/samsung/trats/Makefile +++ b/board/samsung/trats/Makefile @@ -1,8 +1,6 @@ +# SPDX-License-Identifier: GPL-2.0+ # # Copyright (C) 2011 Samsung Electronics # Heungjun Kim <riverful.kim@samsung.com> -# -# SPDX-License-Identifier: GPL-2.0+ -# obj-y += trats.o diff --git a/board/samsung/trats/setup.h b/board/samsung/trats/setup.h index 990e5e2dff7..739bdf95f8c 100644 --- a/board/samsung/trats/setup.h +++ b/board/samsung/trats/setup.h @@ -1,10 +1,9 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * Machine Specific Values for TRATS board based on EXYNOS4210 * * Copyright (C) 2011 Samsung Electronics * Heungjun Kim <riverful.kim@samsung.com> - * - * SPDX-License-Identifier: GPL-2.0+ */ #ifndef _TRATS_SETUP_H diff --git a/board/samsung/trats/trats.c b/board/samsung/trats/trats.c index 781b5799675..e0846bcb5b4 100644 --- a/board/samsung/trats/trats.c +++ b/board/samsung/trats/trats.c @@ -1,10 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (C) 2011 Samsung Electronics * Heungjun Kim <riverful.kim@samsung.com> * Kyungmin Park <kyungmin.park@samsung.com> * Donghwa Lee <dh09.lee@samsung.com> - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/board/samsung/trats2/Makefile b/board/samsung/trats2/Makefile index f501761a418..fd8325e4e46 100644 --- a/board/samsung/trats2/Makefile +++ b/board/samsung/trats2/Makefile @@ -1,8 +1,6 @@ +# SPDX-License-Identifier: GPL-2.0+ # # Copyright (c) 2000 - 2013 Samsung Electronics Co., Ltd. All rights reserved. # Sanghee Kim <sh0130.kim@samsung.com> -# -# SPDX-License-Identifier: GPL-2.0+ -# obj-y := trats2.o diff --git a/board/samsung/trats2/trats2.c b/board/samsung/trats2/trats2.c index 6abafeb1b3e..84ff936e4bc 100644 --- a/board/samsung/trats2/trats2.c +++ b/board/samsung/trats2/trats2.c @@ -1,9 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (c) 2013 Samsung Electronics Co., Ltd. All rights reserved. * Sanghee Kim <sh0130.kim@samsung.com> * Piotr Wilczek <p.wilczek@samsung.com> - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/board/samsung/universal_c210/Makefile b/board/samsung/universal_c210/Makefile index 4ceeeb62b5a..1c90dac0f3b 100644 --- a/board/samsung/universal_c210/Makefile +++ b/board/samsung/universal_c210/Makefile @@ -1,8 +1,6 @@ +# SPDX-License-Identifier: GPL-2.0+ # # Copyright (C) 2010 Samsung Electronics # Minkyu Kang <mk7.kang@samsung.com> -# -# SPDX-License-Identifier: GPL-2.0+ -# obj-y := universal.o onenand.o diff --git a/board/samsung/universal_c210/onenand.c b/board/samsung/universal_c210/onenand.c index 147a95e2907..37e911c430a 100644 --- a/board/samsung/universal_c210/onenand.c +++ b/board/samsung/universal_c210/onenand.c @@ -1,8 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (C) 2010 Samsung Electronics * Kyungmin Park <kyungmin.park@samsung.com> - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/board/samsung/universal_c210/universal.c b/board/samsung/universal_c210/universal.c index 549ac8b48ae..f8281f209a6 100644 --- a/board/samsung/universal_c210/universal.c +++ b/board/samsung/universal_c210/universal.c @@ -1,9 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (C) 2010 Samsung Electronics * Minkyu Kang <mk7.kang@samsung.com> * Kyungmin Park <kyungmin.park@samsung.com> - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> |