From 4549e789c1d58a8c48e8a20f1b4bdb83e978c954 Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Sun, 6 May 2018 18:27:01 -0400 Subject: SPDX: Convert all of our multiple 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 multiple licenses (in these cases, dual license) declared in the SPDX-License-Identifier tag. In this case we change from listing "LICENSE-A LICENSE-B" or "LICENSE-A or LICENSE-B" or "(LICENSE-A OR LICENSE-B)" to "LICENSE-A OR LICENSE-B" as per the Linux Kernel style document. Note that parenthesis are allowed so when they were used before we continue to use them. Reviewed-by: Fabio Estevam Signed-off-by: Tom Rini --- arch/arm/dts/rk3288-firefly.dts | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'arch/arm/dts/rk3288-firefly.dts') diff --git a/arch/arm/dts/rk3288-firefly.dts b/arch/arm/dts/rk3288-firefly.dts index 59ff8bc104..2e075406f4 100644 --- a/arch/arm/dts/rk3288-firefly.dts +++ b/arch/arm/dts/rk3288-firefly.dts @@ -1,7 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0+ OR X11 /* * Copyright (c) 2014, 2015 FUKAUMI Naoki - * - * SPDX-License-Identifier: GPL-2.0+ X11 */ /dts-v1/; -- cgit