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 --- drivers/demo/Makefile | 4 +--- drivers/demo/demo-pdata.c | 3 +-- drivers/demo/demo-shape.c | 3 +-- drivers/demo/demo-simple.c | 3 +-- drivers/demo/demo-uclass.c | 3 +-- 5 files changed, 5 insertions(+), 11 deletions(-) (limited to 'drivers/demo') diff --git a/drivers/demo/Makefile b/drivers/demo/Makefile index 171ddf3678..9acd918a28 100644 --- a/drivers/demo/Makefile +++ b/drivers/demo/Makefile @@ -1,8 +1,6 @@ +# SPDX-License-Identifier: GPL-2.0+ # # Copyright (c) 2013 Google, Inc -# -# SPDX-License-Identifier: GPL-2.0+ -# obj-y += demo-uclass.o demo-pdata.o obj-$(CONFIG_DM_DEMO_SIMPLE) += demo-simple.o diff --git a/drivers/demo/demo-pdata.c b/drivers/demo/demo-pdata.c index e92841db69..2f434f8db0 100644 --- a/drivers/demo/demo-pdata.c +++ b/drivers/demo/demo-pdata.c @@ -1,7 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (c) 2013 Google, Inc - * - * SPDX-License-Identifier: GPL-2.0+ */ #include diff --git a/drivers/demo/demo-shape.c b/drivers/demo/demo-shape.c index 7e71f3bf6a..98b644680c 100644 --- a/drivers/demo/demo-shape.c +++ b/drivers/demo/demo-shape.c @@ -1,7 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (c) 2013 Google, Inc - * - * SPDX-License-Identifier: GPL-2.0+ */ #include diff --git a/drivers/demo/demo-simple.c b/drivers/demo/demo-simple.c index d05b1dfd87..68972c780f 100644 --- a/drivers/demo/demo-simple.c +++ b/drivers/demo/demo-simple.c @@ -1,10 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (c) 2013 Google, Inc * * (C) Copyright 2012 * Pavel Herrmann - * - * SPDX-License-Identifier: GPL-2.0+ */ #include diff --git a/drivers/demo/demo-uclass.c b/drivers/demo/demo-uclass.c index 3341572e8a..3b8439b836 100644 --- a/drivers/demo/demo-uclass.c +++ b/drivers/demo/demo-uclass.c @@ -1,10 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (c) 2013 Google, Inc * * (C) Copyright 2012 * Pavel Herrmann - * - * SPDX-License-Identifier: GPL-2.0+ */ #include -- cgit