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/boundary/nitrogen6x/1066mhz_4x128mx16.cfg | 3 +-- board/boundary/nitrogen6x/1066mhz_4x256mx16.cfg | 3 +-- board/boundary/nitrogen6x/800mhz_2x128mx16.cfg | 3 +-- board/boundary/nitrogen6x/800mhz_2x256mx16.cfg | 3 +-- board/boundary/nitrogen6x/800mhz_4x128mx16.cfg | 3 +-- board/boundary/nitrogen6x/800mhz_4x256mx16.cfg | 3 +-- board/boundary/nitrogen6x/Makefile | 4 +--- board/boundary/nitrogen6x/clocks.cfg | 3 +-- board/boundary/nitrogen6x/ddr-setup.cfg | 3 +-- board/boundary/nitrogen6x/nitrogen6dl.cfg | 3 +-- board/boundary/nitrogen6x/nitrogen6dl2g.cfg | 3 +-- board/boundary/nitrogen6x/nitrogen6q.cfg | 3 +-- board/boundary/nitrogen6x/nitrogen6q2g.cfg | 3 +-- board/boundary/nitrogen6x/nitrogen6s.cfg | 3 +-- board/boundary/nitrogen6x/nitrogen6s1g.cfg | 3 +-- board/boundary/nitrogen6x/nitrogen6x.c | 3 +-- 16 files changed, 16 insertions(+), 33 deletions(-) (limited to 'board/boundary') diff --git a/board/boundary/nitrogen6x/1066mhz_4x128mx16.cfg b/board/boundary/nitrogen6x/1066mhz_4x128mx16.cfg index 6c68146f92..c38c151472 100644 --- a/board/boundary/nitrogen6x/1066mhz_4x128mx16.cfg +++ b/board/boundary/nitrogen6x/1066mhz_4x128mx16.cfg @@ -1,7 +1,6 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * Copyright (C) 2013 Boundary Devices - * - * SPDX-License-Identifier: GPL-2.0+ */ DATA 4, MX6_MMDC_P0_MDPDC, 0x00020036 diff --git a/board/boundary/nitrogen6x/1066mhz_4x256mx16.cfg b/board/boundary/nitrogen6x/1066mhz_4x256mx16.cfg index 1096f777ec..f81d49106a 100644 --- a/board/boundary/nitrogen6x/1066mhz_4x256mx16.cfg +++ b/board/boundary/nitrogen6x/1066mhz_4x256mx16.cfg @@ -1,7 +1,6 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * Copyright (C) 2013 Boundary Devices - * - * SPDX-License-Identifier: GPL-2.0+ */ DATA 4, MX6_MMDC_P0_MDPDC, 0x00020036 diff --git a/board/boundary/nitrogen6x/800mhz_2x128mx16.cfg b/board/boundary/nitrogen6x/800mhz_2x128mx16.cfg index e005a648f8..cb04832c50 100644 --- a/board/boundary/nitrogen6x/800mhz_2x128mx16.cfg +++ b/board/boundary/nitrogen6x/800mhz_2x128mx16.cfg @@ -1,7 +1,6 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * Copyright (C) 2013 Boundary Devices - * - * SPDX-License-Identifier: GPL-2.0+ */ DATA 4, MX6_MMDC_P0_MDPDC, 0x0002002D diff --git a/board/boundary/nitrogen6x/800mhz_2x256mx16.cfg b/board/boundary/nitrogen6x/800mhz_2x256mx16.cfg index 581d44ceba..d85466f2fd 100644 --- a/board/boundary/nitrogen6x/800mhz_2x256mx16.cfg +++ b/board/boundary/nitrogen6x/800mhz_2x256mx16.cfg @@ -1,7 +1,6 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * Copyright (C) 2013 Boundary Devices - * - * SPDX-License-Identifier: GPL-2.0+ */ DATA 4, MX6_MMDC_P0_MDPDC, 0x0002002D diff --git a/board/boundary/nitrogen6x/800mhz_4x128mx16.cfg b/board/boundary/nitrogen6x/800mhz_4x128mx16.cfg index 106934227b..417af64500 100644 --- a/board/boundary/nitrogen6x/800mhz_4x128mx16.cfg +++ b/board/boundary/nitrogen6x/800mhz_4x128mx16.cfg @@ -1,7 +1,6 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * Copyright (C) 2013 Boundary Devices - * - * SPDX-License-Identifier: GPL-2.0+ */ DATA 4, MX6_MMDC_P0_MDPDC, 0x0002002D diff --git a/board/boundary/nitrogen6x/800mhz_4x256mx16.cfg b/board/boundary/nitrogen6x/800mhz_4x256mx16.cfg index 7c7a3d1c42..6f75ea2774 100644 --- a/board/boundary/nitrogen6x/800mhz_4x256mx16.cfg +++ b/board/boundary/nitrogen6x/800mhz_4x256mx16.cfg @@ -1,7 +1,6 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * Copyright (C) 2013 Boundary Devices - * - * SPDX-License-Identifier: GPL-2.0+ */ DATA 4, MX6_MMDC_P0_MDPDC, 0x0002002D diff --git a/board/boundary/nitrogen6x/Makefile b/board/boundary/nitrogen6x/Makefile index f875d68182..c8433bd748 100644 --- a/board/boundary/nitrogen6x/Makefile +++ b/board/boundary/nitrogen6x/Makefile @@ -1,9 +1,7 @@ +# SPDX-License-Identifier: GPL-2.0+ # # Copyright (C) 2012-2013, Guennadi Liakhovetski # (C) Copyright 2012-2013 Freescale Semiconductor, Inc. # Copyright (C) 2013, Boundary Devices -# -# SPDX-License-Identifier: GPL-2.0+ -# obj-y := nitrogen6x.o diff --git a/board/boundary/nitrogen6x/clocks.cfg b/board/boundary/nitrogen6x/clocks.cfg index 8bddb91d77..d78e0fdbbd 100644 --- a/board/boundary/nitrogen6x/clocks.cfg +++ b/board/boundary/nitrogen6x/clocks.cfg @@ -1,8 +1,7 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * Copyright (C) 2013 Boundary Devices * - * SPDX-License-Identifier: GPL-2.0+ - * * Device Configuration Data (DCD) * * Each entry must have the format: diff --git a/board/boundary/nitrogen6x/ddr-setup.cfg b/board/boundary/nitrogen6x/ddr-setup.cfg index 2748d40084..99b449c294 100644 --- a/board/boundary/nitrogen6x/ddr-setup.cfg +++ b/board/boundary/nitrogen6x/ddr-setup.cfg @@ -1,8 +1,7 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * Copyright (C) 2013 Boundary Devices * - * SPDX-License-Identifier: GPL-2.0+ - * * Device Configuration Data (DCD) * * Each entry must have the format: diff --git a/board/boundary/nitrogen6x/nitrogen6dl.cfg b/board/boundary/nitrogen6x/nitrogen6dl.cfg index 5c3e9619cd..b1e3c0fe45 100644 --- a/board/boundary/nitrogen6x/nitrogen6dl.cfg +++ b/board/boundary/nitrogen6x/nitrogen6dl.cfg @@ -1,8 +1,7 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * Copyright (C) 2013 Boundary Devices * - * 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/boundary/nitrogen6x/nitrogen6dl2g.cfg b/board/boundary/nitrogen6x/nitrogen6dl2g.cfg index fe19ed0671..3e7d605bf5 100644 --- a/board/boundary/nitrogen6x/nitrogen6dl2g.cfg +++ b/board/boundary/nitrogen6x/nitrogen6dl2g.cfg @@ -1,8 +1,7 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * Copyright (C) 2013 Boundary Devices * - * 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/boundary/nitrogen6x/nitrogen6q.cfg b/board/boundary/nitrogen6x/nitrogen6q.cfg index 60e1885522..26bb6451a2 100644 --- a/board/boundary/nitrogen6x/nitrogen6q.cfg +++ b/board/boundary/nitrogen6x/nitrogen6q.cfg @@ -1,8 +1,7 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * Copyright (C) 2013 Boundary Devices * - * 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/boundary/nitrogen6x/nitrogen6q2g.cfg b/board/boundary/nitrogen6x/nitrogen6q2g.cfg index 7a3ee946da..5ff3eedc19 100644 --- a/board/boundary/nitrogen6x/nitrogen6q2g.cfg +++ b/board/boundary/nitrogen6x/nitrogen6q2g.cfg @@ -1,8 +1,7 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * Copyright (C) 2013 Boundary Devices * - * 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/boundary/nitrogen6x/nitrogen6s.cfg b/board/boundary/nitrogen6x/nitrogen6s.cfg index 2540b7b1e7..5482656e8f 100644 --- a/board/boundary/nitrogen6x/nitrogen6s.cfg +++ b/board/boundary/nitrogen6x/nitrogen6s.cfg @@ -1,8 +1,7 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * Copyright (C) 2013 Boundary Devices * - * 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/boundary/nitrogen6x/nitrogen6s1g.cfg b/board/boundary/nitrogen6x/nitrogen6s1g.cfg index 946af7b37c..dd30ca9439 100644 --- a/board/boundary/nitrogen6x/nitrogen6s1g.cfg +++ b/board/boundary/nitrogen6x/nitrogen6s1g.cfg @@ -1,8 +1,7 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * Copyright (C) 2013 Boundary Devices * - * 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/boundary/nitrogen6x/nitrogen6x.c b/board/boundary/nitrogen6x/nitrogen6x.c index 3b92b64f6a..84d7cee740 100644 --- a/board/boundary/nitrogen6x/nitrogen6x.c +++ b/board/boundary/nitrogen6x/nitrogen6x.c @@ -1,8 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (C) 2010-2013 Freescale Semiconductor, Inc. * Copyright (C) 2013, Boundary Devices - * - * SPDX-License-Identifier: GPL-2.0+ */ #include -- cgit v1.2.3