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 --- arch/arm/cpu/armv8/zynqmp/Makefile | 4 +--- arch/arm/cpu/armv8/zynqmp/clk.c | 3 +-- arch/arm/cpu/armv8/zynqmp/cpu.c | 3 +-- arch/arm/cpu/armv8/zynqmp/handoff.c | 3 +-- arch/arm/cpu/armv8/zynqmp/mp.c | 3 +-- arch/arm/cpu/armv8/zynqmp/psu_spl_init.c | 3 +-- arch/arm/cpu/armv8/zynqmp/spl.c | 3 +-- 7 files changed, 7 insertions(+), 15 deletions(-) (limited to 'arch/arm/cpu/armv8/zynqmp') diff --git a/arch/arm/cpu/armv8/zynqmp/Makefile b/arch/arm/cpu/armv8/zynqmp/Makefile index dde1a0f658f..8a3b0747244 100644 --- a/arch/arm/cpu/armv8/zynqmp/Makefile +++ b/arch/arm/cpu/armv8/zynqmp/Makefile @@ -1,9 +1,7 @@ +# SPDX-License-Identifier: GPL-2.0+ # # (C) Copyright 2014 - 2015 Xilinx, Inc. # Michal Simek -# -# SPDX-License-Identifier: GPL-2.0+ -# obj-y += clk.o obj-y += cpu.o diff --git a/arch/arm/cpu/armv8/zynqmp/clk.c b/arch/arm/cpu/armv8/zynqmp/clk.c index f7e5ebfa634..13e1977bfa1 100644 --- a/arch/arm/cpu/armv8/zynqmp/clk.c +++ b/arch/arm/cpu/armv8/zynqmp/clk.c @@ -1,8 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * (C) Copyright 2014 - 2015 Xilinx, Inc. * Michal Simek - * - * SPDX-License-Identifier: GPL-2.0+ */ #include diff --git a/arch/arm/cpu/armv8/zynqmp/cpu.c b/arch/arm/cpu/armv8/zynqmp/cpu.c index 14e7d400649..eb0db46065f 100644 --- a/arch/arm/cpu/armv8/zynqmp/cpu.c +++ b/arch/arm/cpu/armv8/zynqmp/cpu.c @@ -1,8 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * (C) Copyright 2014 - 2015 Xilinx, Inc. * Michal Simek - * - * SPDX-License-Identifier: GPL-2.0+ */ #include diff --git a/arch/arm/cpu/armv8/zynqmp/handoff.c b/arch/arm/cpu/armv8/zynqmp/handoff.c index 25d6ef3f60f..f71ff7b3d25 100644 --- a/arch/arm/cpu/armv8/zynqmp/handoff.c +++ b/arch/arm/cpu/armv8/zynqmp/handoff.c @@ -1,9 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright 2016 - 2017 Xilinx, Inc. * * Michal Simek - * - * SPDX-License-Identifier: GPL-2.0+ */ #include diff --git a/arch/arm/cpu/armv8/zynqmp/mp.c b/arch/arm/cpu/armv8/zynqmp/mp.c index 3ea24b47630..7e270a7dc23 100644 --- a/arch/arm/cpu/armv8/zynqmp/mp.c +++ b/arch/arm/cpu/armv8/zynqmp/mp.c @@ -1,8 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * (C) Copyright 2014 - 2015 Xilinx, Inc. * Michal Simek - * - * SPDX-License-Identifier: GPL-2.0+ */ #include diff --git a/arch/arm/cpu/armv8/zynqmp/psu_spl_init.c b/arch/arm/cpu/armv8/zynqmp/psu_spl_init.c index 28d39570b34..b357de32358 100644 --- a/arch/arm/cpu/armv8/zynqmp/psu_spl_init.c +++ b/arch/arm/cpu/armv8/zynqmp/psu_spl_init.c @@ -1,9 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright 2018 Xilinx, Inc. * * Michal Simek - * - * SPDX-License-Identifier: GPL-2.0+ */ #include #include diff --git a/arch/arm/cpu/armv8/zynqmp/spl.c b/arch/arm/cpu/armv8/zynqmp/spl.c index 0bfa5c1c4dd..01f31d0f0ed 100644 --- a/arch/arm/cpu/armv8/zynqmp/spl.c +++ b/arch/arm/cpu/armv8/zynqmp/spl.c @@ -1,9 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright 2015 - 2016 Xilinx, Inc. * * Michal Simek - * - * SPDX-License-Identifier: GPL-2.0+ */ #include -- cgit v1.2.3