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/keymile | |
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/keymile')
-rw-r--r-- | board/keymile/common/common.c | 3 | ||||
-rw-r--r-- | board/keymile/common/common.h | 3 | ||||
-rw-r--r-- | board/keymile/common/ivm.c | 3 | ||||
-rw-r--r-- | board/keymile/km83xx/Makefile | 4 | ||||
-rw-r--r-- | board/keymile/km83xx/km83xx.c | 3 | ||||
-rw-r--r-- | board/keymile/km83xx/km83xx_i2c.c | 3 | ||||
-rw-r--r-- | board/keymile/km_arm/Makefile | 4 | ||||
-rw-r--r-- | board/keymile/km_arm/fpga_config.c | 3 | ||||
-rw-r--r-- | board/keymile/km_arm/km_arm.c | 3 | ||||
-rw-r--r-- | board/keymile/km_arm/kwbimage-memphis.cfg | 4 | ||||
-rw-r--r-- | board/keymile/km_arm/kwbimage.cfg | 4 | ||||
-rw-r--r-- | board/keymile/km_arm/kwbimage_128M16_1.cfg | 2 | ||||
-rw-r--r-- | board/keymile/km_arm/kwbimage_256M8_1.cfg | 4 | ||||
-rw-r--r-- | board/keymile/kmp204x/Makefile | 4 | ||||
-rw-r--r-- | board/keymile/kmp204x/ddr.c | 5 | ||||
-rw-r--r-- | board/keymile/kmp204x/eth.c | 3 | ||||
-rw-r--r-- | board/keymile/kmp204x/kmp204x.c | 3 | ||||
-rw-r--r-- | board/keymile/kmp204x/kmp204x.h | 3 | ||||
-rw-r--r-- | board/keymile/kmp204x/law.c | 3 | ||||
-rw-r--r-- | board/keymile/kmp204x/pbi.cfg | 4 | ||||
-rw-r--r-- | board/keymile/kmp204x/pci.c | 3 | ||||
-rw-r--r-- | board/keymile/kmp204x/qrio.c | 3 | ||||
-rw-r--r-- | board/keymile/kmp204x/tlb.c | 3 |
23 files changed, 24 insertions, 53 deletions
diff --git a/board/keymile/common/common.c b/board/keymile/common/common.c index 6cd281218ee..92d4a6ff614 100644 --- a/board/keymile/common/common.c +++ b/board/keymile/common/common.c @@ -1,11 +1,10 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * (C) Copyright 2008 * Heiko Schocher, DENX Software Engineering, hs@denx.de. * * (C) Copyright 2011 * Holger Brunck, Keymile GmbH Hannover, holger.brunck@keymile.com - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/board/keymile/common/common.h b/board/keymile/common/common.h index 81a0af0c3c9..859d9130a93 100644 --- a/board/keymile/common/common.h +++ b/board/keymile/common/common.h @@ -1,8 +1,7 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * (C) Copyright 2008 * Heiko Schocher, DENX Software Engineering, hs@denx.de. - * - * SPDX-License-Identifier: GPL-2.0+ */ #ifndef __KEYMILE_COMMON_H diff --git a/board/keymile/common/ivm.c b/board/keymile/common/ivm.c index f1321d9899f..23bd21c4bc0 100644 --- a/board/keymile/common/ivm.c +++ b/board/keymile/common/ivm.c @@ -1,8 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * (C) Copyright 2011 * Holger Brunck, Keymile GmbH Hannover, holger.brunck@keymile.com - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/board/keymile/km83xx/Makefile b/board/keymile/km83xx/Makefile index 6c3268853e5..0aef6549873 100644 --- a/board/keymile/km83xx/Makefile +++ b/board/keymile/km83xx/Makefile @@ -1,8 +1,6 @@ +# SPDX-License-Identifier: GPL-2.0+ # # (C) Copyright 2006 # Wolfgang Denk, DENX Software Engineering, wd@denx.de. -# -# SPDX-License-Identifier: GPL-2.0+ -# obj-y += km83xx.o ../common/common.o ../common/ivm.o km83xx_i2c.o diff --git a/board/keymile/km83xx/km83xx.c b/board/keymile/km83xx/km83xx.c index 81835e84934..4818a4994a0 100644 --- a/board/keymile/km83xx/km83xx.c +++ b/board/keymile/km83xx/km83xx.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (C) 2006 Freescale Semiconductor, Inc. * Dave Liu <daveliu@freescale.com> @@ -10,8 +11,6 @@ * * (C) Copyright 2008 - 2010 * Heiko Schocher, DENX Software Engineering, hs@denx.de. - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/board/keymile/km83xx/km83xx_i2c.c b/board/keymile/km83xx/km83xx_i2c.c index f0b528d1c8f..113ca70a1ac 100644 --- a/board/keymile/km83xx/km83xx_i2c.c +++ b/board/keymile/km83xx/km83xx_i2c.c @@ -1,8 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * (C) Copyright 2011 * Holger Brunck, Keymile GmbH Hannover, holger.brunck@keymile.com - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/board/keymile/km_arm/Makefile b/board/keymile/km_arm/Makefile index a17d8d963a9..79ccc763eb8 100644 --- a/board/keymile/km_arm/Makefile +++ b/board/keymile/km_arm/Makefile @@ -1,10 +1,8 @@ +# SPDX-License-Identifier: GPL-2.0+ # # (C) Copyright 2009 # Marvell Semiconductor <www.marvell.com> # Prafulla Wadaskar <prafulla@marvell.com> -# -# SPDX-License-Identifier: GPL-2.0+ -# obj-y := km_arm.o ../common/common.o ../common/ivm.o diff --git a/board/keymile/km_arm/fpga_config.c b/board/keymile/km_arm/fpga_config.c index 6f8d69606d5..051e167fd55 100644 --- a/board/keymile/km_arm/fpga_config.c +++ b/board/keymile/km_arm/fpga_config.c @@ -1,8 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * (C) Copyright 2012 * Valentin Lontgchamp, Keymile AG, valentin.longchamp@keymile.com - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/board/keymile/km_arm/km_arm.c b/board/keymile/km_arm/km_arm.c index af1ebc4101e..ea03be9eb37 100644 --- a/board/keymile/km_arm/km_arm.c +++ b/board/keymile/km_arm/km_arm.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * (C) Copyright 2009 * Marvell Semiconductor <www.marvell.com> @@ -8,8 +9,6 @@ * * (C) Copyright 2010 * Heiko Schocher, DENX Software Engineering, hs@denx.de. - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/board/keymile/km_arm/kwbimage-memphis.cfg b/board/keymile/km_arm/kwbimage-memphis.cfg index e910f4216b7..d850e10113b 100644 --- a/board/keymile/km_arm/kwbimage-memphis.cfg +++ b/board/keymile/km_arm/kwbimage-memphis.cfg @@ -1,12 +1,10 @@ +# SPDX-License-Identifier: GPL-2.0+ # # (C) Copyright 2010 # Heiko Schocher, DENX Software Engineering, hs@denx.de. # # (C) Copyright 2011 # Valentin Longchamp, Keymile AG, valentin.longchamp@keymile.com -# -# SPDX-License-Identifier: GPL-2.0+ -# # Refer doc/README.kwbimage for more details about how-to configure # and create kirkwood boot image # diff --git a/board/keymile/km_arm/kwbimage.cfg b/board/keymile/km_arm/kwbimage.cfg index ce2c3e29dd1..6b62ce0ab70 100644 --- a/board/keymile/km_arm/kwbimage.cfg +++ b/board/keymile/km_arm/kwbimage.cfg @@ -1,9 +1,7 @@ +# SPDX-License-Identifier: GPL-2.0+ # # (C) Copyright 2010 # Heiko Schocher, DENX Software Engineering, hs@denx.de. -# -# SPDX-License-Identifier: GPL-2.0+ -# # Refer doc/README.kwbimage for more details about how-to configure # and create kirkwood boot image # diff --git a/board/keymile/km_arm/kwbimage_128M16_1.cfg b/board/keymile/km_arm/kwbimage_128M16_1.cfg index 71e3609cf0f..e30c0feec7c 100644 --- a/board/keymile/km_arm/kwbimage_128M16_1.cfg +++ b/board/keymile/km_arm/kwbimage_128M16_1.cfg @@ -1,3 +1,4 @@ +# SPDX-License-Identifier: GPL-2.0+ # # (C) Copyright 2010 # Heiko Schocher, DENX Software Engineering, hs@denx.de. @@ -7,7 +8,6 @@ # Stefan Bigler, Keymile AG, stefan.bigler@keymile.com # # (C) Copyright 2012 -# SPDX-License-Identifier: GPL-2.0+ # # Refer doc/README.kwbimage for more details about how-to configure # and create kirkwood boot image diff --git a/board/keymile/km_arm/kwbimage_256M8_1.cfg b/board/keymile/km_arm/kwbimage_256M8_1.cfg index 3934138146b..91ea5f00711 100644 --- a/board/keymile/km_arm/kwbimage_256M8_1.cfg +++ b/board/keymile/km_arm/kwbimage_256M8_1.cfg @@ -1,11 +1,9 @@ +# SPDX-License-Identifier: GPL-2.0+ # # (C) Copyright 2012 # Stefan Bigler, Keymile AG, stefan.bigler@keymile.com # Norbert Mayer, Keymile AG, norbert.mayer@keymile.com # Deepak Patel, XENTECH Limited, deepak.patel@xentech.co.uk -# -# SPDX-License-Identifier: GPL-2.0+ -# # Refer doc/README.kwbimage for more details about how-to configure # and create kirkwood boot image # diff --git a/board/keymile/kmp204x/Makefile b/board/keymile/kmp204x/Makefile index c57ca08e147..626c627be7f 100644 --- a/board/keymile/kmp204x/Makefile +++ b/board/keymile/kmp204x/Makefile @@ -1,12 +1,10 @@ +# SPDX-License-Identifier: GPL-2.0+ # # (C) Copyright 2001-2007 # Wolfgang Denk, DENX Software Engineering, wd@denx.de. # # See file CREDITS for list of people who contributed to this # project. -# -# SPDX-License-Identifier: GPL-2.0+ -# obj-y := kmp204x.o ddr.o eth.o tlb.o pci.o law.o qrio.o \ ../common/common.o ../common/ivm.o diff --git a/board/keymile/kmp204x/ddr.c b/board/keymile/kmp204x/ddr.c index 6f82e15f82c..ee2e3d6b9aa 100644 --- a/board/keymile/kmp204x/ddr.c +++ b/board/keymile/kmp204x/ddr.c @@ -1,11 +1,10 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * (C) Copyright 2013 Keymile AG * Valentin Longchamp <valentin.longchamp@keymile.com> * * Copyright 2009-2011 Freescale Semiconductor, Inc. - * - * SPDX-License-Identifier: GPL-2.0+ - */ + */ #include <common.h> #include <i2c.h> diff --git a/board/keymile/kmp204x/eth.c b/board/keymile/kmp204x/eth.c index a0731055a28..7499d2078b7 100644 --- a/board/keymile/kmp204x/eth.c +++ b/board/keymile/kmp204x/eth.c @@ -1,8 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * (C) Copyright 2013 Keymile AG * Valentin Longchamp <valentin.longchamp@keymile.com> - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/board/keymile/kmp204x/kmp204x.c b/board/keymile/kmp204x/kmp204x.c index bc229e872fa..e7dcefacdd9 100644 --- a/board/keymile/kmp204x/kmp204x.c +++ b/board/keymile/kmp204x/kmp204x.c @@ -1,10 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * (C) Copyright 2013 Keymile AG * Valentin Longchamp <valentin.longchamp@keymile.com> * * Copyright 2011,2012 Freescale Semiconductor, Inc. - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/board/keymile/kmp204x/kmp204x.h b/board/keymile/kmp204x/kmp204x.h index e90e8abd43d..4d14c446173 100644 --- a/board/keymile/kmp204x/kmp204x.h +++ b/board/keymile/kmp204x/kmp204x.h @@ -1,8 +1,7 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * (C) Copyright 2013 Keymile AG * Valentin Longchamp <valentin.longchamp@keymile.com> - * - * SPDX-License-Identifier: GPL-2.0+ */ /* QRIO GPIO ports */ diff --git a/board/keymile/kmp204x/law.c b/board/keymile/kmp204x/law.c index 75d69e8b48e..2d83dfea15f 100644 --- a/board/keymile/kmp204x/law.c +++ b/board/keymile/kmp204x/law.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * (C) Copyright 2013 Keymile AG * Valentin Longchamp <valentin.longchamp@keymile.com> @@ -6,8 +7,6 @@ * * (C) Copyright 2000 * Wolfgang Denk, DENX Software Engineering, wd@denx.de. - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/board/keymile/kmp204x/pbi.cfg b/board/keymile/kmp204x/pbi.cfg index 1e0a171d88b..3fdfb47ab23 100644 --- a/board/keymile/kmp204x/pbi.cfg +++ b/board/keymile/kmp204x/pbi.cfg @@ -1,8 +1,6 @@ +# SPDX-License-Identifier: GPL-2.0+ # # Copyright 2012 Freescale Semiconductor, Inc. -# -# SPDX-License-Identifier: GPL-2.0+ -# # Refer docs/README.pblimage for more details about how-to configure # and create PBL boot image # diff --git a/board/keymile/kmp204x/pci.c b/board/keymile/kmp204x/pci.c index b2c3679719b..965a8ce98b6 100644 --- a/board/keymile/kmp204x/pci.c +++ b/board/keymile/kmp204x/pci.c @@ -1,10 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * (C) Copyright 2013 Keymile AG * Valentin Longchamp <valentin.longchamp@keymile.com> * * Copyright 2007-2011 Freescale Semiconductor, Inc. - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/board/keymile/kmp204x/qrio.c b/board/keymile/kmp204x/qrio.c index edf3bf11a89..03026a277b3 100644 --- a/board/keymile/kmp204x/qrio.c +++ b/board/keymile/kmp204x/qrio.c @@ -1,8 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * (C) Copyright 2013 Keymile AG * Valentin Longchamp <valentin.longchamp@keymile.com> - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/board/keymile/kmp204x/tlb.c b/board/keymile/kmp204x/tlb.c index d03ca802a44..a268bd8e959 100644 --- a/board/keymile/kmp204x/tlb.c +++ b/board/keymile/kmp204x/tlb.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * (C) Copyright 2013 Keymile AG * Valentin Longchamp <valentin.longchamp@keymile.com> @@ -6,8 +7,6 @@ * * (C) Copyright 2000 * Wolfgang Denk, DENX Software Engineering, wd@denx.de. - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> |