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/aries | |
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/aries')
-rw-r--r-- | board/aries/m28evk/Makefile | 4 | ||||
-rw-r--r-- | board/aries/m28evk/m28evk.c | 3 | ||||
-rw-r--r-- | board/aries/m28evk/spl_boot.c | 3 | ||||
-rw-r--r-- | board/aries/m53evk/Makefile | 4 | ||||
-rw-r--r-- | board/aries/m53evk/imximage.cfg | 3 | ||||
-rw-r--r-- | board/aries/m53evk/m53evk.c | 3 | ||||
-rw-r--r-- | board/aries/ma5d4evk/Makefile | 4 | ||||
-rw-r--r-- | board/aries/ma5d4evk/ma5d4evk.c | 3 | ||||
-rw-r--r-- | board/aries/mcvevk/Makefile | 4 | ||||
-rw-r--r-- | board/aries/mcvevk/qts/iocsr_config.h | 3 | ||||
-rw-r--r-- | board/aries/mcvevk/qts/pinmux_config.h | 3 | ||||
-rw-r--r-- | board/aries/mcvevk/qts/pll_config.h | 3 | ||||
-rw-r--r-- | board/aries/mcvevk/qts/sdram_config.h | 3 | ||||
-rw-r--r-- | board/aries/mcvevk/socfpga.c | 3 |
14 files changed, 14 insertions, 32 deletions
diff --git a/board/aries/m28evk/Makefile b/board/aries/m28evk/Makefile index 5e890b1eaf..fc642e0836 100644 --- a/board/aries/m28evk/Makefile +++ b/board/aries/m28evk/Makefile @@ -1,9 +1,7 @@ +# SPDX-License-Identifier: GPL-2.0+ # # (C) Copyright 2000-2006 # Wolfgang Denk, DENX Software Engineering, wd@denx.de. -# -# SPDX-License-Identifier: GPL-2.0+ -# ifndef CONFIG_SPL_BUILD obj-y := m28evk.o diff --git a/board/aries/m28evk/m28evk.c b/board/aries/m28evk/m28evk.c index c990ea9fec..ba8cc90217 100644 --- a/board/aries/m28evk/m28evk.c +++ b/board/aries/m28evk/m28evk.c @@ -1,10 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Aries M28 module * * Copyright (C) 2011 Marek Vasut <marek.vasut@gmail.com> * on behalf of DENX Software Engineering GmbH - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/board/aries/m28evk/spl_boot.c b/board/aries/m28evk/spl_boot.c index e27a74e07a..ddec8dca6e 100644 --- a/board/aries/m28evk/spl_boot.c +++ b/board/aries/m28evk/spl_boot.c @@ -1,10 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * ARIES M28 Boot setup * * Copyright (C) 2011 Marek Vasut <marek.vasut@gmail.com> * on behalf of DENX Software Engineering GmbH - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/board/aries/m53evk/Makefile b/board/aries/m53evk/Makefile index daa0fe4dd9..c0a400416a 100644 --- a/board/aries/m53evk/Makefile +++ b/board/aries/m53evk/Makefile @@ -1,8 +1,6 @@ +# SPDX-License-Identifier: GPL-2.0+ # # Aries M53EVK # Copyright (C) 2012-2013 Marek Vasut <marex@denx.de> -# -# SPDX-License-Identifier: GPL-2.0+ -# obj-y := m53evk.o diff --git a/board/aries/m53evk/imximage.cfg b/board/aries/m53evk/imximage.cfg index e4f3ce53d2..91649ec5d8 100644 --- a/board/aries/m53evk/imximage.cfg +++ b/board/aries/m53evk/imximage.cfg @@ -1,9 +1,8 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * Aries M53 DRAM init values * Copyright (C) 2012-2013 Marek Vasut <marex@denx.de> * - * SPDX-License-Identifier: GPL-2.0+ - * * Refer doc/README.imximage for more details about how-to configure * and create imximage boot image * diff --git a/board/aries/m53evk/m53evk.c b/board/aries/m53evk/m53evk.c index a798d83376..77ba69c705 100644 --- a/board/aries/m53evk/m53evk.c +++ b/board/aries/m53evk/m53evk.c @@ -1,9 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Aries M53 module * * Copyright (C) 2012-2013 Marek Vasut <marex@denx.de> - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/board/aries/ma5d4evk/Makefile b/board/aries/ma5d4evk/Makefile index b12b5dcbd4..15fc2946d8 100644 --- a/board/aries/ma5d4evk/Makefile +++ b/board/aries/ma5d4evk/Makefile @@ -1,7 +1,5 @@ +# SPDX-License-Identifier: GPL-2.0+ # # Copyright (C) 2015 Marek Vasut <marex@denx.de> -# -# SPDX-License-Identifier: GPL-2.0+ -# obj-y += ma5d4evk.o diff --git a/board/aries/ma5d4evk/ma5d4evk.c b/board/aries/ma5d4evk/ma5d4evk.c index 9f8b8dc154..c2b6845edc 100644 --- a/board/aries/ma5d4evk/ma5d4evk.c +++ b/board/aries/ma5d4evk/ma5d4evk.c @@ -1,7 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (C) 2015 Marek Vasut <marex@denx.de> - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/board/aries/mcvevk/Makefile b/board/aries/mcvevk/Makefile index 86f9b78cad..e1c8a6b3c7 100644 --- a/board/aries/mcvevk/Makefile +++ b/board/aries/mcvevk/Makefile @@ -1,9 +1,7 @@ +# SPDX-License-Identifier: GPL-2.0+ # # (C) Copyright 2001-2006 # Wolfgang Denk, DENX Software Engineering, wd@denx.de. # (C) Copyright 2010, Thomas Chou <thomas@wytron.com.tw> -# -# SPDX-License-Identifier: GPL-2.0+ -# obj-y := socfpga.o diff --git a/board/aries/mcvevk/qts/iocsr_config.h b/board/aries/mcvevk/qts/iocsr_config.h index 3021830d00..e233d02b97 100644 --- a/board/aries/mcvevk/qts/iocsr_config.h +++ b/board/aries/mcvevk/qts/iocsr_config.h @@ -1,7 +1,6 @@ +/* SPDX-License-Identifier: BSD-3-Clause */ /* * Altera SoCFPGA IOCSR configuration - * - * SPDX-License-Identifier: BSD-3-Clause */ #ifndef __SOCFPGA_IOCSR_CONFIG_H__ diff --git a/board/aries/mcvevk/qts/pinmux_config.h b/board/aries/mcvevk/qts/pinmux_config.h index ea2f7ab3b3..85f892ae47 100644 --- a/board/aries/mcvevk/qts/pinmux_config.h +++ b/board/aries/mcvevk/qts/pinmux_config.h @@ -1,7 +1,6 @@ +/* SPDX-License-Identifier: BSD-3-Clause */ /* * Altera SoCFPGA PinMux configuration - * - * SPDX-License-Identifier: BSD-3-Clause */ #ifndef __SOCFPGA_PINMUX_CONFIG_H__ diff --git a/board/aries/mcvevk/qts/pll_config.h b/board/aries/mcvevk/qts/pll_config.h index b718b39e96..4fa868e458 100644 --- a/board/aries/mcvevk/qts/pll_config.h +++ b/board/aries/mcvevk/qts/pll_config.h @@ -1,7 +1,6 @@ +/* SPDX-License-Identifier: BSD-3-Clause */ /* * Altera SoCFPGA Clock and PLL configuration - * - * SPDX-License-Identifier: BSD-3-Clause */ #ifndef __SOCFPGA_PLL_CONFIG_H__ diff --git a/board/aries/mcvevk/qts/sdram_config.h b/board/aries/mcvevk/qts/sdram_config.h index ff64f555c0..fd72926a89 100644 --- a/board/aries/mcvevk/qts/sdram_config.h +++ b/board/aries/mcvevk/qts/sdram_config.h @@ -1,7 +1,6 @@ +/* SPDX-License-Identifier: BSD-3-Clause */ /* * Altera SoCFPGA SDRAM configuration - * - * SPDX-License-Identifier: BSD-3-Clause */ #ifndef __SOCFPGA_SDRAM_CONFIG_H__ diff --git a/board/aries/mcvevk/socfpga.c b/board/aries/mcvevk/socfpga.c index 6be58f047f..f173bf84ac 100644 --- a/board/aries/mcvevk/socfpga.c +++ b/board/aries/mcvevk/socfpga.c @@ -1,6 +1,5 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (C) 2015 Marek Vasut <marex@denx.de> - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> |